diff --git a/accounts/admin.py b/accounts/admin.py index 7ddb57ee..1074a287 100644 --- a/accounts/admin.py +++ b/accounts/admin.py @@ -49,7 +49,7 @@ class RegistrationProfileAdmin(RegistrationAdmin): def user_email(self, obj): return obj.user.email - user_email.short_description = _("email") + user_email.short_description = _("e-mail address") user_email.admin_order_field = "user__email" def user_date_joined(self, obj): diff --git a/accounts/auth.py b/accounts/auth.py index 0885fdab..c8824fd8 100644 --- a/accounts/auth.py +++ b/accounts/auth.py @@ -12,10 +12,10 @@ def authenticate(self, request, username=None, password=None, **kwargs): user = UserModel._default_manager.get(email__iexact=username) return super().authenticate(request, user.username, password, **kwargs) except UserModel.DoesNotExist: - logger.debug('No user with email address "%s"', username) + logger.debug('No user with e-mail address "%s"', username) except UserModel.MultipleObjectsReturned: logger.warning( - 'Found %s users with email address "%s"', + 'Found %s users with e-mail address "%s"', UserModel._default_manager.filter(email=username).count(), username, ) diff --git a/accounts/forms.py b/accounts/forms.py index ea4ab386..d4c5fb2b 100644 --- a/accounts/forms.py +++ b/accounts/forms.py @@ -1,4 +1,5 @@ from django import forms +from django.core.exceptions import ValidationError from django.core.validators import RegexValidator from django.utils.text import gettext_lazy as _ @@ -36,6 +37,19 @@ class RegistrationForm(RegistrationFormUniqueEmail): ], ) + email = forms.EmailField(label=_("e-mail address")) + email2 = forms.EmailField(label=_("repeat e-mail address")) + accept_privacy_policy = forms.BooleanField( required=True, initial=False, label=_("Accept privacy policy") ) + + def clean_email2(self): + email = self.cleaned_data.get("email") + email2 = self.cleaned_data.get("email2") + if email and email2 and email != email2: + raise ValidationError( + _("The two e-mail addresses didn’t match."), + code="email_mismatch", + ) + return email2 diff --git a/accounts/templates/user_account_delete.html b/accounts/templates/user_account_delete.html index fe62d3f3..3246771f 100644 --- a/accounts/templates/user_account_delete.html +++ b/accounts/templates/user_account_delete.html @@ -7,10 +7,13 @@ {% block content %}
{% translate 'If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore.' %} {% translate 'Its not possible to recover this information. If you want to work as volunteer again, you will have to create a new account.' %} diff --git a/accounts/templates/user_detail.html b/accounts/templates/user_detail.html index 53aa119f..b2ab87d5 100644 --- a/accounts/templates/user_detail.html +++ b/accounts/templates/user_detail.html @@ -7,10 +7,12 @@ {% block content %}
{% translate 'Edit Account' %} diff --git a/common/templatetags/site.py b/common/templatetags/site.py index 5961b3d8..a10fa004 100644 --- a/common/templatetags/site.py +++ b/common/templatetags/site.py @@ -1,8 +1,7 @@ # coding: utf-8 # coding: utf-8 - -from django import template +from django import conf, template from django.contrib.sites.shortcuts import get_current_site @@ -12,3 +11,8 @@ @register.simple_tag def request_site(request): return get_current_site(request_site) + + +@register.simple_tag +def get_version(): + return conf.settings.VERSION diff --git a/locale/ar/LC_MESSAGES/django.po b/locale/ar/LC_MESSAGES/django.po index e87f8d71..51255507 100644 --- a/locale/ar/LC_MESSAGES/django.po +++ b/locale/ar/LC_MESSAGES/django.po @@ -5,11 +5,12 @@ # Maha Abdulkaream Mohammad Sharaf, 2022 # Maha Abdulkaream Mohammad Sharaf, 2022 # Night Bird, 2022 +# Night Bird, 2022 msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Night Bird, 2022\n" "Language-Team: Arabic (http://www.transifex.com/coders4help/volunteer-planner/language/ar/)\n" @@ -25,7 +26,7 @@ msgstr "الاسم الأول " msgid "last name" msgstr "اسم العائلة" -msgid "email" +msgid "e-mail address" msgstr "البريد الإلكتروني " msgid "date joined" @@ -49,9 +50,15 @@ msgstr "اسم المستخدم يجب أن ينتهي إما بحرف هجائ msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "اسم المستخدم يجب ألّا يتضمن الرموز التالية \".\" أو \"_\" بشكل متتالي" +msgid "repeat e-mail address" +msgstr "البريد الإلكتروني " + msgid "Accept privacy policy" msgstr "قَبُول سياسة الخصوصية" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "حساب المستخدم" @@ -97,7 +104,7 @@ msgstr "لا يوجد بعد مناوبات مقيدة" msgid "Show my work shifts in the future" msgstr "عرض فترات مناوباتي القادمة" -msgid "Username" +msgid "username" msgstr "اسم المستخدم " msgid "First name" @@ -106,9 +113,6 @@ msgstr "الاسم الأول " msgid "Last name" msgstr "اللقب" -msgid "Email" -msgstr "البريد الإلكتروني" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "إذا قمت بحذف حسابك, ستصبح هذه المعلومات مجهولة المصدر, ولن يكون بإمكانك تسجيل الدخول volunteer- بعد الآن planner.org" @@ -469,8 +473,8 @@ msgstr "مجانا, دون إعلانات" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -900,7 +904,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "إرسال بريد إلكتروني إلى جميع المتطوعين" msgid "Drop out" @@ -995,10 +999,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "تم إرسال البريد الإلكتروني" #, python-brace-format @@ -1045,10 +1049,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "الصفحة الرئيسية " @@ -1208,13 +1208,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "تم تفعيل حسابك الآن. يمكنك تسجيل الدخول باستخدام الرابط التالي" -msgid "Email address" -msgstr "البريد الإلكتروني " - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "كلمة المرور " @@ -1233,9 +1226,6 @@ msgstr "تم تغيير كلمة المرور بنجاح " msgid "Change Password" msgstr "قم بتغيير كلمة المرور " -msgid "Change password" -msgstr "تغيير كلمة المرور" - msgid "Password reset complete" msgstr "اعادة تعيين كلمة المرور تم بنجاح" @@ -1257,15 +1247,15 @@ msgstr "ادخل كلمة المرور الجديدة لإعادة تعيين ك msgid "Password reset" msgstr "إعادة تعيين كلمة المرور" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "تم إرسال بريد إلكتروني يحتوي على رابط لإعادة تعيين كلمة المرور الخاصة بك" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "يرجى التحقق من بريدك الإلكتروني والنقر على الرابط للمتابعة" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1288,13 +1278,13 @@ msgstr "إعادة تعيين كلمة المرور" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "تم إرسال بريد التفعيل" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "سيتم إرسال بريد التفعيل إلى عنوان بريدك الإلكتروني" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "الرجاء تأكيد تسجيلك بواسطة الضغط على الرابط في البريد الإلكتروني. في حال عدم تلقي البريد الإلكتروني خلال 10 دقائق يرجى البحث في مجلد البريد العشوائي" msgid "Register for an account" @@ -1308,14 +1298,17 @@ msgstr "" msgid "Create a new account" msgstr "إنشاء حساب جديد" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." -msgstr "" - msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" "اسم المستخدم الخاص بك سيكون مرئيا للآخرين.\n" "يجب عدم استخدام مسافات أو أحرفا خاصة." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." +msgstr "" + msgid "Repeat password" msgstr "يرجى إعادة إدخال كلمة المرور" diff --git a/locale/bg/LC_MESSAGES/django.po b/locale/bg/LC_MESSAGES/django.po index c461c73d..146f6dd6 100644 --- a/locale/bg/LC_MESSAGES/django.po +++ b/locale/bg/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Bulgarian (http://www.transifex.com/coders4help/volunteer-planner/language/bg/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/cs/LC_MESSAGES/django.po b/locale/cs/LC_MESSAGES/django.po index da10470b..36ef56d7 100644 --- a/locale/cs/LC_MESSAGES/django.po +++ b/locale/cs/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: trendspotter , 2022\n" "Language-Team: Czech (http://www.transifex.com/coders4help/volunteer-planner/language/cs/)\n" @@ -23,8 +23,8 @@ msgstr "křestní jméno" msgid "last name" msgstr "Příjmení" -msgid "email" -msgstr "e-mail" +msgid "e-mail address" +msgstr "Emailová adresa" msgid "date joined" msgstr "datum připojení" @@ -47,9 +47,15 @@ msgstr "Uživatelské jméno musí končit písmenem, číslicí nebo znakem \"_ msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "Uživatelské jméno nesmí obsahovat po sobě jdoucí znaky \".\" nebo \"_\"." +msgid "repeat e-mail address" +msgstr "Emailová adresa" + msgid "Accept privacy policy" msgstr "Přijmout zásady ochrany osobních údajů" +msgid "The two e-mail addresses didn’t match." +msgstr "Obě e-mailové adresy se neshodovaly." + msgid "user account" msgstr "uživatelský účet" @@ -95,7 +101,7 @@ msgstr "Poslední dny nebyly žádné pracovní směny." msgid "Show my work shifts in the future" msgstr "Zobrazit moje budoucí pracovní směny" -msgid "Username" +msgid "username" msgstr "Uživatelské jméno" msgid "First name" @@ -104,9 +110,6 @@ msgstr "Křestní jméno" msgid "Last name" msgstr "Příjmení" -msgid "Email" -msgstr "E-mail" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "Pokud účet zrušíte, budou tyto informace anonymizovány a nebudete se již moci přihlásit do programu Volunteer-Planner." @@ -478,8 +481,8 @@ msgstr "zdarma, bez reklam" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" "\n" @@ -838,6 +841,22 @@ msgid "" "Thank you for volunteering and have a great time,\n" "your volunteer-planner.org team" msgstr "" +"Dobrý den, %(recipient)s\n" +"\n" +"Děkujeme, že jste se přihlásili na následující nadcházející směnu:\n" +"%(shift_title)s od %(starting_time)s do %(ending_time)s na %(location)s.\n" +"\n" +"Vedoucí směny Vám chce dát vědět:\n" +"----------------------\n" +"\n" +"%(message)s\n" +"\n" +"----------------------\n" +"V případě jakýchkoli dotazů týkajících se této zprávy nebo potřeby reagovat na ni se prosím obraťte přímo na vedoucího směny %(sender_email)s , .\n" +"\n" +"\n" +"Děkujeme vám za dobrovolnictví a přejeme příjemné chvíle,\n" +"váš tým volunteer-planner.org" msgctxt "helpdesk shifts heading" msgid "shifts" @@ -913,7 +932,7 @@ msgstr "%(slots_left)s víc" msgid "Covered" msgstr "Pokryto" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "Odeslat e-mail všem dobrovolníkům" msgid "Drop out" @@ -1028,10 +1047,10 @@ msgstr "Již jste se zaregistrovali na tuto směnu v {date_time}." msgid "You successfully left this shift." msgstr "Úspěšně jste opustili tuto směnu." -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "Nemáte oprávnění k odesílání e-mailů!" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "E-mail byl odeslán." #, python-brace-format @@ -1074,10 +1093,6 @@ msgstr "šablony směn" msgid "shift template" msgstr "šablona směny" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "{task_name} - {workplace_name}" - msgid "Home" msgstr "Hlavní strana" @@ -1255,13 +1270,6 @@ msgstr "Váš účet je nyní schválen. Nyní se můžete , 2015\n" "Language-Team: Danish (http://www.transifex.com/coders4help/volunteer-planner/language/da/)\n" @@ -21,8 +21,8 @@ msgstr "" msgid "last name" msgstr "Efternavn" -msgid "email" -msgstr "email" +msgid "e-mail address" +msgstr "" msgid "date joined" msgstr "" @@ -45,9 +45,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "Brugerkonto" @@ -93,7 +99,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "Brugernavn" msgid "First name" @@ -102,9 +108,6 @@ msgstr "Fornavn" msgid "Last name" msgstr "Efternavn" -msgid "Email" -msgstr "Email" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -465,8 +468,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -888,7 +891,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -983,10 +986,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1025,10 +1028,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "Hjem" @@ -1188,13 +1187,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1213,9 +1205,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1237,15 +1226,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1268,13 +1257,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1286,10 +1275,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/de/LC_MESSAGES/django.po b/locale/de/LC_MESSAGES/django.po index 7df56891..3eb8d1b7 100644 --- a/locale/de/LC_MESSAGES/django.po +++ b/locale/de/LC_MESSAGES/django.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-14 00:11+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Christoph Meißner, 2015,2022\n" "Language-Team: German (http://www.transifex.com/coders4help/volunteer-planner/language/de/)\n" @@ -35,8 +35,8 @@ msgstr "Vorname" msgid "last name" msgstr "Nachname" -msgid "email" -msgstr "E-Mail" +msgid "e-mail address" +msgstr "E-Mail-Adresse" msgid "date joined" msgstr "Mitglied seit" @@ -59,9 +59,15 @@ msgstr "Benutzername muss mit einem Buchstaben, einer Ziffer oder \"_\" enden." msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "Benutzername darf keine aufeinanderfolgenden \".\" and \"_\" enthalten." +msgid "repeat e-mail address" +msgstr "E-Mail-Adresse wiederholen" + msgid "Accept privacy policy" msgstr "Einwilligung (nach Art. 6 Abs. 1 Satz 1a DSGVO)" +msgid "The two e-mail addresses didn’t match." +msgstr "Die E-Mail-Adressen stimmen nicht überein." + msgid "user account" msgstr "Benutzerkonto" @@ -107,7 +113,7 @@ msgstr "noch an keinen Schichten teilgenommen" msgid "Show my work shifts in the future" msgstr "meine zukünftigen Schichten" -msgid "Username" +msgid "username" msgstr "Benutzername" msgid "First name" @@ -116,14 +122,11 @@ msgstr "Vorname" msgid "Last name" msgstr "Nachname" -msgid "Email" -msgstr "E-Mail-Adresse" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." -msgstr "Wenn Du deinen Benutzerkonto löschst werden Deine Daten anonymisiert und du kannst Dich nicht mehr einloggen." +msgstr "Wenn du dein Benutzerkonto löschst, werden deine Daten anonymisiert und du kannst dich nicht mehr einloggen." msgid "Its not possible to recover this information. If you want to work as volunteer again, you will have to create a new account." -msgstr "Es ist nicht möglich das Benutzerkonto wiederherzustellen. Wenn Du später nochmal als Freiwillige/r helfen willst, mußt Du Dich nochmal registrieren." +msgstr "Es ist nicht möglich das Benutzerkonto wiederherzustellen. Wenn du später nochmal als Freiwillige/r helfen willst, musst du dich neu registrieren." msgid "Delete Account (no additional warning)" msgstr "Mein Benutzerkonto löschen!" @@ -231,7 +234,7 @@ msgid "Server Error (500)" msgstr "Serverfehler (500)" msgid "There's been an error. It should be fixed shortly. Thanks for your patience." -msgstr "Es hat einen Fehler gegeben. Er wurde an die Siteadministratoren berichtet und wird in Kürze behoben. Danke für Deine Geduld." +msgstr "Ein Fehler ist aufgetreten. Die Administratoren des Volunteer Planners wurden automatisch informiert und werden den Fehler sobald wie möglich beheben. Wir entschuldigen uns vielmals und danken dir für deine Geduld." msgid "Login" msgstr "Login" @@ -264,7 +267,7 @@ msgid "I want to help!" msgstr "Ich will helfen!" msgid "Register and see where you can help" -msgstr "Registriere Dich und erfahre, wo du helfen kannst" +msgstr "Registriere dich und erfahre, wo du helfen kannst" msgid "Organize volunteers!" msgstr "Freiwillige organisieren!" @@ -285,7 +288,7 @@ msgid "What is it all about?" msgstr "Was ist volunteer-planner.org?" msgid "You are a volunteer and want to help refugees? Volunteer-Planner.org shows you where, when and how to help directly in the field." -msgstr "Du willst Menschen in Notlagen helfen? Der Volunteer Planner bringt soziale Einrichtungen, die Hilfe bei der Unterstützung von Menschen in Not benötigen, mit Freiwilligen zusammen. Der Volunteer Planner zeigt Dir, wo, wann und wie du helfen kannst: direkt vor Ort." +msgstr "Du willst Menschen in Notlagen helfen? Der Volunteer Planner bringt soziale Einrichtungen, die Hilfe bei der Unterstützung von Menschen in Not benötigen, mit Freiwilligen zusammen. Der Volunteer Planner zeigt dir, wo, wann und wie du helfen kannst: direkt vor Ort." msgid "

This platform is non-commercial and ads-free. An international team of field workers, programmers, project managers and designers are volunteering for this project and bring in their professional experience to make a difference.

" msgstr "

Die Plattform ist werbefrei und gemeinnützig. Ein ehrenamtliches Team von Helfer:innen vor Ort, Programmierer:innen, Projektmanager:innen und Designer:innen hilft freiwillig und unentgeltlich, um den Volunteer Planner voranzubringen.

" @@ -487,8 +490,8 @@ msgstr "Kostenlos. Werbefrei." msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" "\n" @@ -655,7 +658,7 @@ msgstr "Hallo %(username)s," #, python-format msgid "Your membership request at %(facility_name)s was approved. You now may sign up for restricted shifts at this facility." -msgstr "Dein Antrag auf Mitgliedschaft in der Einrichtung %(facility_name)s wurde bestätigt! Du kannst Dich ab sofort für zugangsbeschränkte Schichten eintragen. " +msgstr "Dein Antrag auf Mitgliedschaft in der Einrichtung %(facility_name)s wurde bestätigt! Du kannst dich ab sofort für zugangsbeschränkte Schichten eintragen. " msgid "" "Yours,\n" @@ -843,19 +846,19 @@ msgid "" msgstr "" "Hallo %(recipient)s,\n" "\n" -"Du hattest Dich zur Teilnahme für folgende Aufgabe eingetragen:\n" +"Du hattest dich zur Teilnahme für folgende Aufgabe eingetragen:\n" "\n" "Aufgabe: %(shift_title)s\n" "Zeit: %(starting_time)s bis %(ending_time)s\n" "Ort: %(location)s\n" "\n" -"Die Organisator:innen möchten Dir folgendes mitteilen:\n" +"Die Organisator:innen möchten dir folgendes mitteilen:\n" "----------------------\n" "\n" "%(message)s\n" "\n" "----------------------\n" -"Solltest Du Fragen dazu haben oder auf diese Nachricht antworten wollen, wende Dich bitte direkt an die Organisator:innen unter %(sender_email)s.\n" +"Solltest du Fragen dazu haben oder auf diese Nachricht antworten wollen, wende dich bitte direkt an die Organisator:innen unter %(sender_email)s.\n" "\n" "\n" "Vielen Dank für dein Engagement,\n" @@ -935,7 +938,7 @@ msgstr "noch %(slots_left)s" msgid "Covered" msgstr "Abgedeckt" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "Alle Helfer_innen benachrichtigen" msgid "Drop out" @@ -978,14 +981,14 @@ msgstr "" "\n" "Hallo,\n" "\n" -"leider müssen wir Dir mitteilen, dass die Unterkunftskoordination folgende Schicht abgesagt hat: \n" +"leider müssen wir dir mitteilen, dass die Unterkunftskoordination folgende Schicht abgesagt hat: \n" "\n" "%(shift_title)s, %(location)s\n" "\n" "%(from_date)s von %(from_time)s bis %(to_time)s Uhr\n" "\n" "\n" -"Dies ist eine automatisierte Email. Bei Fragen wende Dich bitte DIREKT AN DIE UNTERKUNFT.\n" +"Dies ist eine automatisierte E-Mail. Bei Fragen wende dich bitte DIREKT AN DIE UNTERKUNFT.\n" "\n" "Viele Grüße\n" "Das Volunteer-Planner-Team\n" @@ -1030,9 +1033,9 @@ msgstr "" "\n" "%(from_date)s von %(from_time)s bis %(to_time)s Uhr\n" "\n" -"Wenn Du zu dieser Zeit nicht zur Verfügung stehen kannst, dann sage bitte im Volunteer-Planner deine Schichtteilnahme ab.\n" +"Wenn du zu dieser Zeit nicht zur Verfügung stehen kannst, dann sage bitte im Volunteer-Planner deine Schichtteilnahme ab.\n" "\n" -"Dies ist eine automatisch erstellte E-Mail. Bei Rückfragen wende Dich bitte an die Kontaktadresse, die bei der Unterkunft angegeben ist.\n" +"Dies ist eine automatisch erstellte E-Mail. Bei Rückfragen wende dich bitte an die Kontaktadresse, die bei der Unterkunft angegeben ist.\n" "\n" "Dein Volunteer-planner.org Team\n" @@ -1046,29 +1049,29 @@ msgid "A membership request has been sent." msgstr "Ein Antrag auf Mitgliedschaft wurde gestellt." msgid "We can't add you to this shift because you've already agreed to other shifts at the same time:" -msgstr "Wir konnten Dich nicht für die Schicht eintragen, da Du zur gleichen Zeit schon an mindestens einer anderen teilnimmst:" +msgstr "Wir konnten dich nicht für die Schicht eintragen, da du zur gleichen Zeit schon an mindestens einer anderen teilnimmst:" msgid "We can't add you to this shift because there are no more slots left." -msgstr "Wir können Dich nicht zu dieser Schicht hinzufügen, da alle Plätze bereits belegt sind." +msgstr "Wir können dich nicht zu dieser Schicht hinzufügen, da alle Plätze bereits belegt sind." msgid "You were successfully added to this shift." -msgstr "Du hast Dich erfolgreich für die Schicht angemeldet." +msgstr "Du hast dich erfolgreich für die Schicht angemeldet." msgid "The shift you joined overlaps with other shifts you already joined. Please check for conflicts:" -msgstr "Die Schicht, der Du eigetreten bist, überschneidet sich zeitlich mit einer anderen Schicht. Bitte überprüfe die Überschneidungen:" +msgstr "Die Schicht, der du eigetreten bist, überschneidet sich zeitlich mit einer anderen Schicht. Bitte überprüfe die Überschneidungen:" #, python-brace-format msgid "You already signed up for this shift at {date_time}." -msgstr "Du hast Dich bereits am {date_time} für diese Schicht eingetragen." +msgstr "Du hast dich bereits am {date_time} für diese Schicht eingetragen." msgid "You successfully left this shift." -msgstr "Du hast Deine Teilnahme abgesagt." +msgstr "Du hast deine Teilnahme abgesagt." -msgid "You have no permissions to send emails!" -msgstr "Du hast keine Erlaubnis um Emails zu senden!" +msgid "You have no permissions to send e-mails!" +msgstr "Du hast keine Erlaubnis um E-Mails zu senden!" -msgid "Email has been sent." -msgstr "Email wurde gesendet." +msgid "E-mail has been sent." +msgstr "E-Mail wurde gesendet." #, python-brace-format msgid "A shift already exists at {date}" @@ -1106,10 +1109,6 @@ msgstr "Schichtvorlagen" msgid "shift template" msgstr "Schichtvorlage" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "{task_name} - {workplace_name}" - msgid "Home" msgstr "Start" @@ -1214,11 +1213,11 @@ msgstr "Aktivierung erfolgreich!" msgctxt "Activation successful page" msgid "Thank you for signing up." -msgstr "Schön, dass Du dabei bist." +msgstr "Schön, dass du dabei bist." msgctxt "Login link text on activation success page" msgid "You can login here." -msgstr "Du kannst Dich hier einloggen." +msgstr "Du kannst dich hier einloggen." #, python-format msgid "" @@ -1240,9 +1239,9 @@ msgstr "" "\n" "Hallo %(user)s,\n" "\n" -"vielen Dank, dass du helfen möchtest! Nur noch ein kleiner Schritt und Du kannst loslegen. \n" +"vielen Dank, dass du helfen möchtest! Nur noch ein kleiner Schritt und du kannst loslegen. \n" "\n" -"Bitte schließe Deine Registrierung beim volunteer-planner.org ab, indem Du Deine E-Mailadresse durche einen Klick auf folgenden Link bestätigst: \n" +"Bitte schließe deine Registrierung beim volunteer-planner.org ab, indem du deine E-Mail-Adresse durche einen Klick auf folgenden Link bestätigst: \n" "\n" "http://%(site_domain)s%(activation_key_url)s\n" "\n" @@ -1272,9 +1271,9 @@ msgstr "" "\n" "Hallo %(user)s,\n" "\n" -"vielen Dank, dass du helfen möchtest! Nur noch ein kleiner Schritt und Du kannst loslegen. \n" +"vielen Dank, dass du helfen möchtest! Nur noch ein kleiner Schritt und du kannst loslegen. \n" "\n" -"Bitte schließe Deine Registrierung beim volunteer-planner.org ab, indem Du Deine E-Mailadresse durche einen Klick auf folgenden Link bestätigst: \n" +"Bitte schließe deine Registrierung beim volunteer-planner.org ab, indem du deine E-Mail-Adresse durche einen Klick auf folgenden Link bestätigst: \n" "\n" "http://%(site_domain)s%(activation_key_url)s\n" "\n" @@ -1292,17 +1291,10 @@ msgstr "Bestätigung durch Administrator" #, python-format msgid "Your account is now approved. You can login now." -msgstr "Dein Account ist jetzt bestätigt. Du kannst Dich jetzt hier anmelden." +msgstr "Dein Account ist jetzt bestätigt. Du kannst dich jetzt hier anmelden." msgid "Your account is now approved. You can log in using the following link" -msgstr "Dein Account ist jetzt bestätigt. Du kannst Dich unter folgendem Link anmelden" - -msgid "Email address" -msgstr "E-Mailadresse" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "%(email_trans)s / %(username_trans)s" +msgstr "Dein Account ist jetzt bestätigt. Du kannst dich unter folgendem Link anmelden" msgid "Password" msgstr "Passwort" @@ -1322,9 +1314,6 @@ msgstr "Passwurd wurde erfolgreich geändert!" msgid "Change Password" msgstr "Passwort ändern" -msgid "Change password" -msgstr "Passwort ändern" - msgid "Password reset complete" msgstr "Passwort wurde geändert" @@ -1346,26 +1335,26 @@ msgstr "Bitte gib dein neues Passwort ein" msgid "Password reset" msgstr "Passwort zurückgesetzt" -msgid "We sent you an email with a link to reset your password." -msgstr "Wir haben Dir eine E-Mail mit der Anleitung zum Ändern des Passwortes geschickt." +msgid "We sent you an e-mail with a link to reset your password." +msgstr "Wir haben dir eine E-Mail mit der Anleitung zum Ändern des Passwortes geschickt." -msgid "Please check your email and click the link to continue." -msgstr "Bitte prüfe Deine E-Mails und folge der Anleitung um fortzufahren." +msgid "Please check your e-mails and click the link to continue." +msgstr "Bitte prüfe deine E-Mails und folge der Anleitung um fortzufahren." #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" "To reset your password, please click the following link, or copy and paste it\n" "into your web browser:" msgstr "" -"Du bekommst diese E-Mail, weil jemand (wahrscheinlich Du selbst)\n" -"Dein Passwort für %(domain)s ändern möchte. Wenn Du Dein Passwort nicht\n" -"ändern möchtest, kannst Du diese E-Mail einfach ignorieren und es passiert nichts.\n" +"Du bekommst diese E-Mail, weil jemand (wahrscheinlich du selbst)\n" +"Dein Passwort für %(domain)s ändern möchte. Wenn du dein Passwort nicht\n" +"ändern möchtest, kannst du diese E-Mail einfach ignorieren und es passiert nichts.\n" "\n" -"Um Dein Passwort zu ändern, klicke bitte folgenden Link:" +"Um dein Passwort zu ändern, klicke bitte folgenden Link:" #, python-format msgid "" @@ -1385,32 +1374,35 @@ msgid "Reset password" msgstr "Passwort zurücksetzen" msgid "No Problem! We'll send you instructions on how to reset your password." -msgstr "Kein Problem! Wir schicken Dir eine E-Mail mit der Anleitung wie Du Dein Passwort zurücksetzen kannst." +msgstr "Kein Problem! Wir schicken dir eine E-Mail mit der Anleitung wie du dein Passwort zurücksetzen kannst." -msgid "Activation email sent" -msgstr "Aktivierungsemail wurde versandt" +msgid "Activation e-mail sent" +msgstr "Aktivierungs-E-Mail wurde versandt" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "Dir wird jetzt eine Aktivierungs-E-Mail zugesendet." -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." -msgstr "Bitte bestätige Deine Anmeldung, indem Du den entsprechenden Link in der E-Mail anklickst. Wenn Du in 10 Minuten noch keine E-Mail bekommen haben solltest, schaue bitte in Deinem Spamordner nach." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." +msgstr "Bitte bestätige deine Anmeldung, indem du den entsprechenden Link in der E-Mail anklickst. Wenn du in 10 Minuten noch keine E-Mail bekommen haben solltest, schaue bitte in deinem Spamordner nach." msgid "Register for an account" msgstr "Erstelle einen Account" msgid "You can create a new user account here. If you already have a user account click on LOGIN in the upper right corner." -msgstr "Du kannst hier einen neues Benutzer:innnen-Konto erstellen. Wenn Du dich bereits registriert hast, dann logge dich bitte oben rechts ein." +msgstr "Du kannst hier einen neues Benutzer:innnen-Konto erstellen. Wenn du dich bereits registriert hast, dann logge dich bitte oben rechts ein." msgid "Create a new account" msgstr "Ein neues Benutzer:innen-Konto erstellen" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." -msgstr "Volunteer-Planner und die Unterkunftskoordination werden Dir E-Mails schicken, die deine Schicht betreffen." - msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "Achtung! Der Benutzername ist sichtbar für andere Benutzer:innen! Bitte verwende keine Leerzeichen oder Sonderzeichen." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "Volunteer Planner und die Organisator:innen von Schichten können dir E-Mails schicken, die deine Schichten betreffen." + +msgid "Please repeat your e-mail address." +msgstr "Bitte wiederhole deine E-Mail-Adresse." + msgid "Repeat password" msgstr "Passwort wiederholen" diff --git a/locale/el/LC_MESSAGES/django.po b/locale/el/LC_MESSAGES/django.po index 768bef4e..7a34c712 100644 --- a/locale/el/LC_MESSAGES/django.po +++ b/locale/el/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Katerina Apostolidi , 2015\n" "Language-Team: Greek (http://www.transifex.com/coders4help/volunteer-planner/language/el/)\n" @@ -22,8 +22,8 @@ msgstr "Όνομα" msgid "last name" msgstr "Επώνυμο" -msgid "email" -msgstr "Ηλεκτρονική διεύθυνση αλληλογραφίας (email)" +msgid "e-mail address" +msgstr "Διεύθυνση email" msgid "date joined" msgstr "" @@ -46,9 +46,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "Διεύθυνση email" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "Λογαριασμός Χρήστη" @@ -94,7 +100,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "Όνομα Χρήστη" msgid "First name" @@ -103,9 +109,6 @@ msgstr "Όνομα" msgid "Last name" msgstr "Επώνυμο" -msgid "Email" -msgstr "Email" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -482,8 +485,8 @@ msgstr "Δωρεάν, και χωρίς διαφημίσεις" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" "\n" @@ -916,7 +919,7 @@ msgstr "Μένουν %(slots_left)s" msgid "Covered" msgstr "Πλήρης" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -1011,10 +1014,10 @@ msgstr "Έχεις ήδη εγγραφεί για αυτή τη βάρδια σ msgid "You successfully left this shift." msgstr "Επιτυχής διαγραφή βάρδιας." -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1053,10 +1056,6 @@ msgstr "Προσχέδια βάρδιας" msgid "shift template" msgstr "Προσχέδιο βάρδιας" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "{task_name} - {workplace_name}" - msgid "Home" msgstr "Αρχική σελίδα" @@ -1244,13 +1243,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "Διεύθυνση email" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "Κωδικός πρόσβασης" @@ -1269,9 +1261,6 @@ msgstr "Επιτυχής αλλαγή κωδικού πρόσβασης!" msgid "Change Password" msgstr "Αλλαγή κωδικού πρόσβασης" -msgid "Change password" -msgstr "Αλλαγή κωδικού πρόσβασης" - msgid "Password reset complete" msgstr "Η αλλαγή κωδικού πρόσβασης ολοκληρώθηκε" @@ -1293,15 +1282,15 @@ msgstr "Πληκτρολόγησε τον καινούριο κωδικό πρό msgid "Password reset" msgstr "Αλλαγή κωδικού πρόσβασης" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "Σου στείλαμε email με έναν σύνδεσμο για να αλλάξεις τον κωδικό πρόσβασης. " -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "Έλεγξε το email σου και κάνε κλικ στον σύνδεσμο που σου στάλθηκε για να συνεχίσεις." #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1335,13 +1324,13 @@ msgstr "Αλλαγή κωδικού πρόσβασης" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "Δεν υπάρχει πρόβλημα. Θα σου στείλουμε οδηγίες σχετικά με το πώς να αλλάξεις τον κωδικό πρόσβασης. " -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "Το email ενεργοποίησης εστάλη." -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "Ένα email ενεργοποίησης θα σου σταλεί στην ηλεκτρονική σου διεύθυνση." -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "Επιβεβαίωσε την εγγραφή σου με το λινκ στο email που θα λάβεις. Αν δεν το έχεις λάβει σε 10 λεπτά, έλεγξε τον φάκελο της ενοχλητικής αλληλογραφίας (spam folder)" msgid "Register for an account" @@ -1353,10 +1342,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 21f46627..8c4b1ce4 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-10-04 21:53+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: English (http://www.transifex.com/coders4help/volunteer-planner/language/en/)\n" @@ -17,7 +17,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -41,9 +41,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -89,7 +95,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -98,9 +104,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -461,8 +464,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -884,7 +887,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -979,10 +982,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1021,10 +1024,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1184,13 +1183,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1209,9 +1201,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1233,15 +1222,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1264,13 +1253,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1282,10 +1271,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/es/LC_MESSAGES/django.po b/locale/es/LC_MESSAGES/django.po index 47c2e81e..0c32ccc7 100644 --- a/locale/es/LC_MESSAGES/django.po +++ b/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Antonio Mireles , 2016\n" "Language-Team: Spanish (http://www.transifex.com/coders4help/volunteer-planner/language/es/)\n" @@ -24,8 +24,8 @@ msgstr "nombre" msgid "last name" msgstr "Apellido" -msgid "email" -msgstr "correo electrónico" +msgid "e-mail address" +msgstr "Correo electrónico" msgid "date joined" msgstr "" @@ -48,9 +48,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "Correo electrónico" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "cuenta de usuario" @@ -96,7 +102,7 @@ msgstr "No hay turnos de trabajo pasados aun." msgid "Show my work shifts in the future" msgstr "Mostrar mis turnos de trabajo futuros" -msgid "Username" +msgid "username" msgstr "Nombre de usuario" msgid "First name" @@ -105,9 +111,6 @@ msgstr "Nombre" msgid "Last name" msgstr "Apellido" -msgid "Email" -msgstr "Correo electrónico" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "Si eliminas tu cuenta, esta informacion sera anonimizada, y ya no va a ser posible que vuelvas a accesar Volunteer-Planner." @@ -482,8 +485,8 @@ msgstr "gratis, sin anuncios" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" "\n" @@ -910,7 +913,7 @@ msgstr "%(slots_left)s más" msgid "Covered" msgstr "Cubierto" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -1005,10 +1008,10 @@ msgstr "Usted ya se ha inscrito para el turno del {date_time} " msgid "You successfully left this shift." msgstr "Usted abandonó exitosamente este turno." -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1047,10 +1050,6 @@ msgstr "formularios de turno" msgid "shift template" msgstr "formulario de turno" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "{task_name} - {workplace_name}" - msgid "Home" msgstr "Inicio" @@ -1239,13 +1238,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "Correo electrónico" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "Contraseña" @@ -1264,9 +1256,6 @@ msgstr "¡La contraseña fue cambiada exitosamente!" msgid "Change Password" msgstr "Cambiar la contraseña" -msgid "Change password" -msgstr "Cambiar la contraseña" - msgid "Password reset complete" msgstr "El restablecimineto de la contraseña está finalizado" @@ -1288,15 +1277,15 @@ msgstr "Introduzca su nueva contraseña abajo para restablecer su contraseña" msgid "Password reset" msgstr "Restablecer la contraseña" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "Le enviamos un correo electrónico con un enlace para restablecer su contraseña." -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "Por favor revise su buzón de correo electrónico y haga clic en el enlace para continuar." #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1330,13 +1319,13 @@ msgstr "Restablecer la contraseña" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "¡No hay problema! Le enviaremos algunas instrucciones sobre cómo restablecer su contraseña." -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "El correo electrónico de activación fue enviado" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "Un correo electrónico de activación será enviado a su dirección de correo electrónico. " -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "Por favor confirme que se haya inscrito siguiendo el enlace en el correo electrónico. Si no lo ha recibido en 10 minutos, búsquelo en la carpeta del correo basura." msgid "Register for an account" @@ -1348,12 +1337,15 @@ msgstr "Puedes crear una nueva cuenta de usuario aqui. Si ya tienes una cuenta d msgid "Create a new account" msgstr "Crear una nueva cuenta" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." -msgstr "Volunteer-Planner y albergues te mandaran correos electronicos acerca de tus turnos de trabajo." - msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "Tu nombre de usuario va a ser visible a otros usuarios. No uses espacios o caracteres especiales." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "Volunteer-Planner y albergues te mandaran correos electronicos acerca de tus turnos de trabajo." + +msgid "Please repeat your e-mail address." +msgstr "" + msgid "Repeat password" msgstr "Repita la contraseña" diff --git a/locale/es_MX/LC_MESSAGES/django.po b/locale/es_MX/LC_MESSAGES/django.po index c8a0e1d1..1db6bae6 100644 --- a/locale/es_MX/LC_MESSAGES/django.po +++ b/locale/es_MX/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Spanish (Mexico) (http://www.transifex.com/coders4help/volunteer-planner/language/es_MX/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/fa/LC_MESSAGES/django.po b/locale/fa/LC_MESSAGES/django.po index 85dec908..70af9970 100644 --- a/locale/fa/LC_MESSAGES/django.po +++ b/locale/fa/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Persian (http://www.transifex.com/coders4help/volunteer-planner/language/fa/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index 0ed7fe3c..d48c5399 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Maxi Krause , 2017\n" "Language-Team: French (http://www.transifex.com/coders4help/volunteer-planner/language/fr/)\n" @@ -29,7 +29,7 @@ msgstr "Prénom" msgid "last name" msgstr "Nom de famille" -msgid "email" +msgid "e-mail address" msgstr "Courrier électronique" msgid "date joined" @@ -53,9 +53,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "Courrier électronique" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "Compte d'utilisateur" @@ -101,7 +107,7 @@ msgstr "Pas de créneaux effectués jusqu'à présent" msgid "Show my work shifts in the future" msgstr "Afficher mes créneaux prévus" -msgid "Username" +msgid "username" msgstr "Nom d'utilisateur" msgid "First name" @@ -110,9 +116,6 @@ msgstr "Prénom" msgid "Last name" msgstr "Nom de famille" -msgid "Email" -msgstr "Courrier électronique" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "Si vous supprimez votre compte, cette information sera anonymisée et tu ne pourras plus te connecter à Volunteer-Planner." @@ -483,8 +486,8 @@ msgstr "gratuitement, sans publicités" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" "\n" @@ -911,7 +914,7 @@ msgstr "%(slots_left)s restant" msgid "Covered" msgstr "Couvert" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -1037,10 +1040,10 @@ msgstr "Tu es déjà inscrit(e) pour ce créneau à {date_time}." msgid "You successfully left this shift." msgstr "Ton désistement pour ce créneau est enregistré." -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1079,10 +1082,6 @@ msgstr "modèles de créneaux" msgid "shift template" msgstr "modèle de créneau" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "{task_name} - {workplace_name}" - msgid "Home" msgstr "Accueil" @@ -1270,13 +1269,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "Courrier électronique" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "Mot de passe" @@ -1295,9 +1287,6 @@ msgstr "Le mot de passe a été modifié" msgid "Change Password" msgstr "Modifie ton mot de passe" -msgid "Change password" -msgstr "Modifie ton mot de passe" - msgid "Password reset complete" msgstr "Réinitialisation du mot de passe terminée" @@ -1319,15 +1308,15 @@ msgstr "Saisis ton adresse courriel ci-dessous pour réinitialiser ton mot de pa msgid "Password reset" msgstr "Réinitialisation du mot de passe" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "Nous venons de vous envoyer un courriel comportant un lien pour rétablir votre mot de passe." -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "Veuillez consulter votre courrier électronique et cliquer sur le lien afin de continuer." #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1360,13 +1349,13 @@ msgstr "Réinitialisation du mot de passe." msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "Pas de problème ! Nous vous enverrons les instructions pour réinitialiser votre mot de passe. " -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "Mail de confirmation envoyé" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "Un mail de confirmation va vous être envoyé" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "Veuillez confirmer votre inscription en cliquant sur le lien que vous allez recevoir par mail. Si vous ne l'avez pas reçu dans 10 minutes, veuillez consulter vos spams" msgid "Register for an account" @@ -1378,12 +1367,15 @@ msgstr "Ici vous pouvez créer un compte utilisateur. Si vous êtes déjà inscr msgid "Create a new account" msgstr "Créer un nouveau compte utilisateur" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." -msgstr "Volunteer-Planner et les refuges vous enverront des mails concernant vos créneaux." - msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "Attention le nom d'utilisateur sera visible pour les autres utilisateurs. Veillez à ne pas utiliser d'espaces ou de signes spéciaux. " +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "Volunteer-Planner et les refuges vous enverront des mails concernant vos créneaux." + +msgid "Please repeat your e-mail address." +msgstr "" + msgid "Repeat password" msgstr "Répéter le mot de passe" diff --git a/locale/hr/LC_MESSAGES/django.po b/locale/hr/LC_MESSAGES/django.po index 4a2e7b3c..5e43426e 100644 --- a/locale/hr/LC_MESSAGES/django.po +++ b/locale/hr/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Croatian (http://www.transifex.com/coders4help/volunteer-planner/language/hr/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -889,7 +892,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -984,10 +987,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1028,10 +1031,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1191,13 +1190,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1216,9 +1208,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1240,15 +1229,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1271,13 +1260,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1289,10 +1278,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/hu/LC_MESSAGES/django.po b/locale/hu/LC_MESSAGES/django.po index b1ccc01f..6d9e2245 100644 --- a/locale/hu/LC_MESSAGES/django.po +++ b/locale/hu/LC_MESSAGES/django.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Péter Gerner, 2015\n" "Language-Team: Hungarian (http://www.transifex.com/coders4help/volunteer-planner/language/hu/)\n" @@ -29,8 +29,8 @@ msgstr "" msgid "last name" msgstr "Vezetéknév" -msgid "email" -msgstr "e-mail" +msgid "e-mail address" +msgstr "E-mail cím" msgid "date joined" msgstr "" @@ -53,9 +53,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "E-mail cím" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "felhasználói fiók" @@ -101,7 +107,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "Felhasználónév" msgid "First name" @@ -110,9 +116,6 @@ msgstr "Keresztnév" msgid "Last name" msgstr "Vezetéknév" -msgid "Email" -msgstr "E-mail" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -473,8 +476,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -896,7 +899,7 @@ msgstr "%(slots_left)s szabadon" msgid "Covered" msgstr "Betöltve" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -991,10 +994,10 @@ msgstr "Erre a műszakra {date_time}-kor már jelentkeztél." msgid "You successfully left this shift." msgstr "Sikeresen kiléptél a beosztásból" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1033,10 +1036,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "Kezdőlap" @@ -1196,13 +1195,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "E-mail cím" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "Jelszó" @@ -1221,9 +1213,6 @@ msgstr "A jelszót sikeresen megváltoztatta!" msgid "Change Password" msgstr "Jelszó megváltoztatása" -msgid "Change password" -msgstr "Jelszó megváltoztatása" - msgid "Password reset complete" msgstr "A jelszó-visszaállítás kész." @@ -1245,15 +1234,15 @@ msgstr "Írja be az új jelszavát alább, hogy visszaállítsa a jelszavát." msgid "Password reset" msgstr "Jelszó visszaállítás" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "Elküldtünk önnek egy e-mailt egy hivatkozással, amivel visszaállíthatja a jelszavát." -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "Kérem, ellenőrizze az e-mailjét és kattintson a hivatkozásra a folytatáshoz." #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1294,13 +1283,13 @@ msgstr "Jelszó visszaállítása" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "Semmi gond! Elküldjük önnek, hogy hogyan állíthatja vissza a jelszavát." -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "Az akitváló e-mailt elküldtük!" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "A regisztrációt aktiváló e-mailt küldünk az e-mail címedre." -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "Erősítsd meg a regisztrációs szándékodat az e-malben kapott linkre kattintva. Ha nem kapsz e-mailt, nézd meg a levélszemetet tartalmazó könyvtárat 10 perc múlva." msgid "Register for an account" @@ -1312,10 +1301,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/hy/LC_MESSAGES/django.po b/locale/hy/LC_MESSAGES/django.po index 7a398e10..44b36d30 100644 --- a/locale/hy/LC_MESSAGES/django.po +++ b/locale/hy/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Armenian (http://www.transifex.com/coders4help/volunteer-planner/language/hy/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/it/LC_MESSAGES/django.po b/locale/it/LC_MESSAGES/django.po index c164021b..f46d562c 100644 --- a/locale/it/LC_MESSAGES/django.po +++ b/locale/it/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Italian (http://www.transifex.com/coders4help/volunteer-planner/language/it/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/nl/LC_MESSAGES/django.po b/locale/nl/LC_MESSAGES/django.po index 97c9ed66..6d6a2db1 100644 --- a/locale/nl/LC_MESSAGES/django.po +++ b/locale/nl/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Dutch (http://www.transifex.com/coders4help/volunteer-planner/language/nl/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/no/LC_MESSAGES/django.po b/locale/no/LC_MESSAGES/django.po index ff8ba86c..df7d22fb 100644 --- a/locale/no/LC_MESSAGES/django.po +++ b/locale/no/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Norwegian (http://www.transifex.com/coders4help/volunteer-planner/language/no/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/pl/LC_MESSAGES/django.po b/locale/pl/LC_MESSAGES/django.po index 93ff1b5e..1f68c86a 100644 --- a/locale/pl/LC_MESSAGES/django.po +++ b/locale/pl/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Magdalena Rother , 2015\n" "Language-Team: Polish (http://www.transifex.com/coders4help/volunteer-planner/language/pl/)\n" @@ -21,8 +21,8 @@ msgstr "" msgid "last name" msgstr "Nazwisko" -msgid "email" -msgstr "email" +msgid "e-mail address" +msgstr "Adres email" msgid "date joined" msgstr "" @@ -45,9 +45,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "Adres email" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -93,7 +99,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "Nazwa użytkownika" msgid "First name" @@ -102,9 +108,6 @@ msgstr "Imię" msgid "Last name" msgstr "Nazwisko" -msgid "Email" -msgstr "Email" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -465,8 +468,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -892,7 +895,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -987,10 +990,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1033,10 +1036,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1196,13 +1195,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "Adres email" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "Hasło" @@ -1221,9 +1213,6 @@ msgstr "Hasło zostało pomyślnie zmienione! " msgid "Change Password" msgstr "Zmień hasło" -msgid "Change password" -msgstr "Zmień hasło" - msgid "Password reset complete" msgstr "Hasło zostało zresetowane" @@ -1245,15 +1234,15 @@ msgstr "Wprowadź nowe hasło poniżej aby zresetować hasło" msgid "Password reset" msgstr "Hasło zostało zresetowane" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "Wysłaliśmy Tobie email z linkiem, przy pomocy którego możesz zrestartować swoje hasło." -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "Proszę sprawdź swoją skrzynkę e-mail i kliknij na link aby kontynuować." #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1288,13 +1277,13 @@ msgstr "Zresetuj hasło" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "Nic się nie stało! Wyślemy Tobie instrukcje, jak zresetować hasło." -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1306,10 +1295,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/pt/LC_MESSAGES/django.po b/locale/pt/LC_MESSAGES/django.po index 24aaaf65..8e3c8006 100644 --- a/locale/pt/LC_MESSAGES/django.po +++ b/locale/pt/LC_MESSAGES/django.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Ricardo Leonardo, 2016\n" "Language-Team: Portuguese (http://www.transifex.com/coders4help/volunteer-planner/language/pt/)\n" @@ -25,8 +25,8 @@ msgstr "nome" msgid "last name" msgstr "Sobrenome" -msgid "email" -msgstr "e-mail" +msgid "e-mail address" +msgstr "Endereço de correio eletrónico" msgid "date joined" msgstr "" @@ -49,9 +49,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "Endereço de correio eletrónico" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "conta do utilizador" @@ -97,7 +103,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "Nome de utilizador" msgid "First name" @@ -106,9 +112,6 @@ msgstr "Nome" msgid "Last name" msgstr "Sobrenome" -msgid "Email" -msgstr "E-mail" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -469,8 +472,8 @@ msgstr "gratuitamente, livre de publicidade" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -892,7 +895,7 @@ msgstr "%(slots_left)s mais" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -987,10 +990,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1029,10 +1032,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "Início" @@ -1192,13 +1191,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "Endereço de correio eletrónico" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "Senha" @@ -1217,9 +1209,6 @@ msgstr "Senha alterada com sucesso!" msgid "Change Password" msgstr "Alterar Senha" -msgid "Change password" -msgstr "Alterar senha" - msgid "Password reset complete" msgstr "Reposição de senha concluída" @@ -1241,15 +1230,15 @@ msgstr "" msgid "Password reset" msgstr "Repor senha" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1272,13 +1261,13 @@ msgstr "Repor senha" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "Não tem problema! Nós iremos enviar-lhe as instruções sobre como repor a sua senha." -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "Mensagem de ativação enviada" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1290,10 +1279,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/pt_BR/LC_MESSAGES/django.po b/locale/pt_BR/LC_MESSAGES/django.po index 1bfca710..20162a84 100644 --- a/locale/pt_BR/LC_MESSAGES/django.po +++ b/locale/pt_BR/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/coders4help/volunteer-planner/language/pt_BR/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/ro/LC_MESSAGES/django.po b/locale/ro/LC_MESSAGES/django.po index b8218601..816f027a 100644 --- a/locale/ro/LC_MESSAGES/django.po +++ b/locale/ro/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Romanian (http://www.transifex.com/coders4help/volunteer-planner/language/ro/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -889,7 +892,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -984,10 +987,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1028,10 +1031,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1191,13 +1190,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1216,9 +1208,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1240,15 +1229,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1271,13 +1260,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1289,10 +1278,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/ru/LC_MESSAGES/django.po b/locale/ru/LC_MESSAGES/django.po index 3522ae12..cea32cbd 100644 --- a/locale/ru/LC_MESSAGES/django.po +++ b/locale/ru/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Anna Dunn, 2022\n" "Language-Team: Russian (http://www.transifex.com/coders4help/volunteer-planner/language/ru/)\n" @@ -22,8 +22,8 @@ msgstr "имя" msgid "last name" msgstr "Фамилия" -msgid "email" -msgstr "электронная почта" +msgid "e-mail address" +msgstr "Адрес электронной почты" msgid "date joined" msgstr "" @@ -46,9 +46,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "Адрес электронной почты" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "аккаунт пользователя" @@ -94,7 +100,7 @@ msgstr "В последние дни еще нет рабочих смен." msgid "Show my work shifts in the future" msgstr "Показать мои рабочие смены в будущем" -msgid "Username" +msgid "username" msgstr "Имя пользователя" msgid "First name" @@ -103,9 +109,6 @@ msgstr "Имя" msgid "Last name" msgstr "Фамилия" -msgid "Email" -msgstr "Электронная почта" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "Если вы удалите свой аккаунт, эта информация будет анонимизирована, и вы больше не сможете войти в Volunteer-Planner." @@ -479,8 +482,8 @@ msgstr "бесплатно, без рекламы" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" "\n" @@ -913,7 +916,7 @@ msgstr "%(slots_left)s еще" msgid "Covered" msgstr "Покрытый" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -1040,10 +1043,10 @@ msgstr "Вы уже записались на эту смену в {date_time}." msgid "You successfully left this shift." msgstr "Вы успешно покинули эту смену." -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1086,10 +1089,6 @@ msgstr "шаблоны смены" msgid "shift template" msgstr "шаблон смены" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "{task_name} - {workplace_name}" - msgid "Home" msgstr "Домашняя страница" @@ -1263,13 +1262,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "Адрес электронной почты" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "Пароль" @@ -1288,9 +1280,6 @@ msgstr "Пароль успешно изменен!" msgid "Change Password" msgstr "Изменить пароль" -msgid "Change password" -msgstr "Изменить пароль" - msgid "Password reset complete" msgstr "Сброс пароля завершен" @@ -1312,15 +1301,15 @@ msgstr "Введите новый пароль ниже, чтобы сброси msgid "Password reset" msgstr "Сброс пароля" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "Мы отправили вам электронное письмо со ссылкой для сброса пароля." -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "Пожалуйста, проверьте свою электронную почту и нажмите на ссылку, чтобы продолжить." #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1354,13 +1343,13 @@ msgstr "Сброс пароля" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "Нет проблем! Мы вышлем вам инструкции по сбросу пароля." -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "Электронное письмо с активацией отправлено" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "На ваш адрес электронной почты будет отправлено письмо с активацией." -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "Пожалуйста, подтвердите регистрацию по ссылке в письме. Если вы не получили его в течение 10 минут, поищите его в папке со спамом." msgid "Register for an account" @@ -1372,12 +1361,15 @@ msgstr "Здесь вы можете создать новую учетную з msgid "Create a new account" msgstr "Создать новый аккаунт" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." -msgstr "Volunteer-Planner и приюты будут отправлять вам электронные письма о ваших сменах." - msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "Ваше имя пользователя будет видно другим пользователям. Не используйте пробелы или специальные символы." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "Volunteer-Planner и приюты будут отправлять вам электронные письма о ваших сменах." + +msgid "Please repeat your e-mail address." +msgstr "" + msgid "Repeat password" msgstr "Повторите пароль" diff --git a/locale/sk/LC_MESSAGES/django.po b/locale/sk/LC_MESSAGES/django.po index 4263b645..d7f55e48 100644 --- a/locale/sk/LC_MESSAGES/django.po +++ b/locale/sk/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Slovak (http://www.transifex.com/coders4help/volunteer-planner/language/sk/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -891,7 +894,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -986,10 +989,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1032,10 +1035,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1195,13 +1194,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1220,9 +1212,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1244,15 +1233,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1275,13 +1264,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1293,10 +1282,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/sl/LC_MESSAGES/django.po b/locale/sl/LC_MESSAGES/django.po index 9c7db6ea..a9a1b255 100644 --- a/locale/sl/LC_MESSAGES/django.po +++ b/locale/sl/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Slovenian (http://www.transifex.com/coders4help/volunteer-planner/language/sl/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -891,7 +894,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -986,10 +989,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1032,10 +1035,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1195,13 +1194,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1220,9 +1212,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1244,15 +1233,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1275,13 +1264,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1293,10 +1282,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/sq/LC_MESSAGES/django.po b/locale/sq/LC_MESSAGES/django.po index 11b297d8..1abd6c63 100644 --- a/locale/sq/LC_MESSAGES/django.po +++ b/locale/sq/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Albanian (http://www.transifex.com/coders4help/volunteer-planner/language/sq/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/sr_RS/LC_MESSAGES/django.po b/locale/sr_RS/LC_MESSAGES/django.po index e1ecd126..9585c7ce 100644 --- a/locale/sr_RS/LC_MESSAGES/django.po +++ b/locale/sr_RS/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Serbian (Serbia) (http://www.transifex.com/coders4help/volunteer-planner/language/sr_RS/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -889,7 +892,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -984,10 +987,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1028,10 +1031,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1191,13 +1190,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1216,9 +1208,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1240,15 +1229,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1271,13 +1260,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1289,10 +1278,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po index 23621ade..217caad7 100644 --- a/locale/sv/LC_MESSAGES/django.po +++ b/locale/sv/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Linnéa Deurell , 2015\n" "Language-Team: Swedish (http://www.transifex.com/coders4help/volunteer-planner/language/sv/)\n" @@ -26,8 +26,8 @@ msgstr "förnamn" msgid "last name" msgstr "Efternamn" -msgid "email" -msgstr "e-post" +msgid "e-mail address" +msgstr "E-postadress" msgid "date joined" msgstr "" @@ -50,9 +50,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "E-postadress" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "användarkonto" @@ -98,7 +104,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "Användarnamn" msgid "First name" @@ -107,9 +113,6 @@ msgstr "Förnamn" msgid "Last name" msgstr "Efternamn" -msgid "Email" -msgstr "E-postadress" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -484,8 +487,8 @@ msgstr "Kostnadsfritt. Reklamfritt." msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" "\n" @@ -914,7 +917,7 @@ msgstr "%(slots_left)s kvar" msgid "Covered" msgstr "Täckt" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -1009,10 +1012,10 @@ msgstr "Du har redan anmält dig till detta pass den {date_time}." msgid "You successfully left this shift." msgstr "Du kommer inte längre att delta i detta pass." -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1051,10 +1054,6 @@ msgstr "byt utkast" msgid "shift template" msgstr "byt utkast" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "{task_name} - {workplace_name}" - msgid "Home" msgstr "Hem" @@ -1242,13 +1241,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "E-postadress" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "Lösenord" @@ -1267,9 +1259,6 @@ msgstr "Lösenordet har nu ändrats." msgid "Change Password" msgstr "Ändra lösenord" -msgid "Change password" -msgstr "Ändra lösenord" - msgid "Password reset complete" msgstr "Lösenordet har återställts" @@ -1291,15 +1280,15 @@ msgstr "För att återställa lösenordet anger du ditt nya lösenord nedan" msgid "Password reset" msgstr "Lösenord återställt" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "Vi har skickat ett mejl till dig med en länk för återställning av ditt lösenord. " -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "Kontrollera din e-post och klicka på länken för att fortsätta." #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1333,13 +1322,13 @@ msgstr "Återställ lösenord" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "Inga problem! Vi skickar dig instruktioner för hur du återställer ditt lösenord." -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "Ett aktiveringsmejl har skickats" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "Ett aktiveringsmejl kommer att skickas till din e-postadress." -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "Vänligen bekräfta registreringen genom att klicka på länken i mejlet. Om du inte mottagit ett mejl inom 10 minuter, titta efter i mappen för skräppost. " msgid "Register for an account" @@ -1351,10 +1340,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/tr/LC_MESSAGES/django.po b/locale/tr/LC_MESSAGES/django.po index 4ffebb3d..afa4d8e6 100644 --- a/locale/tr/LC_MESSAGES/django.po +++ b/locale/tr/LC_MESSAGES/django.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Serdar Dalgiç , 2015\n" "Language-Team: Turkish (http://www.transifex.com/coders4help/volunteer-planner/language/tr/)\n" @@ -21,8 +21,8 @@ msgstr "" msgid "last name" msgstr "Soyisim" -msgid "email" -msgstr "e-posta" +msgid "e-mail address" +msgstr "E-posta adresi" msgid "date joined" msgstr "" @@ -45,9 +45,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "E-posta adresi" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -93,7 +99,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "Kullanıcı Adı" msgid "First name" @@ -102,9 +108,6 @@ msgstr "İsim" msgid "Last name" msgstr "Soyisim" -msgid "Email" -msgstr "E-posta" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -465,8 +468,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -888,7 +891,7 @@ msgstr "%(slots_left)s daha" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -983,10 +986,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "Başarılı bir şekilde vardiyadan ayrıldınız." -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1025,10 +1028,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "Anasayfa" @@ -1188,13 +1187,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "E-posta adresi" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "Şifre" @@ -1213,9 +1205,6 @@ msgstr "Şifre başarıyla değiştirildi." msgid "Change Password" msgstr "Şifre Değiştir" -msgid "Change password" -msgstr "Şifre değiştir" - msgid "Password reset complete" msgstr "" @@ -1237,15 +1226,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1268,13 +1257,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "Aktivasyon e-postası gönderildi" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "Aktivasyon e-postası, e-posta adresinize gönderilecek." -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "Lütfen kaydınız e-postadaki linkle birlikte onaylayın. Eğer 10 dakika için herhangi bir e-posta almadıysanız, lütfen spam klasörünüze bakın." msgid "Register for an account" @@ -1286,10 +1275,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/tr_TR/LC_MESSAGES/django.po b/locale/tr_TR/LC_MESSAGES/django.po index 1d166e67..62703db0 100644 --- a/locale/tr_TR/LC_MESSAGES/django.po +++ b/locale/tr_TR/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Turkish (Turkey) (http://www.transifex.com/coders4help/volunteer-planner/language/tr_TR/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -887,7 +890,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -982,10 +985,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1024,10 +1027,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1187,13 +1186,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1212,9 +1204,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1236,15 +1225,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1267,13 +1256,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1285,10 +1274,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/locale/uk/LC_MESSAGES/django.po b/locale/uk/LC_MESSAGES/django.po index 0976420d..c0a4c124 100644 --- a/locale/uk/LC_MESSAGES/django.po +++ b/locale/uk/LC_MESSAGES/django.po @@ -1,11 +1,12 @@ # # Translators: # Anna Dunn, 2022 +# Anna Dunn, 2022 msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Anna Dunn, 2022\n" "Language-Team: Ukrainian (http://www.transifex.com/coders4help/volunteer-planner/language/uk/)\n" @@ -21,8 +22,8 @@ msgstr "Ім'я" msgid "last name" msgstr "" -msgid "email" -msgstr "Електронна пошта" +msgid "e-mail address" +msgstr "Адреса електронної пошти" msgid "date joined" msgstr "Дата приєднання" @@ -45,9 +46,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "Адреса електронної пошти" + msgid "Accept privacy policy" msgstr "Прийміть політику конфіденційності" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "Обліковий запис користувача" @@ -93,7 +100,7 @@ msgstr "Протягом останніх днів робочих змін не msgid "Show my work shifts in the future" msgstr "Показати мої робочі зміни на майбутнє" -msgid "Username" +msgid "username" msgstr "Ім'я користувача" msgid "First name" @@ -102,9 +109,6 @@ msgstr "Ім'я" msgid "Last name" msgstr "Прізвище" -msgid "Email" -msgstr "Електронна пошта" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "Якщо ви видалите свій обліковий запис, ця інформація буде анонімізована, і ви більше не зможете ввійти в Volunteer-Planner." @@ -478,8 +482,8 @@ msgstr "Безкоштовно, без реклами" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" "\n" @@ -911,7 +915,7 @@ msgstr "%(slots_left)s більше" msgid "Covered" msgstr "Охоплені" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -1023,10 +1027,10 @@ msgstr "Ви вже зареєструвалися на цю зміну о {date msgid "You successfully left this shift." msgstr "Ви успішно залишили цю зміну." -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1069,10 +1073,6 @@ msgstr "шаблони змін" msgid "shift template" msgstr "шаблон зміни" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "Головна" @@ -1250,13 +1250,6 @@ msgstr "Ваш обліковий запис схвалено. Ви можете msgid "Your account is now approved. You can log in using the following link" msgstr "Ваш обліковий запис схвалено. Ви можете увійти, використовуючи наступне посилання" -msgid "Email address" -msgstr "Адреса електронної пошти" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "%(email_trans)s / %(username_trans)s" - msgid "Password" msgstr "Пароль" @@ -1275,9 +1268,6 @@ msgstr "Пароль успішно змінено!" msgid "Change Password" msgstr "Змінити пароль" -msgid "Change password" -msgstr "Змінити пароль" - msgid "Password reset complete" msgstr "Відновлення пароля завершено" @@ -1299,15 +1289,15 @@ msgstr "Введіть свій новий пароль нижче, щоб ск msgid "Password reset" msgstr "Відновлення пароля" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "Ми надіслали вам електронного листа з посиланням для відновлення пароля." -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "Перевірте свою електронну пошту та натисніть посилання, щоб продовжити." #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1339,13 +1329,13 @@ msgstr "Скинути пароль" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "Без проблем! Ми надішлемо вам інструкції щодо відновлення пароля." -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "Електронний лист для активації надіслано" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "На вашу адресу електронної пошти буде надіслано лист з активацією." -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "Будь ласка, підтвердьте реєстрацію за посиланням в електронному листі. Якщо ви не отримали його протягом 10 хвилин, перевірте папку зі спамом." msgid "Register for an account" @@ -1357,12 +1347,15 @@ msgstr "Ви можете створити новий обліковий зап msgid "Create a new account" msgstr "Створити новий обліковий запис" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." -msgstr "Volunteer-Planner і притулки надсилатимуть вам електронні листи щодо ваших змін." - msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "Ваше ім’я користувача буде видно іншим користувачам. Не використовуйте пробіли або спеціальні символи." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "Volunteer-Planner і притулки надсилатимуть вам електронні листи щодо ваших змін." + +msgid "Please repeat your e-mail address." +msgstr "" + msgid "Repeat password" msgstr "Повторіть пароль" diff --git a/locale/zh_CN/LC_MESSAGES/django.po b/locale/zh_CN/LC_MESSAGES/django.po index d626f3c1..edc9e2c7 100644 --- a/locale/zh_CN/LC_MESSAGES/django.po +++ b/locale/zh_CN/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: volunteer-planner.org\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-04-13 23:55+0200\n" +"POT-Creation-Date: 2022-04-14 15:05+0200\n" "PO-Revision-Date: 2015-09-24 12:23+0000\n" "Last-Translator: Dorian Cantzen \n" "Language-Team: Chinese (China) (http://www.transifex.com/coders4help/volunteer-planner/language/zh_CN/)\n" @@ -20,7 +20,7 @@ msgstr "" msgid "last name" msgstr "" -msgid "email" +msgid "e-mail address" msgstr "" msgid "date joined" @@ -44,9 +44,15 @@ msgstr "" msgid "Username must not contain consecutive \".\" or \"_\" characters." msgstr "" +msgid "repeat e-mail address" +msgstr "" + msgid "Accept privacy policy" msgstr "" +msgid "The two e-mail addresses didn’t match." +msgstr "" + msgid "user account" msgstr "" @@ -92,7 +98,7 @@ msgstr "" msgid "Show my work shifts in the future" msgstr "" -msgid "Username" +msgid "username" msgstr "" msgid "First name" @@ -101,9 +107,6 @@ msgstr "" msgid "Last name" msgstr "" -msgid "Email" -msgstr "" - msgid "If you delete your account, this information will be anonymized, and its not possible for you to log into Volunteer-Planner anymore." msgstr "" @@ -464,8 +467,8 @@ msgstr "" msgid "" "\n" -"

The platform was build by a group of volunteering professionals in the area of software development, project management, design,\n" -" and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

\n" +"

The platform was built by a group of volunteering professionals in the area of software development, project management, design,\n" +" and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

\n" " " msgstr "" @@ -885,7 +888,7 @@ msgstr "" msgid "Covered" msgstr "" -msgid "Send email to all volunteers" +msgid "Send e-mail to all volunteers" msgstr "" msgid "Drop out" @@ -980,10 +983,10 @@ msgstr "" msgid "You successfully left this shift." msgstr "" -msgid "You have no permissions to send emails!" +msgid "You have no permissions to send e-mails!" msgstr "" -msgid "Email has been sent." +msgid "E-mail has been sent." msgstr "" #, python-brace-format @@ -1020,10 +1023,6 @@ msgstr "" msgid "shift template" msgstr "" -#, python-brace-format -msgid "{task_name} - {workplace_name}" -msgstr "" - msgid "Home" msgstr "" @@ -1183,13 +1182,6 @@ msgstr "" msgid "Your account is now approved. You can log in using the following link" msgstr "" -msgid "Email address" -msgstr "" - -#, python-format -msgid "%(email_trans)s / %(username_trans)s" -msgstr "" - msgid "Password" msgstr "" @@ -1208,9 +1200,6 @@ msgstr "" msgid "Change Password" msgstr "" -msgid "Change password" -msgstr "" - msgid "Password reset complete" msgstr "" @@ -1232,15 +1221,15 @@ msgstr "" msgid "Password reset" msgstr "" -msgid "We sent you an email with a link to reset your password." +msgid "We sent you an e-mail with a link to reset your password." msgstr "" -msgid "Please check your email and click the link to continue." +msgid "Please check your e-mails and click the link to continue." msgstr "" #, python-format msgid "" -"You are receiving this email because you (or someone pretending to be you)\n" +"You are receiving this e-mail because you (or someone pretending to be you)\n" "requested that your password be reset on the %(domain)s site. If you do not\n" "wish to reset your password, please ignore this message.\n" "\n" @@ -1263,13 +1252,13 @@ msgstr "" msgid "No Problem! We'll send you instructions on how to reset your password." msgstr "" -msgid "Activation email sent" +msgid "Activation e-mail sent" msgstr "" -msgid "An activation mail will be sent to you email address." +msgid "An activation e-mail will be sent to your e-mail address." msgstr "" -msgid "Please confirm registration with the link in the email. If you haven't received it in 10 minutes, look for it in your spam folder." +msgid "Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder." msgstr "" msgid "Register for an account" @@ -1281,10 +1270,13 @@ msgstr "" msgid "Create a new account" msgstr "" -msgid "Volunteer-Planner and shelters will send you emails concerning your shifts." +msgid "Your username will be visible to other users. Don't use spaces or special characters." msgstr "" -msgid "Your username will be visible to other users. Don't use spaces or special characters." +msgid "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." +msgstr "" + +msgid "Please repeat your e-mail address." msgstr "" msgid "Repeat password" diff --git a/non_logged_in_area/templates/base_non_logged_in.html b/non_logged_in_area/templates/base_non_logged_in.html index 2e7ae2fd..fc3493de 100644 --- a/non_logged_in_area/templates/base_non_logged_in.html +++ b/non_logged_in_area/templates/base_non_logged_in.html @@ -1,4 +1,4 @@ -{% load humanize i18n static %} +{% load humanize i18n static site %} @@ -128,3 +128,4 @@ + diff --git a/non_logged_in_area/templates/shelters_need_help.html b/non_logged_in_area/templates/shelters_need_help.html index e2adc50e..c2f4635d 100644 --- a/non_logged_in_area/templates/shelters_need_help.html +++ b/non_logged_in_area/templates/shelters_need_help.html @@ -59,8 +59,8 @@

{% translate "The right help at the right time at the right place" %}

{% translate "for free, ad free" %}

{% blocktranslate %} -

The platform was build by a group of volunteering professionals in the area of software development, project management, design, - and marketing. The code is open sourced for non-commercial use. Private data (emailaddresses, profile data etc.) will be not given to any third party.

+

The platform was built by a group of volunteering professionals in the area of software development, project management, design, + and marketing. The code is open sourced for non-commercial use. Private data (e-mail addresses, profile data etc.) will be not given to any third party.

{% endblocktranslate %}
diff --git a/organizations/templates/manage_members.html b/organizations/templates/manage_members.html index dcd7e55c..59217bdc 100644 --- a/organizations/templates/manage_members.html +++ b/organizations/templates/manage_members.html @@ -61,10 +61,12 @@

{{ memberships_for_status.list.0.get_status_display|title }}

- {% translate "Username" %} + {% translate "username" as username_label %} + {{ username_label|title }} - {% translate "Email" %} + {% translate "e-mail address" as email_address_label %} + {{ email_address_label|title }} {% translate "Role" %} diff --git a/resources/angularjs/1.4.7/angular-sanitize.js b/resources/angularjs/1.4.7/angular-sanitize.js index 1e86f2d7..aba91fde 100644 --- a/resources/angularjs/1.4.7/angular-sanitize.js +++ b/resources/angularjs/1.4.7/angular-sanitize.js @@ -536,7 +536,7 @@ angular.module('ngSanitize', []).provider('$sanitize', $SanitizeProvider); * * @description * Finds links in text input and turns them into html links. Supports http/https/ftp/mailto and - * plain email address links. + * plain e-mail address links. * * Requires the {@link ngSanitize `ngSanitize`} module to be installed. * diff --git a/scheduler/templates/helpdesk_single.html b/scheduler/templates/helpdesk_single.html index 635cd999..f6d76a81 100644 --- a/scheduler/templates/helpdesk_single.html +++ b/scheduler/templates/helpdesk_single.html @@ -57,7 +57,7 @@ id: {{ shift.id }}, group: {{ task.id }}, subgroup: '{{ workplace.id|default:"no workplace" }}', - content: '{{ shift.workplace.name|default:shift.task.name }} ({{ shift.volunteer_count }}/{{ shift.slots }})
{% blocktranslate trimmed with starting_time=shift.starting_time|date:"H:i" ending_time=shift.ending_time|date:"H:i" %}{{ starting_time }} - {{ ending_time }}{% endblocktranslate %}', + content: '{{ shift.task.name }}{% if shift.workplace %} - {{ shift.workplace.name }}{% endif %} ({{ shift.volunteer_count }}/{{ shift.slots }})
{% blocktranslate trimmed with starting_time=shift.starting_time|date:"H:i" ending_time=shift.ending_time|date:"H:i" %}{{ starting_time }} - {{ ending_time }}{% endblocktranslate %}', subgroupOrder: '{{ workplace.name }}', start: "{{ shift.starting_time|date:"c" }}", end: "{{ shift.ending_time|date:"c" }}" @@ -354,7 +354,7 @@

data-shift-id="{{ shift.id }}" type="button" class="btn btn-default btn-sm shift-msg-button"> - {% trans "Send email to all volunteers" %} + {% trans "Send e-mail to all volunteers" %} {% endif %} diff --git a/scheduler/templates/shift_details.html b/scheduler/templates/shift_details.html index cbee14da..7e657e3b 100644 --- a/scheduler/templates/shift_details.html +++ b/scheduler/templates/shift_details.html @@ -34,7 +34,7 @@
  • - {{ shift.task }}{{ shift.workplace|yes:' - '|add:shift.workplace.name }} + {{ shift.task }}{% if shift.workplace %} - {{ shift.workplace.name }}{% endif %}
    • @@ -49,9 +49,10 @@

    {% if shift.members_only %}   - {{ shift.task }}{{ shift.workplace|yes:' - '|add:shift.workplace.name }} + {{ shift.task }}{% if shift.workplace %} - {{ shift.workplace.name }}{% endif %} + {% else %} - {{ shift.task }}{{ shift.workplace|yes:' - '|add:shift.workplace.name }} + {{ shift.task }}{% if shift.workplace %} - {{ shift.workplace.name }}{% endif %} {% endif %}

    diff --git a/scheduler/views.py b/scheduler/views.py index c5c0dc46..75fe7369 100644 --- a/scheduler/views.py +++ b/scheduler/views.py @@ -400,7 +400,9 @@ def form_valid(self, form): shift = form.cleaned_data.get("shift") if not is_facility_manager(user_account.user, shift.facility): - messages.warning(self.request, _("You have no permissions to send emails!")) + messages.warning( + self.request, _("You have no permissions to send e-mails!") + ) return super(SendMessageToShiftHelpers, self).form_valid(form) shift_message = ShiftMessageToHelpers.objects.create( @@ -416,7 +418,7 @@ def form_valid(self, form): shift_message.recipients.add(helper) shift_message.save() - messages.info(self.request, _("Email has been sent.")) + messages.info(self.request, _("E-mail has been sent.")) return super(SendMessageToShiftHelpers, self).form_valid(form) def get_success_url(self): diff --git a/scheduletemplates/models.py b/scheduletemplates/models.py index 01a4bfbb..cb22e201 100644 --- a/scheduletemplates/models.py +++ b/scheduletemplates/models.py @@ -113,11 +113,8 @@ def summary(self): ) def __unicode__(self): - if self.workplace: - return _("{task_name} - {workplace_name}").format( - task_name=self.task.name, workplace_name=self.workplace.name - ) + return f"{self.task.name} - {self.workplace.name}" else: return f"{self.task.name}" diff --git a/scheduletemplates/templates/admin/scheduletemplates/apply_template.html b/scheduletemplates/templates/admin/scheduletemplates/apply_template.html index d440b3b5..9edba4a2 100644 --- a/scheduletemplates/templates/admin/scheduletemplates/apply_template.html +++ b/scheduletemplates/templates/admin/scheduletemplates/apply_template.html @@ -110,7 +110,8 @@

    {{ shift.slots }} {{ shift.task.name }} - {{ shift.workplace.name|default:"" }} + {% if shift.workplace %}{{ shift.workplace.name }}{% else %}-{% endif %} + {{ shift.starting_time }} {{ shift.localized_display_ending_time }} diff --git a/scheduletemplates/templates/admin/scheduletemplates/apply_template_confirm.html b/scheduletemplates/templates/admin/scheduletemplates/apply_template_confirm.html index 7369785a..8c2c76c6 100644 --- a/scheduletemplates/templates/admin/scheduletemplates/apply_template_confirm.html +++ b/scheduletemplates/templates/admin/scheduletemplates/apply_template_confirm.html @@ -94,7 +94,7 @@

    {{ shift.slots }} {{ shift.task.name }} - {{ shift.workplace.name|default:"-" }} + {% if shift.workplace %}{{ shift.workplace.name }}{% else %}-{% endif %} {% if is_template %} {{ shift.starting_time }} diff --git a/templates/base.html b/templates/base.html index bcb9c3b6..efe0a8e1 100644 --- a/templates/base.html +++ b/templates/base.html @@ -58,3 +58,4 @@ {% endblock %} + diff --git a/templates/partials/footer.html b/templates/partials/footer.html index eae07b05..134f3d10 100644 --- a/templates/partials/footer.html +++ b/templates/partials/footer.html @@ -1,4 +1,4 @@ -{% load i18n %} +{% load i18n site %}

    @@ -9,11 +9,12 @@ {% translate "Supporter" %} • {% translate "Press" %} • {% translate "Contact" %} • - {% include "partials/faq_link.html" %} • - © 2015 volunteer-planner.org • + {% include "partials/faq_link.html" %} +
    + © 2015-2016, 2022 volunteer-planner.org • + v{% get_version %} • GitHub • - {% blocktranslate trimmed with mailto_link='kontakt@volunteer-planner.org' %} Questions? Get in touch: {{ mailto_link }} {% endblocktranslate %} diff --git a/templates/registration/login.html b/templates/registration/login.html index 912ab8ef..9a18a406 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -25,10 +25,10 @@

    {% translate "Login" %}

    {{ error|escape }}
    {% endfor %} - {% translate "Email address" as email_trans %} - {% translate "Username" as username_trans %} + {% translate "e-mail address" as email_trans %} + {% translate "username" as username_trans %}

    diff --git a/templates/registration/password_change_form.html b/templates/registration/password_change_form.html index 7641fa49..a1a42338 100644 --- a/templates/registration/password_change_form.html +++ b/templates/registration/password_change_form.html @@ -3,15 +3,17 @@ {% block title %}{% translate "Change Password" %}{% endblock %} {% block registration_content %} -

    {% translate "Change Password" %}

    + {% translate "Change Password" as change_password_label %} +

    {{ change_password_label | title }}

    {% csrf_token %}
    - + {% translate "e-mail address" as email_address_label %} + + placeholder="{{ email_address_label|title }}">
    - +
    {% endblock %} diff --git a/templates/registration/password_reset_confirm.html b/templates/registration/password_reset_confirm.html index d724b2ba..b5bec6cd 100644 --- a/templates/registration/password_reset_confirm.html +++ b/templates/registration/password_reset_confirm.html @@ -10,6 +10,7 @@

    {% translate "Enter your new password below to reset your password" %}

    {{ form.as_table }}
    - + {% translate "Change Password" as change_password_label %} + {% endblock %} diff --git a/templates/registration/password_reset_done.html b/templates/registration/password_reset_done.html index 15f1d530..480ffaf3 100644 --- a/templates/registration/password_reset_done.html +++ b/templates/registration/password_reset_done.html @@ -3,6 +3,6 @@ {% block title %}{% translate "Password reset" %}{% endblock %} {% block registration_content %} -

    {% translate "We sent you an email with a link to reset your password." %}

    -

    {% translate "Please check your email and click the link to continue." %}

    +

    {% translate "We sent you an e-mail with a link to reset your password." %}

    +

    {% translate "Please check your e-mails and click the link to continue." %}

    {% endblock %} diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html index f0330db2..9f000292 100644 --- a/templates/registration/password_reset_email.html +++ b/templates/registration/password_reset_email.html @@ -1,6 +1,6 @@ {% load i18n %}"Greetings" {% if user.get_full_name %}{% else %}{% endif %}, -{% blocktranslate %}You are receiving this email because you (or someone pretending to be you) +{% blocktranslate %}You are receiving this e-mail because you (or someone pretending to be you) requested that your password be reset on the {{ domain }} site. If you do not wish to reset your password, please ignore this message. diff --git a/templates/registration/password_reset_form.html b/templates/registration/password_reset_form.html index 171bd06a..8061bdec 100644 --- a/templates/registration/password_reset_form.html +++ b/templates/registration/password_reset_form.html @@ -9,9 +9,10 @@

    {% translate "Forgot your password?" %}

    {% csrf_token %}
    - - + {% translate "e-mail address" as email_address_label %} + +
    diff --git a/templates/registration/registration_complete.html b/templates/registration/registration_complete.html index 0990162a..4fa57f4c 100644 --- a/templates/registration/registration_complete.html +++ b/templates/registration/registration_complete.html @@ -1,17 +1,17 @@ {% extends "registration/registration_base.html" %} {% load i18n %} -{% block title %} {% translate "Activation email sent" %}{% endblock %} +{% block title %} {% translate "Activation e-mail sent" %}{% endblock %} {% block content %}

    {% blocktranslate trimmed %} - An activation mail will be sent to you email address. + An activation e-mail will be sent to your e-mail address. {% endblocktranslate %}

    {% blocktranslate trimmed %} - Please confirm registration with the link in the email. If you + Please confirm registration with the link in the e-mail. If you haven't received it in 10 minutes, look for it in your spam folder. {% endblocktranslate %} diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index 86df0a93..6fa18943 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -14,33 +14,53 @@

    {% translate "Create a new account" %}

    {{ form.non_field_errors }}
    {% csrf_token %} + +
    +
    +
    {% for error in form.email.errors %} {% endfor %} + {% translate "e-mail address" as placeholder %} -

    {% translate "Volunteer-Planner and shelters will send you emails concerning your shifts." %}

    +

    {% translate "Volunteer Planner and event organizers might send you e-mails concerning your volunteer work." %}

    -
    -