diff --git a/AUTHORS b/AUTHORS index a7ef36b..704d9d5 100644 --- a/AUTHORS +++ b/AUTHORS @@ -21,6 +21,7 @@ Anna Sirota Antonin Delpeuch Aron Griffis +Bas ten Berge Basil Shubin Ben Timby Benjamin Jorand @@ -31,6 +32,7 @@ Chris Davis Christian Carter Christopher Grebs +Dani Hodovic Daniel Eriksson Daniel Widerin David Ascher @@ -38,11 +40,15 @@ David Evans David Friedman David Hummel +Dimitris Tsimpitas Egor Poderyagin Eran Rundstein +Eric Amador Eric Delord Fabio Caritas Barrionuevo da Luz Facundo Gaich +Francis Brito +Frantisek Malina Fred Palmer Fábio Santos George Whewell @@ -65,6 +71,7 @@ Jeremy Satterfield Jerome Leclanche Jesse Gerard Brands +Jihoon Park Jiyoon Ha Joe Vanderstelt John Bazik @@ -122,8 +129,10 @@ Stuart Ross Terry Jones Tiago Loureiro +Tim Gates Tomas Babej Tomas Marcik +Trey Corple Tuk Bredsdorff Udi Oron Victor Semionov diff --git a/ChangeLog.rst b/ChangeLog.rst index 29de436..dd005e6 100644 --- a/ChangeLog.rst +++ b/ChangeLog.rst @@ -1,3 +1,29 @@ +0.41.0 (2019-12-18) +******************* + +Security notice +--------------- + +- See `CVE-2019-19844 + `_. + + +Note worthy changes +------------------- + +- New providers: Exist.io., YNAB, Amazon Cognito. + +- You can now store OAuth credentials directly in your + ``settings.SOCIALACCOUNT_PROVIDERS`` settings instead of storing them in the + database using a ``SocialApp`` record. + + +Backwards incompatible changes +------------------------------ + +- Dropped Python 2 and Django 1 compatibility. + + 0.40.0 (2019-08-29) ******************* diff --git a/PKG-INFO b/PKG-INFO index e4cc20e..be5d1ba 100644 --- a/PKG-INFO +++ b/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: django-allauth -Version: 0.40.0 +Version: 0.41.0 Summary: Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication. Home-page: http://github.com/pennersr/django-allauth Author: Raymond Penners @@ -9,9 +9,6 @@ Description: ========================== Welcome to django-allauth! ========================== - - .. image:: https://badge.fury.io/py/django-allauth.svg - :target: http://badge.fury.io/py/django-allauth .. image:: https://travis-ci.org/pennersr/django-allauth.svg :target: http://travis-ci.org/pennersr/django-allauth @@ -31,6 +28,9 @@ .. image:: https://img.shields.io/badge/code_style-standard-brightgreen.svg :target: http://standardjs.com + + .. image:: https://pennersr.github.io/img/emacs-badge.svg + :target: https://www.gnu.org/software/emacs/ Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account @@ -102,12 +102,13 @@ Classifier: License :: OSI Approved :: MIT License Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 Classifier: Framework :: Django -Classifier: Framework :: Django :: 1.11 Classifier: Framework :: Django :: 2.0 Classifier: Framework :: Django :: 2.1 Classifier: Framework :: Django :: 2.2 +Classifier: Framework :: Django :: 3.0 diff --git a/README.rst b/README.rst index f213d14..f21cf61 100644 --- a/README.rst +++ b/README.rst @@ -1,9 +1,6 @@ ========================== Welcome to django-allauth! ========================== - -.. image:: https://badge.fury.io/py/django-allauth.svg - :target: http://badge.fury.io/py/django-allauth .. image:: https://travis-ci.org/pennersr/django-allauth.svg :target: http://travis-ci.org/pennersr/django-allauth @@ -23,6 +20,9 @@ .. image:: https://img.shields.io/badge/code_style-standard-brightgreen.svg :target: http://standardjs.com + +.. image:: https://pennersr.github.io/img/emacs-badge.svg + :target: https://www.gnu.org/software/emacs/ Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account diff --git a/allauth/__init__.py b/allauth/__init__.py index b562989..783fcb1 100644 --- a/allauth/__init__.py +++ b/allauth/__init__.py @@ -8,7 +8,7 @@ """ -VERSION = (0, 40, 0, 'final', 0) +VERSION = (0, 41, 0, 'final', 0) __title__ = 'django-allauth' __version_info__ = VERSION diff --git a/allauth/account/adapter.py b/allauth/account/adapter.py index 1517b1b..02a2f82 100644 --- a/allauth/account/adapter.py +++ b/allauth/account/adapter.py @@ -25,8 +25,8 @@ from django.template.loader import render_to_string from django.urls import reverse from django.utils import timezone - -from allauth.compat import force_str, ugettext_lazy as _ +from django.utils.encoding import force_str +from django.utils.translation import gettext_lazy as _ from ..utils import ( build_absolute_uri, diff --git a/allauth/account/apps.py b/allauth/account/apps.py index e746a8b..2b2496f 100644 --- a/allauth/account/apps.py +++ b/allauth/account/apps.py @@ -1,6 +1,5 @@ from django.apps import AppConfig - -from allauth.compat import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class AccountConfig(AppConfig): diff --git a/allauth/account/forms.py b/allauth/account/forms.py index 15e815f..8c4f29d 100644 --- a/allauth/account/forms.py +++ b/allauth/account/forms.py @@ -8,9 +8,7 @@ from django.contrib.sites.shortcuts import get_current_site from django.core import exceptions, validators from django.urls import reverse -from django.utils.translation import pgettext - -from allauth.compat import ugettext, ugettext_lazy as _ +from django.utils.translation import gettext, gettext_lazy as _, pgettext from ..utils import ( build_absolute_uri, @@ -300,10 +298,10 @@ ) ) if email_required: - self.fields['email'].label = ugettext("E-mail") + self.fields['email'].label = gettext("E-mail") self.fields['email'].required = True else: - self.fields['email'].label = ugettext("E-mail (optional)") + self.fields['email'].label = gettext("E-mail (optional)") self.fields['email'].required = False self.fields['email'].widget.is_required = False if self.username_required: @@ -501,7 +499,7 @@ def clean_email(self): email = self.cleaned_data["email"] email = get_adapter().clean_email(email) - self.users = filter_users_by_email(email) + self.users = filter_users_by_email(email, is_active=True) if not self.users: raise forms.ValidationError(_("The e-mail address is not assigned" " to any user account")) diff --git a/allauth/account/models.py b/allauth/account/models.py index d6c9ee3..0f307cb 100644 --- a/allauth/account/models.py +++ b/allauth/account/models.py @@ -6,8 +6,7 @@ from django.db import models, transaction from django.utils import timezone from django.utils.crypto import get_random_string - -from allauth.compat import python_2_unicode_compatible, ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from .. import app_settings as allauth_app_settings from . import app_settings, signals @@ -16,7 +15,6 @@ from .utils import user_email -@python_2_unicode_compatible class EmailAddress(models.Model): user = models.ForeignKey(allauth_app_settings.USER_MODEL, @@ -37,7 +35,7 @@ unique_together = [("user", "email")] def __str__(self): - return "%s (%s)" % (self.email, self.user) + return self.email def set_as_primary(self, conditional=False): old_primary = EmailAddress.objects.get_primary(self.user) @@ -74,7 +72,6 @@ self.send_confirmation(request) -@python_2_unicode_compatible class EmailConfirmation(models.Model): email_address = models.ForeignKey(EmailAddress, diff --git a/allauth/account/tests.py b/allauth/account/tests.py index f4e5361..a2b8844 100644 --- a/allauth/account/tests.py +++ b/allauth/account/tests.py @@ -18,7 +18,7 @@ from django.urls import reverse from django.utils.timezone import now -from allauth.account.forms import BaseSignupForm, SignupForm +from allauth.account.forms import BaseSignupForm, ResetPasswordForm, SignupForm from allauth.account.models import ( EmailAddress, EmailConfirmation, @@ -1217,3 +1217,58 @@ args=[key])) assert mock_perform_login.called + + +class TestResetPasswordForm(TestCase): + + def test_user_email_not_sent_inactive_user(self): + User = get_user_model() + User.objects.create_user( + 'mike123', + 'mike@ixample.org', + 'test123', + is_active=False) + data = {'email': 'mike@ixample.org'} + form = ResetPasswordForm(data) + self.assertFalse(form.is_valid()) + + +class TestCVE2019_19844(TestCase): + + global_request = RequestFactory().get('/') + + def test_user_email_unicode_collision(self): + User = get_user_model() + User.objects.create_user('mike123', 'mike@example.org', 'test123') + User.objects.create_user('mike456', 'mıke@example.org', 'test123') + data = {'email': 'mıke@example.org'} + form = ResetPasswordForm(data) + self.assertTrue(form.is_valid()) + form.save(self.global_request) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].to, ['mıke@example.org']) + + def test_user_email_domain_unicode_collision(self): + User = get_user_model() + User.objects.create_user('mike123', 'mike@ixample.org', 'test123') + User.objects.create_user('mike456', 'mike@ıxample.org', 'test123') + data = {'email': 'mike@ıxample.org'} + form = ResetPasswordForm(data) + self.assertTrue(form.is_valid()) + form.save(self.global_request) + self.assertEqual(len(mail.outbox), 1) + self.assertEqual(mail.outbox[0].to, ['mike@ıxample.org']) + + def test_user_email_unicode_collision_nonexistent(self): + User = get_user_model() + User.objects.create_user('mike123', 'mike@example.org', 'test123') + data = {'email': 'mıke@example.org'} + form = ResetPasswordForm(data) + self.assertFalse(form.is_valid()) + + def test_user_email_domain_unicode_collision_nonexistent(self): + User = get_user_model() + User.objects.create_user('mike123', 'mike@ixample.org', 'test123') + data = {'email': 'mike@ıxample.org'} + form = ResetPasswordForm(data) + self.assertFalse(form.is_valid()) diff --git a/allauth/account/urls.py b/allauth/account/urls.py index cde26f8..31eac36 100644 --- a/allauth/account/urls.py +++ b/allauth/account/urls.py @@ -1,34 +1,32 @@ -from django.conf.urls import url +from django.urls import path, re_path from . import views urlpatterns = [ - url(r"^signup/$", views.signup, name="account_signup"), - url(r"^login/$", views.login, name="account_login"), - url(r"^logout/$", views.logout, name="account_logout"), - - url(r"^password/change/$", views.password_change, - name="account_change_password"), - url(r"^password/set/$", views.password_set, name="account_set_password"), - - url(r"^inactive/$", views.account_inactive, name="account_inactive"), + path("signup/", views.signup, name="account_signup"), + path("login/", views.login, name="account_login"), + path("logout/", views.logout, name="account_logout"), + path("password/change/", views.password_change, + name="account_change_password"), + path("password/set/", views.password_set, name="account_set_password"), + path("inactive/", views.account_inactive, name="account_inactive"), # E-mail - url(r"^email/$", views.email, name="account_email"), - url(r"^confirm-email/$", views.email_verification_sent, - name="account_email_verification_sent"), - url(r"^confirm-email/(?P[-:\w]+)/$", views.confirm_email, - name="account_confirm_email"), + path("email/", views.email, name="account_email"), + path("confirm-email/", views.email_verification_sent, + name="account_email_verification_sent"), + re_path(r"^confirm-email/(?P[-:\w]+)/$", views.confirm_email, + name="account_confirm_email"), # password reset - url(r"^password/reset/$", views.password_reset, - name="account_reset_password"), - url(r"^password/reset/done/$", views.password_reset_done, - name="account_reset_password_done"), - url(r"^password/reset/key/(?P[0-9A-Za-z]+)-(?P.+)/$", - views.password_reset_from_key, - name="account_reset_password_from_key"), - url(r"^password/reset/key/done/$", views.password_reset_from_key_done, - name="account_reset_password_from_key_done"), + path("password/reset/", views.password_reset, + name="account_reset_password"), + path("password/reset/done/", views.password_reset_done, + name="account_reset_password_done"), + re_path(r"^password/reset/key/(?P[0-9A-Za-z]+)-(?P.+)/$", + views.password_reset_from_key, + name="account_reset_password_from_key"), + path("password/reset/key/done/", views.password_reset_from_key_done, + name="account_reset_password_from_key_done"), ] diff --git a/allauth/account/utils.py b/allauth/account/utils.py index 8340d12..27ca06d 100644 --- a/allauth/account/utils.py +++ b/allauth/account/utils.py @@ -1,3 +1,4 @@ +import unicodedata from collections import OrderedDict from datetime import timedelta @@ -8,10 +9,9 @@ from django.db import models from django.db.models import Q from django.http import HttpResponseRedirect -from django.utils.http import urlencode +from django.utils.encoding import force_str +from django.utils.http import base36_to_int, int_to_base36, urlencode from django.utils.timezone import now - -from allauth.compat import base36_to_int, force_str, int_to_base36, six from ..exceptions import ImmediateHttpResponse from ..utils import ( @@ -23,6 +23,17 @@ from . import app_settings, signals from .adapter import get_adapter from .app_settings import EmailVerificationMethod + + +def _unicode_ci_compare(s1, s2): + """ + Perform case-insensitive comparison of two identifiers, using the + recommended algorithm from Unicode Technical Report 36, section + 2.11.2(B)(2). + """ + norm_s1 = unicodedata.normalize('NFKC', s1).casefold() + norm_s2 = unicodedata.normalize('NFKC', s2).casefold() + return norm_s1 == norm_s2 def get_next_redirect_url(request, redirect_field_name="next"): @@ -370,7 +381,7 @@ return ret -def filter_users_by_email(email): +def filter_users_by_email(email, is_active=None): """Return list of users by email address Typically one, at most just a few in length. First we look through @@ -380,10 +391,21 @@ from .models import EmailAddress User = get_user_model() mails = EmailAddress.objects.filter(email__iexact=email) - users = [e.user for e in mails.prefetch_related('user')] + if is_active is not None: + mails = mails.filter(user__is_active=is_active) + users = [] + for e in mails.prefetch_related('user'): + if _unicode_ci_compare(e.email, email): + users.append(e.user) if app_settings.USER_MODEL_EMAIL_FIELD: q_dict = {app_settings.USER_MODEL_EMAIL_FIELD + '__iexact': email} - users += list(User.objects.filter(**q_dict)) + user_qs = User.objects.filter(**q_dict) + if is_active is not None: + user_qs = user_qs.filter(is_active=is_active) + for user in user_qs.iterator(): + user_email = getattr(user, app_settings.USER_MODEL_EMAIL_FIELD) + if _unicode_ci_compare(user_email, email): + users.append(user) return list(set(users)) @@ -401,12 +423,12 @@ """ User = get_user_model() if issubclass(type(User._meta.pk), models.UUIDField): - if isinstance(user.pk, six.string_types): + if isinstance(user.pk, str): return user.pk return user.pk.hex ret = user.pk - if isinstance(ret, six.integer_types): + if isinstance(ret, int): ret = int_to_base36(user.pk) return str(ret) diff --git a/allauth/account/views.py b/allauth/account/views.py index cd4ad29..48f0c87 100644 --- a/allauth/account/views.py +++ b/allauth/account/views.py @@ -45,7 +45,8 @@ sensitive_post_parameters_m = method_decorator( - sensitive_post_parameters('password', 'password1', 'password2')) + sensitive_post_parameters( + 'oldpassword', 'password', 'password1', 'password2')) def _ajax_response(request, response, form=None, data=None): diff --git a/allauth/compat.py b/allauth/compat.py deleted file mode 100644 index df63369..0000000 --- a/allauth/compat.py +++ /dev/null @@ -1,79 +0,0 @@ -try: - from django.utils.six.moves.urllib.parse import urlsplit -except ImportError: - from urllib.parse import urlsplit # noqa - -try: - from django.utils import six -except ImportError: - class six: - PY3 = True - PY2 = False - integer_types = (int,) - string_types = (str,) - - -try: - from collections import UserDict -except ImportError: - from UserDict import UserDict # noqa - -try: - from urllib.parse import parse_qsl, parse_qs, urlparse, urlunparse, urljoin -except ImportError: - from urlparse import parse_qsl, parse_qs, urlparse, urlunparse, urljoin # noqa - -try: - from django.utils.encoding import python_2_unicode_compatible -except ImportError: - def python_2_unicode_compatible(c): - return c - -if six.PY2: - from django.utils.encoding import force_text as force_str -else: - try: - from django.utils.encoding import force_str - except ImportError: - from django.utils.encoding import force_text as force_str # noqa - - -def int_to_base36(i): - """ - Django on py2 raises ValueError on large values. - """ - if six.PY2: - char_set = '0123456789abcdefghijklmnopqrstuvwxyz' - if i < 0: - raise ValueError("Negative base36 conversion input.") - if not isinstance(i, six.integer_types): - raise TypeError("Non-integer base36 conversion input.") - if i < 36: - return char_set[i] - b36 = '' - while i != 0: - i, n = divmod(i, 36) - b36 = char_set[n] + b36 - else: - from django.utils.http import int_to_base36 - b36 = int_to_base36(i) - return b36 - - -def base36_to_int(s): - if six.PY2: - if len(s) > 13: - raise ValueError("Base36 input too large") - value = int(s, 36) - else: - from django.utils.http import base36_to_int - value = base36_to_int(s) - return value - - -if six.PY3: - from django.utils.translation import gettext as ugettext # noqa - from django.utils.translation import gettext_lazy as ugettext_lazy # noqa -else: - from django.utils.translation import ugettext # noqa - from django.utils.translation import ugettext_lazy # noqa diff --git a/allauth/locale/ar/LC_MESSAGES/django.po b/allauth/locale/ar/LC_MESSAGES/django.po index 2b48fd4..b7bc773 100644 --- a/allauth/locale/ar/LC_MESSAGES/django.po +++ b/allauth/locale/ar/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2016-01-19 19:32+0100\n" "Last-Translator: David D Lowe \n" "Language-Team: Arabic\n" @@ -36,161 +36,161 @@ msgid "Password must be a minimum of {0} characters." msgstr "كلمة المرور يجب أن لا تقل عن {0} حروف." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "الحسابات" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "يجب عليك كتابة نفس كلمة المرور في كل مرة‪.‬" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "كلمة السر" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "ذكرني" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "هذا الحساب غير نشط حاليا." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "عنوان البريد الإلكتروني و / أو كلمة المرور الذي حددته غير صحيحة." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "اسم المستخدم و / أو كلمة المرور الذي حددته غير صحيحة." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "عنوان البريد الالكتروني" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "البريد الالكتروني" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "اسم المستخدم" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "اسم المستخدم أو البريج الالكتروني" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "تسجيل الدخول" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "البريد الالكتروني ‪)‬اختياري‪(‬" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "تأكيد البريد الإلكتروني" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "البريد الالكتروني ‪)‬اختياري‪(‬" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "يجب عليك كتابة نفس كلمة المرور في كل مرة‪.‬" -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "كلمة السر ‪)‬مرة أخرى‪(‬" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "عنوان البريد الإلكتروني هذا بالفعل المقترنة مع هذا الحساب." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "عنوان البريد الإلكتروني هذا مقترن بالفعل بحساب آخر." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "كلمة المرور الحالية" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "كلمة المرور الجديدة" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "كلمة المرور الجديدة (مرة أخرى)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "الرجاء كتابة كلمة المرور الحالية الخاصة بك." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "لم يتم تعيين عنوان البريد الإلكتروني لأي حساب مستخدم" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "مستخدم" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "عنوان بريد إلكتروني" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "تمّ تحقيقه" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "أوّلي" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "عنوان بريد الكتروني" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "عناوين البريد الالكتروني" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "تمّ إنشاؤه" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "مبعوث" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "مفتاح" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "تأكيد البريد الإلكتروني" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "تأكيدات البريد الإلكتروني" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -199,107 +199,107 @@ "حساب موجود بالفعل مع هذا عنوان البريد الإلكتروني. يرجى تسجيل الدخول إلى هذا " "الحساب أولا، ثم ربط حساب %s الخاص بك." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "حسابك ليس لديه كلمة مرور اقامة." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "حسابك ليس لديه عنوان البريد الإلكتروني تحققنا منها." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "الحسابات الاجتماعية" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "مزود" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "اسم" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "" + #: socialaccount/models.py:99 -msgid "uid" +msgid "date joined" msgstr "" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" +msgid "extra data" msgstr "" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/cs/LC_MESSAGES/django.po b/allauth/locale/cs/LC_MESSAGES/django.po index e3e69b9..0d9323f 100644 --- a/allauth/locale/cs/LC_MESSAGES/django.po +++ b/allauth/locale/cs/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.35\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2018-04-17 16:52+0200\n" "Last-Translator: Beda Kosata \n" "Language-Team: Czech <>\n" @@ -36,155 +36,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Heslo musí obsahovat minimálně {0} znaků." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Účty" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Hesla se musí shodovat." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Heslo" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Zapamatovat" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Účet je v tuto chvíli neaktivní." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Zadaný e-mail nebo heslo není správné." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Zadané uživatelské jméno nebo heslo není správné." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-mailová adresa" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Uživatelské jméno" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Uživatelské jméno nebo e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Login" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-mail (znovu)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Potrvzení e-mailové adresy" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (nepovinné)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Vložené emaily se musí shodovat." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Heslo (znovu)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Tento e-mail je již k tomuto účtu přiřazen." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Tento e-mail je již přiřazen k jinému účtu." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Současné heslo" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nové heslo" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nové heslo (znovu)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Prosím, zadejte svoje současné heslo." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "E-mail není přiřazen k žádnému účtu" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Token pro reset hesla není platný." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "uživatel" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "e-mailová adresa" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "ověřeno" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primární" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-mailová adresa" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-mailové adresy" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "vytvořit" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "odeslaný" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "klíč" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "Potvrzovací e-mail" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "Ověřovací e-maily" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -193,107 +193,107 @@ "Účet s touto e-mailovou adresou již existuje. Prosím přihlaste se nejdříve " "pod tímto účtem a potom připojte svůj %s účet." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Váš účet nemá nastavené heslo." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Váš účet nemá žádný ověřený e-mail." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Účty sociálních sítí" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "poskytovatel" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "jméno" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "id klienta" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "App ID nebo uživatelský klíč" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "tajný klíč" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "tajný API klíč, tajný klientský klíč nebo uživatelský tajný klíč" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Klíč" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "sociální aplikace" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "sociální aplikace" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "poslední přihlášení" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "datum registrace" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "extra data" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "účet sociální sítě" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "účty sociálních sítí" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "token" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) nebo přístupový token (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "tajný token" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) nebo token pro obnovu (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "vyprší" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "token sociální aplikace" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "tokeny sociálních aplikací" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Neplatná data profilu" diff --git a/allauth/locale/da/LC_MESSAGES/django.po b/allauth/locale/da/LC_MESSAGES/django.po index 477049d..335a0e7 100644 --- a/allauth/locale/da/LC_MESSAGES/django.po +++ b/allauth/locale/da/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2018-09-03 16:04+0200\n" "Last-Translator: b'Tuk Bredsdorff '\n" "Language-Team: \n" @@ -35,155 +35,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Adgangskoden skal være på mindst {0} tegn." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Konti" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Du skal skrive den samme adgangskode hver gang." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Adgangskode" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Husk mig" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Denne konto er i øjeblikket inaktiv." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Den angivne e-mail-adresse og/eller adgangskode er ikke korrekt." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Det angivne brugernavn og/eller adgangskoden er ikke korrekt." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-mail adresse" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Brugernavn" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Brugernavn eller e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Bruger" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-mail (igen)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Bekræftelse af e-mail-adresse" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (valgfri)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Du skal skrive den samme e-mail hver gang." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Adgangskode (igen)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Denne e-mail-adresse er allerede knyttet til denne konto." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Denne e-mail-adresse er allerede knyttet til en anden konto." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Nuværende adgangskode" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Ny adgangskode" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Ny adgangskode (igen)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Indtast din nuværende adgangskode." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "E-mail-adressen er ikke tildelt til nogen brugerkonto" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Token for nulstilling af adgangskode var ugyldig." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "bruger" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "e-mail adresse" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "bekræftet" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primær" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-mail adresse" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-mail adresser" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "oprettet" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "sendt" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "nøgle" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "e-mail bekræftigelse" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "e-mail bekræftigelser" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -192,107 +192,107 @@ "En konto med denne e-mail adresse eksisterer allerede. Log venligst ind med " "den konto først og tilknyt din %s konto derefter." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Der er ikke oprettet noget password til din konto." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Din konto har ikke noget bekræftiget e-mail adresse." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Sociale konti" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "udbyder" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "navn" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "klient id" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "App ID, eller konsumer nøgle" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "hemmelig nøgle" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "API hemmelighed, klient hemmelighed eller konsumet hemmelighed" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Nøgle" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "social applikation" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "sociale applikationer" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "sidste log ind" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "dato oprettet" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "ekstra data" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "social konto" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "sociale konti" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "token" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "“oauth_token” (OAuth1) eller adgangstoken (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "token hemmelighed" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "“oauth_token_secret” (OAuth1) eller fornyelsestoken (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "udløber den" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "socialt applikationstoken" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "sociale applikationstokener" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Ugyldig profildata" diff --git a/allauth/locale/de/LC_MESSAGES/django.po b/allauth/locale/de/LC_MESSAGES/django.po index 3ffffc4..51b6fe2 100644 --- a/allauth/locale/de/LC_MESSAGES/django.po +++ b/allauth/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2019-08-07 12:13+0200\n" "Last-Translator: Jannis Vajen \n" "Language-Team: German (http://www.transifex.com/projects/p/django-allauth/" @@ -39,155 +39,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Das Passwort muss aus mindestens {0} Zeichen bestehen." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Konten" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Du musst zweimal das selbe Passwort eingeben." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Passwort" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Angemeldet bleiben" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Dieses Konto ist derzeit inaktiv." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Die E-Mail-Adresse und/oder das Passwort sind leider falsch." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Der Anmeldename und/oder das Passwort sind leider falsch." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-Mail-Adresse" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-Mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Anmeldename" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Anmeldename oder E-Mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Anmeldung" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-Mail (wiederholen)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Bestätigung der E-Mail-Adresse" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-Mail (optional)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Du musst zweimal dieselbe E-Mail-Adresse eingeben." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Passwort (Wiederholung)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Diese E-Mail-Adresse wird bereits in diesem Konto verwendet." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Diese E-Mail-Adresse wird bereits in einem anderen Konto verwendet." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Aktuelles Passwort" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Neues Passwort" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Neues Passwort (Wiederholung)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Bitte gib dein aktuelles Passwort ein." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Diese E-Mail-Adresse ist keinem Konto zugeordnet" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Das Sicherheits-Token zum Zurücksetzen des Passwortes war ungültig." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "Benutzer" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "E-Mail-Adresse" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "bestätigt" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "Primär" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "E-Mail-Adresse" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "E-Mail-Adressen" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "Erstellt" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "Gesendet" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "Schlüssel" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "E-Mail-Bestätigung" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "E-Mail-Bestätigungen" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -196,107 +196,107 @@ "Es existiert bereits ein Konto mit dieser E-Mail-Adresse. Bitte melde dich " "zuerst mit diesem Konto an, und verknüpfe es dann mit deinem %s-Konto." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Für dein Konto wurde noch kein Passwort festgelegt." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Dein Konto hat keine bestätigte E-Mail-Adresse." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Konto" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "Anbieter" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "Anmeldename" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "Client-ID" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "App-ID oder 'Consumer key'" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "Geheimer Schlüssel" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "'API secret', 'client secret' oder 'consumer secret'" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Schlüssel" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "Soziale Anwendung" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "Soziale Anwendungen" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "UID" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "Letzte Anmeldung" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "Registrierdatum" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "Weitere Daten" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "Soziales Konto" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "Soziale Konten" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "Token" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) oder \"access token\" (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "Geheimes Token" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) oder \"refresh token\" (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "Läuft ab" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "Token für soziale Anwendung" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "Tokens für soziale Anwendungen" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Ungültige Profildaten" diff --git a/allauth/locale/el/LC_MESSAGES/django.po b/allauth/locale/el/LC_MESSAGES/django.po index b9f0571..8f6aa23 100644 --- a/allauth/locale/el/LC_MESSAGES/django.po +++ b/allauth/locale/el/LC_MESSAGES/django.po @@ -3,11 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -msgid "" -msgstr "" -"Project-Id-Version: \n" +#, fuzzy +msgid "" +msgstr "" +"Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2014-08-12 00:29+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,328 +17,324 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.6.5\n" #: account/adapter.py:45 msgid "Username can not be used. Please use other username." -msgstr "" -"Το όνομα χρήστη δε μπορεί να χρησιμοποιηθεί. Παρακαλούμε χρησιμοποιήστε άλλο " -"όνομα χρήστη." +msgstr "Δεν μπορεί να χρησιμοποιηθεί αυτό το όνομα χρήστη. Δοκιμάστε άλλο." #: account/adapter.py:49 msgid "Too many failed login attempts. Try again later." -msgstr "" +msgstr "Πολλές αποτυχημένες προσπάθειες σύνδεσης. Προσπαθήστε ξανά αργότερα." #: account/adapter.py:51 msgid "A user is already registered with this e-mail address." -msgstr "Ένας χρήστης έχει ήδη εγγραφεί με τη συγκεκριμένη διεύθυνση e-mail." +msgstr "Υπάρχει ήδη εγγεγραμμένος χρήστης με αυτό το e-mail." #: account/adapter.py:294 #, python-brace-format msgid "Password must be a minimum of {0} characters." -msgstr "Ο κωδικός πρέπει να είναι κατ' ελάχιστο {0} χαρακτήρες." - -#: account/apps.py:8 +msgstr "Το συνθηματικό πρέπει να περιέχει τουλάχιστον {0} χαρακτήρες." + +#: account/apps.py:7 msgid "Accounts" msgstr "Λογαριασμοί" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." -msgstr "Πρέπει να συμπληρώνετε τον ίδιο κωδικό κάθε φορά." - -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +msgstr "Πρέπει να δοθεί το ίδιο συνθηματικό κάθε φορά." + +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" -msgstr "Κωδικός" - -#: account/forms.py:94 +msgstr "Συνθηματικό" + +#: account/forms.py:92 msgid "Remember Me" -msgstr "Να με θυμάσαι" - -#: account/forms.py:100 +msgstr "Αυτόματη Σύνδεση" + +#: account/forms.py:98 msgid "This account is currently inactive." -msgstr "Ο λογαριασμός δεν είναι ενεργός" - -#: account/forms.py:103 +msgstr "Αυτός ο λογαριασμός είναι ανενεργός." + +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." -msgstr "Η διεύθυνση e-mail ή/και ο κωδικός δεν είναι σωστά." - -#: account/forms.py:106 +msgstr "Η διέυθυνση e-mail ή/και το συνθηματικό που δόθηκαν δεν είναι σωστά." + +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." -msgstr "Το όνομα χρήστη ή/και ο κωδικός δεν είναι σωστά." - -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +msgstr "Το όνομα χρήστη ή/και το συνθηματικό που δόθηκαν δεν είναι σωστά." + +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Διεύθυνση e-mail" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Όνομα χρήστη" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Όνομα χρήστη ή e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Σύνδεση" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" -msgstr "E-mail (προαιρετικό)" - -#: account/forms.py:298 +msgstr "E-mail (επιβεβαίωση)" + +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" -msgstr "επιβεβαίωση email" - -#: account/forms.py:306 +msgstr "Επιβεβαίωση διεύθυνσης e-mail" + +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (προαιρετικό)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." -msgstr "Πρέπει να συμπληρώνετε τον ίδιο κωδικό κάθε φορά." - -#: account/forms.py:370 account/forms.py:479 +msgstr "Πρέπει να δοθεί το ίδιο email κάθε φορά." + +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" -msgstr "Κωδικός (ξανά)" +msgstr "Συνθηματικό (επιβεβαίωση)" + +#: account/forms.py:432 +msgid "This e-mail address is already associated with this account." +msgstr "Αυτό το e-mail χρησιμοποιείται ήδη από αυτό το λογαριασμό." #: account/forms.py:434 -msgid "This e-mail address is already associated with this account." -msgstr "Αυτή η διεύθυνση e-mail έχει ήδη συσχετιστεί με το λογαριασμό." - -#: account/forms.py:436 msgid "This e-mail address is already associated with another account." -msgstr "Αυτή η διεύθυνση e-mail έχει ήδη συσχετιστεί με έναν άλλο λογαριασμό." - -#: account/forms.py:458 +msgstr "Αυτό το e-mail χρησιμοποιείται ήδη από άλλο λογαριασμό." + +#: account/forms.py:456 msgid "Current Password" -msgstr "Τρέχον κωδικός" - -#: account/forms.py:459 account/forms.py:548 +msgstr "Τρέχον συνθηματικό" + +#: account/forms.py:457 account/forms.py:546 msgid "New Password" -msgstr "Νέος κωδικός" - -#: account/forms.py:460 account/forms.py:549 +msgstr "Νέο συνθηματικό" + +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" -msgstr "Νέος κωδικός (ξανά)" - -#: account/forms.py:468 +msgstr "Νέο συνθηματικό (επιβεβαίωση)" + +#: account/forms.py:466 msgid "Please type your current password." -msgstr "Παρακαλούμε συμπληρώσατε τον κωδικό σας." - -#: account/forms.py:506 +msgstr "Παρακαλώ γράψτε το τρέχον συνθηματικό σας." + +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" -msgstr "Η διεύθυνση e-mail δεν έχει συσχετιστεί με κάποιο λογαριασμό" - -#: account/forms.py:570 +msgstr "Το e-mail δεν χρησιμοποιείται από κανέναν λογαριασμό" + +#: account/forms.py:568 msgid "The password reset token was invalid." -msgstr "" - -#: account/models.py:23 +msgstr "Το κουπόνι επαναφοράς του συνθηματικού δεν ήταν έγκυρο." + +#: account/models.py:21 msgid "user" msgstr "χρήστης" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "διεύθυνση e-mail" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" -msgstr "επιβεβαιωμένο" - -#: account/models.py:29 +msgstr "επαληθευμένο" + +#: account/models.py:27 msgid "primary" -msgstr "πρωτεύων" - -#: account/models.py:34 +msgstr "πρωτεύον" + +#: account/models.py:32 msgid "email address" -msgstr "διεύθυνση email" - -#: account/models.py:35 +msgstr "διεύθυνση e-mail" + +#: account/models.py:33 msgid "email addresses" -msgstr "διευθύνσεις email" - -#: account/models.py:83 +msgstr "διευθύνσεις e-mail" + +#: account/models.py:80 msgid "created" msgstr "δημιουργήθηκε" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" -msgstr "στάλθηκε" - -#: account/models.py:86 socialaccount/models.py:58 +msgstr "απστάλει" + +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "κλειδί" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" -msgstr "επιβεβαίωση email" - -#: account/models.py:92 +msgstr "e-mail επιβεβαίωσης" + +#: account/models.py:89 msgid "email confirmations" -msgstr "επιβεβαιώσεις email" - -#: socialaccount/adapter.py:27 +msgstr "e-mail επιβεβαίωσης" + +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " "account first, then connect your %s account." msgstr "" -"Υπάρχει ήδη΄ενας λογαριασμός με αυτή τη διεύθυνση e-mail. Παρακαλούμε " -"συνδεθείτε πρώτα σε αυτό το λογαριασμό και ακολούθως συνδέστε τον %s " -"λογαριασμό." - -#: socialaccount/adapter.py:132 +"Υπάρχει ήδη ένας λογαριασμός με αυτό το e-mail. Συνδεθείτε πρώτα με αυτόνκαι " +"μετά συνδέστε τον λογαριασμό %s." + +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." -msgstr "Ο λογαριασμός σας δεν έχει κωδικό." - -#: socialaccount/adapter.py:139 +msgstr "Δεν έχει οριστεί συνθηματικό στον λογαριασμό σας." + +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." -msgstr "Ο λογαριασμός σας δεν έχει επιβεβαιωμένη διεύθυνση e-mail." - -#: socialaccount/apps.py:8 +msgstr "Δεν έχει επιβεβαιωθεί κανένα e-mail του λογαριασμού σας." + +#: socialaccount/apps.py:7 msgid "Social Accounts" -msgstr "Κοινωνικοί λογαριασμοί" - -#: socialaccount/models.py:46 socialaccount/models.py:80 +msgstr "Λογαριασμοί Κοινωνικών Μέσων" + +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "πάροχος" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "όνομα" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" -msgstr "client id" +msgstr "id πελάτη" + +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "App ID ή consumer key(κλειδί καταναλωτή)" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "μυστικό κλειδί" #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "App ID ή consumer key" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "secret key" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" -msgstr "API secret, client secret, or consumer secret" - -#: socialaccount/models.py:61 +msgstr "API secret, client secret, ή consumer secret" + +#: socialaccount/models.py:58 msgid "Key" msgstr "Κλειδί" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" -msgstr "κοινωνική εφαρμογή" - -#: socialaccount/models.py:70 +msgstr "εφαρμογή κοινωνικών μέσων" + +#: socialaccount/models.py:67 msgid "social applications" -msgstr "κοινωνικές εφαρμογές" - -#: socialaccount/models.py:99 +msgstr "εφαρμογές κοινωνικών μέσων" + +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "τελευταία σύνδεση" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "ημερομηνία εγγραφής" +#: socialaccount/models.py:101 +msgid "extra data" +msgstr "έξτρα δεδομένα" + #: socialaccount/models.py:105 -msgid "extra data" -msgstr "επιπλέον πληροφορίες" - -#: socialaccount/models.py:109 msgid "social account" -msgstr "κοινωνικός λογαριασμός" - -#: socialaccount/models.py:110 +msgstr "λογαριασμός κοινωνικών μέσων" + +#: socialaccount/models.py:106 msgid "social accounts" -msgstr "κοινωνικοί λογαριασμοί" - -#: socialaccount/models.py:136 +msgstr "λογαριασμοί κοινωνικών μέσων" + +#: socialaccount/models.py:131 msgid "token" -msgstr "" - -#: socialaccount/models.py:138 +msgstr "κουπόνι" + +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) ή access token (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "token secret" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) ή refresh token (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "λήγει στις" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" -msgstr "token κοινωνικής εφαρμογής" - -#: socialaccount/models.py:150 +msgstr "token (κουπόνι) εφαρμογής κοινωνικών μέσων" + +#: socialaccount/models.py:145 msgid "social application tokens" -msgstr "token κοινωνικών εφαρμογών" - -#: socialaccount/providers/douban/views.py:35 +msgstr "tokens (κουπόνια) εφαρμογής κοινωνικών μέσων" + +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" -msgstr "" +msgstr "Άκυρα δεδομένα προφίλ" #: socialaccount/providers/oauth/client.py:78 #, python-format msgid "Invalid response while obtaining request token from \"%s\"." -msgstr "Λάθος απάντηση κατά τη λήψη του request token από το \"%s\"." +msgstr "Μη-έγκυρη απάντηση κατά την απόκτηση κουπονιού αιτήματος από \"%s\"." #: socialaccount/providers/oauth/client.py:109 #, python-format msgid "Invalid response while obtaining access token from \"%s\"." -msgstr "Λάθος απάντηση κατά τη λήψη του access token από το \"%s\"." +msgstr "Μη-έγκυρη απάντηση κατά την απόκτηση κουπονιού πρόσβασης από \"%s\"." #: socialaccount/providers/oauth/client.py:128 #, python-format msgid "No request token saved for \"%s\"." -msgstr "Δεν αποθηκεύθηκε request token για το \"%s\"." +msgstr "Δεν υπάρχει αποθηκευμένο κουπόνι αιτήματος για \"%s\"." #: socialaccount/providers/oauth/client.py:177 #, python-format msgid "No access token saved for \"%s\"." -msgstr "Δεν αποθηκεύθηκε access token για το \"%s\"." +msgstr "Δεν υπάρχει αποθηκευμένο κουπόνι πρόσβασης για \"%s\"." #: socialaccount/providers/oauth/client.py:197 #, python-format msgid "No access to private resources at \"%s\"." -msgstr "Δεν υπάρχει πρόσβαση σε ιδιωτικούς πόρους για το \"%s\"." +msgstr "Αδύνατη πρόσβαση σε ιδιοτικούς πόρους στο \"%s\"." #: templates/account/account_inactive.html:5 #: templates/account/account_inactive.html:8 msgid "Account Inactive" -msgstr "Μη ενεργός λογαριασμός" +msgstr "Λογαριασμός Ανενεργός" #: templates/account/account_inactive.html:10 msgid "This account is inactive." -msgstr "Ο λογαριασμός δεν είναι ενεργός." +msgstr "Αυτός ο λογαριασμός είναι ανενεργός." #: templates/account/email.html:5 msgid "Account" @@ -345,31 +342,33 @@ #: templates/account/email.html:8 msgid "E-mail Addresses" -msgstr "Διευθύνσεις e-mail" +msgstr "Διεύθυνση e-mail" #: templates/account/email.html:10 msgid "The following e-mail addresses are associated with your account:" -msgstr "Οι επόμενες διευθύνσεις e-mail έχουν συσχετιστεί με το λογαριασμό σας:" +msgstr "" +"Οι διευθύνσεις e-mail που ακολουθούν είναι συσχετισμένες με τον λογαριασμό " +"σας:" #: templates/account/email.html:24 msgid "Verified" -msgstr "Επιβεβαιωμένο" +msgstr "Εγκεκριμένος" #: templates/account/email.html:26 msgid "Unverified" -msgstr "Μη επιβεβαιωμένο" +msgstr "Μη-επιβεβαιωμένο" #: templates/account/email.html:28 msgid "Primary" -msgstr "Πρωτεύων" +msgstr "Πρωτεύον" #: templates/account/email.html:34 msgid "Make Primary" -msgstr "Να γίνει πρωτεύων" +msgstr "Ορισμός ως Πρωτεύον" #: templates/account/email.html:35 msgid "Re-send Verification" -msgstr "Επαναποστολή της επιβεβαίωσης" +msgstr "Επανάληψη αποστολής Επαλήθευσης" #: templates/account/email.html:36 templates/socialaccount/connections.html:35 msgid "Remove" @@ -377,19 +376,20 @@ #: templates/account/email.html:43 msgid "Warning:" -msgstr "Προσοχή:" +msgstr "Προσοχη:" #: templates/account/email.html:43 msgid "" "You currently do not have any e-mail address set up. You should really add " "an e-mail address so you can receive notifications, reset your password, etc." msgstr "" -"Δεν έχετε προσθέσει διευθύνσεις email. Πρέπει να προσθέσετε μια έτσι ώστε να " -"μπορείτε να λάβετε ειδοποιήσεις, να επαναφέρετε τον κωδικό σας κλπ." +"Δεν έχετε ρυθμίσει καμία διεύθυνση e-mail. Προτείνουμε να προσθέσετε μία " +"ώστε να μπορείτε να λάβετε ειδοποιήσεις, να ανακτήσετε το συνθηματικό σας " +"κλπ." #: templates/account/email.html:48 msgid "Add E-mail Address" -msgstr "Προσθήκη διεύθυνσης e-mail" +msgstr "Προσθήκη διέυθυνσης e-mail" #: templates/account/email.html:53 msgid "Add E-mail" @@ -397,15 +397,10 @@ #: templates/account/email.html:62 msgid "Do you really want to remove the selected e-mail address?" -msgstr "Θέλετε να αφαιρέσετε την επιλεγμένη διεύθυνση e-mail;" +msgstr "Θέλετε να αφαιρέσετε την επλεγμένη διεύθυνση e-mail?" #: templates/account/email/email_confirmation_message.txt:1 -#, fuzzy, python-format -#| msgid "" -#| "User %(user_display)s at %(site_name)s has given this as an email " -#| "address.\n" -#| "\n" -#| "To confirm this is correct, go to %(activate_url)s\n" +#, python-format msgid "" "Hello from %(site_name)s!\n" "\n" @@ -414,10 +409,12 @@ "\n" "To confirm this is correct, go to %(activate_url)s\n" msgstr "" -"Ο χρήστης %(user_display)s του %(site_name)s έδωση τη συγκεκριμένη ως " -"διεύθυνση e-mail.\n" +"Χαιρετίσματα από το %(site_name)s!\n" "\n" -"Για να το επιβεβαιώσετε, παρακαλούμε επισκευθείτε το%(activate_url)s\n" +"Λαμβάνετε αυτό το e-mail επειδή ο χρήστης %(user_display)s έκανε αίτηση " +"σύνδεσης της διέυθυνσης e-mail σας με τον λογαριασμό του.\n" +"\n" +"Για να επιβεβαιώσετε αυτή την ενέργεια, πηγαίνετε στο %(activate_url)s\n" #: templates/account/email/email_confirmation_message.txt:7 #, python-format @@ -425,20 +422,15 @@ "Thank you from %(site_name)s!\n" "%(site_domain)s" msgstr "" +"Ευχαριστούμε από το %(site_name)s!\n" +"%(site_domain)s" #: templates/account/email/email_confirmation_subject.txt:3 -#, fuzzy -#| msgid "Confirm E-mail Address" msgid "Please Confirm Your E-mail Address" -msgstr "Επιβεβαίωση διεύθυνσης e-mail" +msgstr "Παρακαλούμε να επιβεβαιώσετε την διεύθυνση e-mail σας" #: templates/account/email/password_reset_key_message.txt:1 -#, fuzzy, python-format -#| msgid "" -#| "You're receiving this e-mail because you or someone else has requested a " -#| "password for your user account at %(site_domain)s.\n" -#| "It can be safely ignored if you did not request a password reset. Click " -#| "the link below to reset your password." +#, python-format msgid "" "Hello from %(site_name)s!\n" "\n" @@ -447,16 +439,17 @@ "It can be safely ignored if you did not request a password reset. Click the " "link below to reset your password." msgstr "" -"Λαμβάνετε αυτό το e-mail επειδή εσείς ή κάποιος άλλος αιτήθηκε επαναφορά του " -"κωδικού σας για το %(site_domain)s.\n" -"Μπορείτε να αγνοήσετε το εν λόγω e-mail αν δε ζητήσατε εσείς την επαναφορά " -"του κωδικού. Αν θέλετε να αλλάξετε τον κωδικό σας κάντε κλικ στην παρακάτω " -"σύνδεση:" +"Χαιρετίσματα από το %(site_name)s!\n" +"\n" +"Λαμβάνετε αυτό το e-mail επειδή εσείς ή κάποιος άλλος έχει κάνει αίτηση " +"συνθηματικού για τον λογαριασμό σας.\n" +"Αν δεν ζητήσατε επαναφορά συνθηματικού, μπορεί να αγνοηθεί με ασφάλεια. " +"Πατήστε στον σύνδεσμο που ακολουθεί για να επαναφέρετε το συνθηματικό σας." #: templates/account/email/password_reset_key_message.txt:8 #, python-format msgid "In case you forgot, your username is %(username)s." -msgstr "Σε περίπτωση που το ξεχάσατε, το όνομα χρήστη σας είναι %(username)s." +msgstr "Σε περίπτωση που ξεχάσατε, το όνομα χρήστη σας είναι %(username)s." #: templates/account/email/password_reset_key_message.txt:10 #, python-format @@ -464,15 +457,17 @@ "Thank you for using %(site_name)s!\n" "%(site_domain)s" msgstr "" +"Ευχαριστούμε που χρησιμοποιήσατε το %(site_name)s!\n" +"%(site_domain)s" #: templates/account/email/password_reset_key_subject.txt:3 msgid "Password Reset E-mail" -msgstr "E-mail επαναφοράς κωδικού" +msgstr "E-mail επαναφοράς συνθηματικού" #: templates/account/email_confirm.html:6 #: templates/account/email_confirm.html:10 msgid "Confirm E-mail Address" -msgstr "Επιβεβαίωση διεύθυνσης e-mail" +msgstr "Επιβεβαίωση διεύθυνση e-mail" #: templates/account/email_confirm.html:16 #, python-format @@ -480,8 +475,8 @@ "Please confirm that %(email)s is an e-mail " "address for user %(user_display)s." msgstr "" -"Παρακαλούμε επιβεβαιώσατε ότι η %(email)s " -"είναι μια διεύθυνση e-mail για το χρήστη %(user_display)s." +"Παρακαλούμε επιβεβαιώστε ότι το %(email)s " +"αποτελεί διεύθυνση e-mail για τον χρήστη %(user_display)s." #: templates/account/email_confirm.html:20 msgid "Confirm" @@ -493,13 +488,13 @@ "This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request." msgstr "" -"Η σύνδεση επιβεβαίωσης e-mail είναι εσφαλμένη. Παρακαλούμε δημιουργήστε μια νέα." +"Αυτός ο σύνδεσμος επιβεβαίωσης έχει λήξει ή δεν είναι έγκυρος. Παρακαλούμε " +"κάντε καινούρια αίτηση επιβεβαίωσης e-mail." #: templates/account/login.html:6 templates/account/login.html:10 #: templates/account/login.html:43 msgid "Sign In" -msgstr "Είσοδος" +msgstr "Σύνδεση" #: templates/account/login.html:15 #, python-format @@ -510,8 +505,9 @@ "for a %(site_name)s account and sign in below:" msgstr "" "Παρακαλούμε συνδεθείτε με έναν\n" -"από τους λογαριασμούς σας. Ή, εγγραφείτε\n" -"για ένα λογαριασμό στο %(site_name)s παρακάτω:" +"από τους ήδη υπάρχοντες εξωτερικούς λογαριασμούς σας. Ή, κάντε εγγραφή\n" +"για έναν λογαριασμό %(site_name)s και συνδεθείτε παρακάτω:" #: templates/account/login.html:25 msgid "or" @@ -523,12 +519,12 @@ "If you have not created an account yet, then please\n" "sign up first." msgstr "" -"Αν δεν έχετε δημιουργήσει λογαριασμό πρέπει να\n" -"εγγραφείτε." +"Αν δεν έχετε δημιουργήσει λογαριασμό, πρώτα κάντε\n" +"εγγραφή" #: templates/account/login.html:42 msgid "Forgot Password?" -msgstr "Ξεχάσατε τον κωδικό σας;" +msgstr "Ξέχασα το συνθηματικό μου" #: templates/account/logout.html:5 templates/account/logout.html:8 #: templates/account/logout.html:17 @@ -537,17 +533,17 @@ #: templates/account/logout.html:10 msgid "Are you sure you want to sign out?" -msgstr "Είστε σίγουρος ότι θέλετε να αποσυνδεθείτε;" +msgstr "Είστε σίγουροι ότι θέλετε να αποσυνδεθείτε;" #: templates/account/messages/cannot_delete_primary_email.txt:2 #, python-format msgid "You cannot remove your primary e-mail address (%(email)s)." -msgstr "Δε μπορείτε να αφαιρέσετε το πρωτεύων e-mail σας (%(email)s)." +msgstr "Δεν μπορείτε να αφαιρέσετε την πρωτεύον διεύθυνση email (%(email)s)." #: templates/account/messages/email_confirmation_sent.txt:2 #, python-format msgid "Confirmation e-mail sent to %(email)s." -msgstr "Επιβεβαιωτικό e-mail στάλθηκε στο %(email)s." +msgstr "E-mail επιβεβαίωσης στάλθηκε στο %(email)s." #: templates/account/messages/email_confirmed.txt:2 #, python-format @@ -557,12 +553,12 @@ #: templates/account/messages/email_deleted.txt:2 #, python-format msgid "Removed e-mail address %(email)s." -msgstr "Η διεύθυνση %(email)s αφαιρέθηκε." +msgstr "Αφαιρέθηκε η διεύθυνση e-mail %(email)s." #: templates/account/messages/logged_in.txt:4 #, python-format msgid "Successfully signed in as %(name)s." -msgstr "Επιτυχής σύνδεση ως %(name)s." +msgstr "Επιτυχημένη σύνδεση ως %(name)s." #: templates/account/messages/logged_out.txt:2 msgid "You have signed out." @@ -570,19 +566,19 @@ #: templates/account/messages/password_changed.txt:2 msgid "Password successfully changed." -msgstr "Επιτυχής αλλαγή κωδικού." +msgstr "Αλλαγή συνθηματικού ολοκληρώθηκε επιτυχώς." #: templates/account/messages/password_set.txt:2 msgid "Password successfully set." -msgstr "Επιτυχής δημιουργία κωδικού." +msgstr "Συνθηματικό ορίστηκε επιτυχώς." #: templates/account/messages/primary_email_set.txt:2 msgid "Primary e-mail address set." -msgstr "Ενεργοποίηση πρωτεύοντος e-mail." +msgstr "Ορίστηκε η πρωτεύον διεύθυνση e-mail." #: templates/account/messages/unverified_primary_email.txt:2 msgid "Your primary e-mail address must be verified." -msgstr "Το πρωτεύων e-mail σας πρέπει να επιβεβαιωθεί." +msgstr "Η πρωτεύον διεύθυνση e-mail πρέπει να επιβεβαιωθεί." #: templates/account/password_change.html:5 #: templates/account/password_change.html:8 @@ -592,44 +588,44 @@ #: templates/account/password_reset_from_key_done.html:4 #: templates/account/password_reset_from_key_done.html:7 msgid "Change Password" -msgstr "Αλλαγή κωδικού" +msgstr "Αλλάξτε Συνθηματικό" #: templates/account/password_reset.html:6 #: templates/account/password_reset.html:10 #: templates/account/password_reset_done.html:6 #: templates/account/password_reset_done.html:9 msgid "Password Reset" -msgstr "Επαναφορά κωδικού" +msgstr "Επαναφορά Συνθηματικού" #: templates/account/password_reset.html:15 msgid "" "Forgotten your password? Enter your e-mail address below, and we'll send you " "an e-mail allowing you to reset it." msgstr "" -"Ξεχάσατε τον κωδικό σας; Συμπληρώσατε τη διεύθυνση e-mail σας παρακάτω και " -"θα σας στείλουμε ένα e-mail ώστε να τον επαναφέρετε." +"Ξεχάσατε το συνθηματικό σας? Γράψτε το e-mail σας παρακάτω, και θα σας " +"στείλουμε ενα e-mail για να το επαναφέρετε." #: templates/account/password_reset.html:20 msgid "Reset My Password" -msgstr "Επαναφορά του κωδικού μου" +msgstr "Επαναφορά του Συνθηματικού Μου" #: templates/account/password_reset.html:23 msgid "Please contact us if you have any trouble resetting your password." msgstr "" -"Παρακαλούμε επικοινωνήστε μαζί μας αν έχετε προβλήματα κατά την επαναφορά " -"του κωδικού σας." +"Παρακαλούμε επικοινωνήστε μαζί μας αν υπάρξει οποιοδήποτε πρόβλημα κατα την " +"επαναφορά του συνθηματικού σας." #: templates/account/password_reset_done.html:15 msgid "" "We have sent you an e-mail. Please contact us if you do not receive it " "within a few minutes." msgstr "" -"Σας έχει σταλεί ένα e-mail. Παρακαλούμε επικοινωνήστε μαζί μας αν δε το " -"παραλάβατε εντός λίγων λεπτών." +"Σας έχουμε στείλει ένα e-mail. Παρακαλούμε επικοινωνήστε μαζί μας αν δεν το " +"έχετε παραλάβει μέσα σε λίγα λεπτά." #: templates/account/password_reset_from_key.html:7 msgid "Bad Token" -msgstr "Λάθος token." +msgstr "Μη-έγκυρο Κουπόνι" #: templates/account/password_reset_from_key.html:11 #, python-format @@ -638,23 +634,23 @@ "used. Please request a new password reset." msgstr "" -"Η σύνδεση επαναφοράς κωδικού δεν είναι σωστή πιθανότητα επειδή έχει " -"χρησιμοποιηθεί ήδη. Παρακαλούμε αιτηθείτε μια νέα επαναφορά κωδικού." +"Ο σύνδεσμος επαναφορά συνθηματικού δεν ήταν έγκυρος, πιθανών να έχει ήδη " +"χρησιμοποιηθεί. Παρακαλούμε κάντε εκ νέου επαναφορά συνθηματικού." #: templates/account/password_reset_from_key.html:17 msgid "change password" -msgstr "αλλαγή κωδικού" +msgstr "αλλαγή συνθηματικού" #: templates/account/password_reset_from_key.html:20 #: templates/account/password_reset_from_key_done.html:8 msgid "Your password is now changed." -msgstr "Ο κωδικός σας έχει αλλάξει." +msgstr "Το συνθηματικό σας έχει αλλάξει." #: templates/account/password_set.html:5 templates/account/password_set.html:8 #: templates/account/password_set.html:13 msgid "Set Password" -msgstr "Δημιουργία κωδικού" +msgstr "Ορισμός Συνθηματικού" #: templates/account/signup.html:5 templates/socialaccount/signup.html:5 msgid "Signup" @@ -670,16 +666,17 @@ msgid "" "Already have an account? Then please sign in." msgstr "" -"Έχετε ήδη κωδικό; Παρακαλούμε συνδεθείτε." +"Έχετε ήδη λογαριασμό; Τότε παρακαλούμε συνδεθείτε." #: templates/account/signup_closed.html:5 #: templates/account/signup_closed.html:8 msgid "Sign Up Closed" -msgstr "Οι εγγραφές έχουν κλείσει." +msgstr "Φραγή Εγγραφών" #: templates/account/signup_closed.html:10 msgid "We are sorry, but the sign up is currently closed." -msgstr "Λυπούμαστε αλλά οι εγγραφές έχουν κλείσει." +msgstr "Ζητούμε συγνώμη, αλλά η δυνατότητα εγγραφής είναι υπό φραγή." #: templates/account/snippets/already_logged_in.html:5 msgid "Note" @@ -688,14 +685,14 @@ #: templates/account/snippets/already_logged_in.html:5 #, python-format msgid "you are already logged in as %(user_display)s." -msgstr "έχετε ήδη συνδεθεί ως %(user_display)s." +msgstr "είστε ήδη συνδεδεμένος ως %(user_display)s." #: templates/account/verification_sent.html:5 #: templates/account/verification_sent.html:8 #: templates/account/verified_email_required.html:5 #: templates/account/verified_email_required.html:8 msgid "Verify Your E-mail Address" -msgstr "Επιβεβαιώσατε τη διεύθυνση e-mail σας." +msgstr "Επιβεβαιώστε την διεύθυνση e-mail σας" #: templates/account/verification_sent.html:10 msgid "" @@ -703,9 +700,9 @@ "finalize the signup process. Please contact us if you do not receive it " "within a few minutes." msgstr "" -"Σας έχουμε στείλει ένα e-mail για επιβεβαίωση. Παρακαλούμε ακολουθήστε τη " -"σύνδεση στο e-mail για να ολοκλήρωσετε τη διαδικασία εγγραφής. Παρακαλούμε " -"επικοινωνήστε μαζί μας δε το λάβετε εντός λίγων λεπτών." +"Σας στείλαμε ένα e-mail για επαλήθευση. Ακολουθήστε τον σύνδεσμο που λάβατε " +"γιατην ολοκλήρωση της διαδικασίας εγγραφής. Παρακαλούμε επικοινωνήστε μαζί " +"μας αν δεν το έχετε παραλάβει μέσα σε λίγα λεπτά." #: templates/account/verified_email_required.html:12 msgid "" @@ -713,9 +710,9 @@ "you are who you claim to be. For this purpose, we require that you\n" "verify ownership of your e-mail address. " msgstr "" -"Για πρόσβαση στο συγκεκριμένο τμήμα πρέπει\n" -"να επιβεβαιώσετε την ταυτότητα σας. Έτσι, θα πρέπει να\n" -"επιβεβαιώσετε την ιδιοκτησία της διεύθυνσης e-mail σας. " +"Αυτή η λειτουργία της σελίδας απαιτεί την επαλήθευση\n" +"της ταυτότηας σας. Γι' αυτό, σας ζητούμε να\n" +"επαληθεύσετε την ιδιοκτησία της e-mail διεύθυνσης σας. " #: templates/account/verified_email_required.html:16 msgid "" @@ -723,9 +720,9 @@ "verification. Please click on the link inside this e-mail. Please\n" "contact us if you do not receive it within a few minutes." msgstr "" -"Σας στείλαμε ένα e-mail\n" -"για επιβεβαίωση. Παρακαλούμε ακολουθήστε τη σύνδεση που περιέχει. \n" -"Παρακαλούμε επικοινωνήστε μαζί μας αν δε το λάβετε εντός λίγων λεπτών." +"Σας στείλαμε ένα e-mail για επαλήθευση.\n" +"Παρακαλούμε ακολουθήστε τον σύνδεσμο που αυτό περιέχει. Παρακαλούμε\n" +"επικοινωνήστε μαζί μας αν δεν το έχετε παραλάβει μέσα σε λίγα λεπτά." #: templates/account/verified_email_required.html:20 #, python-format @@ -733,50 +730,52 @@ "Note: you can still change your e-" "mail address." msgstr "" -"Σημείωση: μπορείτε νααλλάξετε το " -"e-mail σας." +"Σημείωση: μπορείτε ακόμα να αλλάξετε τηνδιεύθυνση e-mail σας." #: templates/openid/login.html:9 msgid "OpenID Sign In" -msgstr "Σύνδεση με OpenID" +msgstr "Σύνδεση OpenID" #: templates/socialaccount/authentication_error.html:5 #: templates/socialaccount/authentication_error.html:8 msgid "Social Network Login Failure" -msgstr "Εσφαλμένη κοινωνική σύνδεση" +msgstr "Σύνδεση μέσω Κοινωνικών Μέσων ανεπιτυχής" #: templates/socialaccount/authentication_error.html:10 msgid "" "An error occurred while attempting to login via your social network account." -msgstr "Υπήρξε σφάλμα κατά τη σύνδεση με το λογαριασμό κοινωνικής δικτύωσης." +msgstr "" +"Παρουσιάστηκε ένα σφάλμα κατά την σύνδεση μέσω του λογαριασμού κοινωνικών " +"μέσων σας." #: templates/socialaccount/connections.html:5 #: templates/socialaccount/connections.html:8 msgid "Account Connections" -msgstr "Συνδέσεις λογαριασμών" +msgstr "Συνδέσεις Λογαριασμού" #: templates/socialaccount/connections.html:11 msgid "" "You can sign in to your account using any of the following third party " "accounts:" msgstr "" -"Μπορείτε να συνδεθείτε στο λογαριασμό σας χρησιμοποιώντας οποιονδήποτε από " -"τους ακόλουθους λογαρισμούς:" +"Μπορείτε να συνδεθείτε στον λογαριασμό σας με οποιοδήποτε από τους παρακάτω " +"εξωτερικούς λογαριασμούς:" #: templates/socialaccount/connections.html:43 msgid "" "You currently have no social network accounts connected to this account." msgstr "" -"Δεν υπάρχουν κοινωνικοί λογαριασμοί συνδεδεμένοι σε αυτό το λογαριασμό." +"Δεν έχετε συνδέσει κανένα λογαριασμό κοινωνικών μέσων με αυτό τον λογαριασμό." #: templates/socialaccount/connections.html:46 msgid "Add a 3rd Party Account" -msgstr "Προσθέστε ένα λογαριασμό 3ου." +msgstr "Προσθήκη εξωτερικού λογαριασμού" #: templates/socialaccount/login_cancelled.html:5 #: templates/socialaccount/login_cancelled.html:9 msgid "Login Cancelled" -msgstr "Ακύρωση σύνδεσης" +msgstr "Σύνδεση ακυρώθηκε" #: templates/socialaccount/login_cancelled.html:13 #, python-format @@ -785,22 +784,23 @@ "accounts. If this was a mistake, please proceed to sign in." msgstr "" -"Αποφασίσατε να ακυρώσετε τη σύνδεση στο site μας χρησιμοποιώντας έναν από " -"τους λογαριασμούς σας. Αν αυτό ήταν λάθος παρακαλούμε συνδεθείτε." +"Αποφασίσατε να ακυρώσετε την σύνδεση σας στην ιστοσελίδα με έναν από τους " +"υπάρχοντες λογαριασμούς σας. Αν έγινε κατά λάθος, παρακαλώ συνδεθείτε." #: templates/socialaccount/messages/account_connected.txt:2 msgid "The social account has been connected." -msgstr "Ο κοινωνικός λογαριασμός έχει συνδεθεί." +msgstr "Ο λογαριασμός κοινωνικών μέσων έχει συνδεθεί." #: templates/socialaccount/messages/account_connected_other.txt:2 msgid "The social account is already connected to a different account." msgstr "" -"Ο κοινωνικός λογαριασμός είναι ήδη συνδεδεμένος σε διαφορετικό λογαριασμό." +"Ο λογαριασμός κοινωνικών μέσων είναι ήδη συνδεδεμένος με διαφορετικό " +"λογαριασμό." #: templates/socialaccount/messages/account_disconnected.txt:2 msgid "The social account has been disconnected." -msgstr "Ο κοινωνικός λογαριασμός έχει αποσυνδεθεί." +msgstr "Ο λογαριασμός κοινωνικών μέσων έχει αποσυνδεθεί." #: templates/socialaccount/signup.html:10 #, python-format @@ -808,34 +808,6 @@ "You are about to use your %(provider_name)s account to login to\n" "%(site_name)s. As a final step, please complete the following form:" msgstr "" -"Θα χρησιμοποιήσετε το λογαριασμό σας στο %(provider_name)s για να συνδεθείτε " -"στο\n" -"%(site_name)s. Σαν τελικό βήμα, παρακαλούμε συμπληρώστε τη φόρμα:" - -#~ msgid "The login and/or password you specified are not correct." -#~ msgstr "Το όνομα σύνδεσης ή/και ο κωδικός δεν είναι σωστά." - -#~ msgid "Usernames can only contain letters, digits and @/./+/-/_." -#~ msgstr "" -#~ "Τα ονόματα χρήστη μπορούν να περιέχουν μόνο γράμματα, αριθμούς και τους " -#~ "χαρακτήρες @/./+/-/_." - -#~ msgid "This username is already taken. Please choose another." -#~ msgstr "" -#~ "Το όνομα χρήστη χρησιμοποιείται ήδη. Παρακαλούμε χρησιμοποιήστε άλλο " -#~ "όνομα χρήστη." - -#, fuzzy -#~| msgid "Sign In" -#~ msgid "Shopify Sign In" -#~ msgstr "Είσοδος" - -#~ msgid "" -#~ "You have confirmed that %(email)s is an " -#~ "e-mail address for user %(user_display)s." -#~ msgstr "" -#~ "Έχετε επιβεβαιώσει ότι η %(email)s είναι " -#~ "μια διεύθυνση e-mail για το χρήστη %(user_display)s." - -#~ msgid "Thanks for using our site!" -#~ msgstr "Ευχαριστούμε που χρησιμοποιείτε το site μας!" +"Πρόκειται να χρησιμοποιήσετε τον %(provider_name)s λογαριασμό σας για να " +"συνδεθείτε στην σελίδα\n" +"%(site_name)s. Ως τελικό βήμα, παρακαλούμε συμπληρώστε την παρακάτω φόρμα:" diff --git a/allauth/locale/en/LC_MESSAGES/django.po b/allauth/locale/en/LC_MESSAGES/django.po index 93fa43f..fea71d3 100644 --- a/allauth/locale/en/LC_MESSAGES/django.po +++ b/allauth/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -34,262 +34,262 @@ msgid "Password must be a minimum of {0} characters." msgstr "" -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "" -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "" -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "" -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "" -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "" +#: account/forms.py:432 +msgid "This e-mail address is already associated with this account." +msgstr "" + #: account/forms.py:434 -msgid "This e-mail address is already associated with this account." -msgstr "" - -#: account/forms.py:436 msgid "This e-mail address is already associated with another account." msgstr "" -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "" -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " "account first, then connect your %s account." msgstr "" -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "" -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "" -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "" +#: socialaccount/models.py:45 +msgid "name" +msgstr "" + +#: socialaccount/models.py:47 +msgid "client id" +msgstr "" + #: socialaccount/models.py:49 -msgid "name" -msgstr "" - -#: socialaccount/models.py:51 -msgid "client id" +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" msgstr "" #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "" + #: socialaccount/models.py:99 -msgid "uid" +msgid "date joined" msgstr "" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" +msgid "extra data" msgstr "" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/es/LC_MESSAGES/django.po b/allauth/locale/es/LC_MESSAGES/django.po index 0555a7f..a7dade5 100644 --- a/allauth/locale/es/LC_MESSAGES/django.po +++ b/allauth/locale/es/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2018-02-14 17:46-0600\n" "Last-Translator: Jannis Š\n" "Language-Team: Spanish (http://www.transifex.com/projects/p/django-allauth/" @@ -36,158 +36,158 @@ msgid "Password must be a minimum of {0} characters." msgstr "Una contraseña necesita al menos {0} caracteres." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Cuentas" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Debes escribir la misma contraseña cada vez." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Contraseña" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Recordarme" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Esta cuenta está desactivada actualmente." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "" "El correo electrónico y/o la contraseña que especificaste no son correctos." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "El usuario y/o la contraseña que especificaste no son correctos." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Correo electrónico" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "Correo electrónico" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Usuario" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Nombre de usuario o correo electrónico" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Iniciar sesión" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "Correo Electrónico (otra vez)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Confirmación de la dirección de correo electrónico" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "Correo Electrónico (opcional)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Debe escribir el mismo correo electrónico cada vez." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Contraseña (de nuevo)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Este correo electrónico ya está asociado con esta cuenta." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Este correo electrónico ya está asociado con otra cuenta." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Contraseña actual" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nueva contraseña" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nueva contraseña (de nuevo)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Por favor, escribe tu contraseña actual." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "" "La dirección de correo electrónico no está asignada a ninguna cuenta de " "usuario" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "usuario" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "correo electrónico" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "verificado" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primero" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "correo electrónico" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "correos electrónicos" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "creado" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "enviado" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "confirmación de correo electrónico" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "confirmación de correos electrónicos" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -196,107 +196,107 @@ "Ya existe una cuenta asociada a esta dirección de correo electrónico. Por " "favor, autentícate usando esa cuenta, y luego vincula tu cuenta de %s." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Tu cuenta no tiene una contraseña definida." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Tu cuenta no tiene un correo electrónico verificado." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Cuentas Sociales" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "proveedor" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "nombre" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "último inicio de sesión" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "" +#: socialaccount/models.py:101 +msgid "extra data" +msgstr "" + #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Datos de perfil inválidos" diff --git a/allauth/locale/eu/LC_MESSAGES/django.po b/allauth/locale/eu/LC_MESSAGES/django.po index b420110..5046811 100644 --- a/allauth/locale/eu/LC_MESSAGES/django.po +++ b/allauth/locale/eu/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2018-08-29 08:16+0200\n" "Last-Translator: Eneko Illarramendi \n" "Language-Team: Basque \n" @@ -37,155 +37,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Pasahitzak gutxienez {0} karaktere izan behar ditu." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Kontuak" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Pasahitz berdina idatzi behar duzu aldi bakoitzean." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Pasahitza" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Gogora nazazue" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Kontu hau ez dago aktiboa orain." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Sartutako helbide elektronikoa eta/edo pasahitza ez dira zuzenak." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Sartutako erabiltzailea eta/edo pasahitza ez dira zuzenak." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Helbide elektronikoa" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "Emaila" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Erabiltzailea" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Erabiltzailea edo emaila" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Logina" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "Emaila (berriro)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Helbide elektronikoaren egiaztapena" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "Emaila (hautazkoa)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Email berdina idatzi behar duzu aldi bakoitzean." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Pasahitza (berriro)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Helbide elektroniko hau dagoeneko kontu honi lotuta dago." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Helbide elektroniko hau dagoeneko beste kontu bati lotuta dago." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Oraingo pasahitza" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Pasahitz berria" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Pasahitz berria (berriro)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Mesedez idatzi zure oraingo pasahitza." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Helbide elektroniko hau ez dago kontu bati lotuta" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Pasahitza berrezartzeko \"token\"-a baliogabea da." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "erabiltzailea" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "helbide elektronikoa" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "egiaztatuta" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "nagusia" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "helbide elektronikoa" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "helbide elektronikoak" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "sortuta" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "bidalita" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "giltza" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "email egiaztapena" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "email egiaztapenak" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -194,107 +194,107 @@ "Kontu bat sortu da iada helbide elektroniko honekin. Mesedez hasi saio berri " "bat kontu honekin eta gero zure %s kontua honi lotu." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Zure kontuak ez du pasahitzik zehaztuta." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Zure kontuak ez du egiaztatutako emailik." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Sare sozial kontuak" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "zerbitzua" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "izena" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "client id" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "Aplikazioaren ID-a, edo \"consumer key\"-a" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "\"secret key\"-a" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "\"API secret\"-a, \"client secret\"-a edo \"consumer secret\"-a" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Giltza" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "aplikazio soziala" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "aplikazio sozialak" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "azken logina" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "erregistro eguna" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "datu gehigarriak" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "sare sozial kontua" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "sare sozial kontuak" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "\"token\"-a" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\"-a (OAuth1) edo \"access token\"-a (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "\"token secret\"-a" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\"-a (OAuth1) edo \"refresh token\"-a (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "iraungitze data" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "aplikazio sozial \"token\"-a" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "aplikazio sozial \"token\"-ak" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Profil datu baliogabeak" diff --git a/allauth/locale/fa/LC_MESSAGES/django.po b/allauth/locale/fa/LC_MESSAGES/django.po index fe1daec..64de28e 100644 --- a/allauth/locale/fa/LC_MESSAGES/django.po +++ b/allauth/locale/fa/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2015-09-14 12:40-0000\n" "Last-Translator: NARIMAN GHARIB \n" "Language-Team: \n" @@ -34,162 +34,162 @@ msgid "Password must be a minimum of {0} characters." msgstr "پسورد تنها می‌تواند دارای {0} کاراکتر باشد." -#: account/apps.py:8 +#: account/apps.py:7 #, fuzzy msgid "Accounts" msgstr "حساب کاربری" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "شما باید رمز عبور یکسانی را انتخاب کنید." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "رمز عبور" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "مرا به خاطر بسپار" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "این حساب کاربری درحال حاضر غیرفعال است." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "آدرس ایمیل و/یا پسوردی که وارد کرده‌اید صحیح نیست." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "نام کاربرد و/یا پسوردی که وارد کرده‌اید صحیح نیست." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "آدرس ایمیل" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "ایمیل" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "نام کاربری" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "نام کاربری یا ایمیل" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "ورود" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "ایمیل (اختیاری)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "تائید آدرس ایمیل" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "ایمیل (اختیاری)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "شما باید هر بار ایمیل یکسانی را انتخاب کنید." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "تکرار رمز عبور" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "ایمیل آدرسی که انتخاب کرده‌اید قبلا به این حساب کاربری وصل شده است." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "ایمیل آدرسی که انتخاب کرده‌اید قبلا به حساب کاربر دیگری وصل شده است." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "رمز عبور فعلی" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "رمز عبور جدید" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "تکرار رمز عبور جدید" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "لطفا رمز عبور فعلی خود را وارد کنید." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "این آدرس ایمیل به هیچ حساب کاربری متصل نشده است" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "توکن بازنشانی پسورد غلط است." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "کاربر" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "آدرس ایمیل" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "تایید شده" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "اصلی" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "آدرس ایمیل" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "آدرس‌های ایمیل" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "ساخته شده" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "ارسال شد" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "کلید" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "تائید آدرس ایمیل" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "تاییدیه‌های ایمیل" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -198,110 +198,110 @@ "یک حساب کاربری دیگری با این ایمیل آدرس موجود است. لطفا ابتدا از طریق آن حساب " "وارد شوید. اول حساب کاربری و بعد حساب کاربری %s را متصل کنید." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "حساب کاربری شما هنوز هیچ رمز عبوری ندارد." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "حساب کاربری شما هنوز هیچ ایمیل تاییدشده‌ای ندارد." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 #, fuzzy msgid "Social Accounts" msgstr "حساب اجتماعی" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "فراهم‌کننده" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 #, fuzzy msgid "name" msgstr "نام کاربری" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "شماره کلاینت" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "شماره اپ یا کلید کلاینت" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "کلید مخفی" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "رمز ای‌پی‌آی، رمز کلاینت یا رمز مشتری" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 #, fuzzy msgid "Key" msgstr "کلید" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "اپلیکیشن اجتماعی" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "اپلیکیشن‌های اجتماعی" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "آخرین ورود" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "تاریخ پیوستن" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "اطلاعات بیشتر" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "حساب شبکهٔ اجتماعی" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "حساب‌های شبکه‌های اجتماعی" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "توکن" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) یا توکن دسترسی (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "رمز توکن" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) یا توکن رفرش (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "انقضا در" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "توکن اپلیکشن" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "توکن اپلیکیشن‌ها" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "اطلاعات پروفایل اشتباه" diff --git a/allauth/locale/fi/LC_MESSAGES/django.po b/allauth/locale/fi/LC_MESSAGES/django.po index 296a8fb..af4f846 100644 --- a/allauth/locale/fi/LC_MESSAGES/django.po +++ b/allauth/locale/fi/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2015-08-13 15:17+0300\n" "Last-Translator: Anonymous User \n" "Language-Team: LANGUAGE \n" @@ -37,161 +37,161 @@ msgid "Password must be a minimum of {0} characters." msgstr "Salasanan tulee olla vähintään {0} merkkiä pitkä." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Tili" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Salasanojen tulee olla samat." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Salasana" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Muista minut" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Tämä tili on poistettu käytöstä." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Annettu sähköposti tai salasana ei ole oikein." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Annettu käyttäjänimi tai salasana ei ole oikein." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Sähköpostiosoite" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "Sähköposti" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Käyttäjänimi" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Käyttäjänimi tai sähköposti" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Käyttäjätunnus" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "Sähköpostiosoite (valinnainen)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "sähköpostivarmistus" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "Sähköpostiosoite (valinnainen)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "Salasanojen tulee olla samat." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Salasana (uudestaan)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Sähköpostiosoite on jo liitetty tähän tilliin." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Sähköpostiosoite on jo liitetty toiseen tiliin." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Nykyinen salasana" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Uusi salasana" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Uusi salasana (uudestaan)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Ole hyvä ja anna nykyinen salasanasi." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Sähköpostiosoite ei vastaa yhtäkään käyttäjätiliä." -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Salasanan uusimistarkiste ei kelpaa." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "käyttäjä" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "sähköpostiosoite" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "vahvistettu" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "ensisijainen" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "sähköpostiosoite" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "sähköpostiosoitteet" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "luotu" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "lähetetty" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "avain" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "sähköpostivarmistus" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "sähköpostivarmistukset" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -200,107 +200,107 @@ "Sähköpostiosoite on jo liitetty olemassaolevaan tiliin. Kirjaudu ensin " "kyseiseen tiliin ja liitä %s-tilisi vasta sitten." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Tilillesi ei ole asetettu salasanaa." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Tiliisi ei ole liitetty vahvistettua sähköpostiosoitetta." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Sosiaalisen median tilit" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "tarjoaja" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "nimi" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "asiakas id" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "Sovellus ID tai kuluttajan avain" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "salainen avain" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "API:n, asiakkaan tai kuluttajan salaisuus" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Avain" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "sosiaalinen applikaatio" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "sosiaaliset applikaatiot" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "viimeisin sisäänkirjautuminen" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "liittymispäivämäärä" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "lisätiedot" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "sosiaalisen median tili" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "sosiaalisen median tilit" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "vanhenee" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/fr/LC_MESSAGES/django.po b/allauth/locale/fr/LC_MESSAGES/django.po index dbc260f..1d25519 100644 --- a/allauth/locale/fr/LC_MESSAGES/django.po +++ b/allauth/locale/fr/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2019-08-12 15:14+0200\n" "Last-Translator: Gilou \n" "Language-Team: français <>\n" @@ -39,155 +39,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Le mot de passe doit contenir au minimum {0} caractères." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Comptes" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Vous devez saisir deux fois le même mot de passe." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Mot de passe" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Se souvenir de moi" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Ce compte est actuellement désactivé." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "L’adresse e-mail ou le mot de passe sont incorrects." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Le pseudo ou le mot de passe sont incorrects." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Adresse e-mail" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Pseudonyme" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Pseudonyme ou e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Identifiant" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-mail (confirmation)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Confirmation d'adresse e-mail" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (facultatif)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Vous devez saisir deux fois le même email." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Mot de passe (confirmation)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "L'adresse e-mail est déjà associée à votre compte." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "L'adresse e-mail est déjà associée à un autre compte." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Mot de passe actuel" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nouveau mot de passe" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nouveau mot de passe (confirmation)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Merci d'indiquer votre mot de passe actuel." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Cette adresse e-mail n'est pas associée à un compte utilisateur" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Le jeton de réinitialisation de mot de passe est invalide." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "utilisateur" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "adresse e-mail" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "vérifié" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "principale" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "adresse e-mail" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "adresses e-mail" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "créé" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "envoyé" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "clé" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "confirmation par e-mail" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "confirmations par e-mail" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -196,107 +196,107 @@ "Un compte existe déjà avec cette adresse e-mail. Merci de vous connecter au " "préalable avec ce compte, et ensuite connecter votre compte %s." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Vous devez d'abord définir le mot de passe de votre compte." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Vous devez d'abord associer une adresse e-mail à votre compte." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Comptes Sociaux" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "fournisseur" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "nom" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "id client" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "ID de l'app ou clé de l'utilisateur" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "clé secrète" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "Secret de l'API, secret du client, ou secret de l'utilisateur" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Clé" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "application sociale" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "applications sociales" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "dernière identification" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "date d'inscription" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "données supplémentaires" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "compte social" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "comptes sociaux" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "jeton" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) ou jeton d'accès (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "jeton secret" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) ou jeton d'actualisation (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "expire le" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "jeton de l'application sociale" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "jetons de l'application sociale" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Données de profil incorrectes" diff --git a/allauth/locale/he/LC_MESSAGES/django.po b/allauth/locale/he/LC_MESSAGES/django.po index a857742..51c9c97 100644 --- a/allauth/locale/he/LC_MESSAGES/django.po +++ b/allauth/locale/he/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2017-08-26 16:11+0300\n" "Last-Translator: Udi Oron \n" "Language-Team: Hebrew\n" @@ -35,155 +35,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "הסיסמה חייבת להיות באורך של לפחות {0} תווים." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "חשבונות" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "יש להזין את אותה הסיסמה פעמיים." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "סיסמה" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "זכור אותי" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "חשבון זה אינו פעיל כעת." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "כתובת האימייל ו/או הסיסמה אינם נכונים." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "שם המשתמש ו/או הסיסמה אינם נכונים." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "כתובת אימייל" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "אימייל" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "שם משתמש" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "שם משתמש או אימייל" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "כניסה" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "אימייל (שוב)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "אישור כתובת אימייל" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "אימייל (לא חובה)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "יש להזין את אותו האימייל פעמיים." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "סיסמה (שוב)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "כתובת אימייל זו כבר משויכת לחשבון זה." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "כתובת אימייל זו כבר משויכת לחשבון אחר." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "סיסמה נוכחית" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "סיסמה חדשה" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "סיסמה חדשה (שוב)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "אנא הזן את הסיסמה הנוכחית." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "כתובת אימייל זו אינה משויכת לאף חשבון" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "אסימון איפוס הסיסמה אינו תקין." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "משתמש" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "כתובת אימייל" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "מאומת" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "ראשי" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "כתובת אימייל" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "כתובות אימייל" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "נוצר" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "נשלח" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "מפתח" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "אישור באימייל" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "אישורים בדואל" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -192,107 +192,107 @@ "קיים כבר חשבון עם כתובת אימייל זו. אנא התחבר לחשבון זה, ואז קשר את חשבון %s " "שלך." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "לא נבחרה סיסמה לחשבונך." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "לא נמצאו כתובות אימייל מאומתות לחשבונך." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "חשבונות חברתיים" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "שם" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "התחברות אחרונה" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "תאריך הצטרפות" +#: socialaccount/models.py:101 +msgid "extra data" +msgstr "" + #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "חשבון חברתי" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "חשבונות חברתיים" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "פג תוקף בתאריך" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/hr/LC_MESSAGES/django.po b/allauth/locale/hr/LC_MESSAGES/django.po index bdf9769..4d5244d 100644 --- a/allauth/locale/hr/LC_MESSAGES/django.po +++ b/allauth/locale/hr/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2014-08-12 00:31+0200\n" "Last-Translator: \n" "Language-Team: Bojan Mihelac \n" @@ -40,161 +40,161 @@ msgid "Password must be a minimum of {0} characters." msgstr "Lozinka treba imati najmanje {0} znakova." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Korisnički računi" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Potrebno je upisati istu lozinku svaki put." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Lozinka" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Zapamti me" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Ovaj korisnički račun je privremeno neaktivan." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "E-mail adresa i/ili lozinka nisu ispravni." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Korisničko ime i/ili lozinka nisu ispravni." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-mail adresa" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Korisničko ime" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Korisničko ime ili e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Prijava" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "E-mail (neobavezno)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "E-mail potvrda" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (neobavezno)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "Potrebno je upisati istu lozinku svaki put." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Lozinka (ponovno)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "E-mail adresa je već registrirana s ovim korisničkim računom." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "E-mail adresa je već registrirana s drugim korisničkim računom." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Trenutna lozinka" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nova lozinka" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nova lozinka (ponovno)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Molimo unesite trenutnu lozinku." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Upisana e-mail adresa nije dodijeljena niti jednom korisničkom računu" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "korisnik" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "e-mail adresa" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "potvrđena" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primarna" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "E-mail adresa" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "E-mail adrese" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "E-mail potvrda" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "E-mail potvrde" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -203,107 +203,107 @@ "Korisnički račun s ovom e-mail adresom već postoji. Molimo da se prvo " "ulogirate pod tim korisničkim računom i spojite svoj %s račun" -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Vaš korisnički račun nema postavljenu lozinku." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Vaš korisnički račun nema potvrđenu e-mail adresu." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Korisnički računi" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "naziv" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "" + #: socialaccount/models.py:99 -msgid "uid" +msgid "date joined" msgstr "" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" +msgid "extra data" msgstr "" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/hu/LC_MESSAGES/django.po b/allauth/locale/hu/LC_MESSAGES/django.po index b202e8e..985778f 100644 --- a/allauth/locale/hu/LC_MESSAGES/django.po +++ b/allauth/locale/hu/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2015-05-08 22:42+0100\n" "Last-Translator: Tamás Makó \n" "Language-Team: \n" @@ -34,161 +34,161 @@ msgid "Password must be a minimum of {0} characters." msgstr "A jelszónak minimum {0} hosszúnak kell lennnie." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Felhasználók" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Ugyanazt a jelszót kell megadni mindannyiszor." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Jelszó" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Emlékezz rám" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "A felhasználó jelenleg nem aktív." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "A megadott email vagy a jelszó hibás." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "A megadott felhasználó vagy a jelszó hibás." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Email" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "Email" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Felhasználó azonosító" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Felhasználó azonosító vagy email" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Bejelentkezés" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "Email (nem kötelező)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "E-mail address" msgid "E-mail address confirmation" msgstr "Email" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "Email (nem kötelező)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "Ugyanazt a jelszót kell megadni mindannyiszor." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Jelszó (ismét)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Ez az email cím már hozzá van rendelve ehhez a felhasználóhoz." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Ez az email cím már hozzá van rendelve egy másik felhasználóhoz." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Jelenlegi jelszó" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Új jelszó" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Új jelszó (ismét)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Kérlek add meg az aktuális jelszavadat!" -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Az email cím nincs hozzárendelve egyetlen felhasználóhoz sem" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -197,107 +197,107 @@ "Ezzel az email címmel már létezik egy felhasználó . Először jelentkezz be, " "majd kapcsold össze a(z) %s felhasználóval." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "A felhasználódnak nincs beállított jelszava." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "A felhasználódnak nincs ellenőrzött email címe." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Közösségi Felhasználók" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "" +#: socialaccount/models.py:45 +msgid "name" +msgstr "" + +#: socialaccount/models.py:47 +msgid "client id" +msgstr "" + #: socialaccount/models.py:49 -msgid "name" -msgstr "" - -#: socialaccount/models.py:51 -msgid "client id" +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" msgstr "" #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "" + #: socialaccount/models.py:99 -msgid "uid" +msgid "date joined" msgstr "" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" +msgid "extra data" msgstr "" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/it/LC_MESSAGES/django.po b/allauth/locale/it/LC_MESSAGES/django.po index 1e149c4..9461936 100644 --- a/allauth/locale/it/LC_MESSAGES/django.po +++ b/allauth/locale/it/LC_MESSAGES/django.po @@ -1,25 +1,24 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. -# # Translators: # guglielmo , 2014 # joke2k , 2014 # puntosit , 2014 +# Sandro , 2019. msgid "" msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" -"PO-Revision-Date: 2018-03-08 00:40+0100\n" -"Last-Translator: joke2k \n" -"Language-Team: Italian (http://www.transifex.com/projects/p/django-allauth/" -"language/it/)\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"PO-Revision-Date: 2019-09-30 00:03+0200\n" +"Last-Translator: Sandro \n" "Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.8.7.1\n" #: account/adapter.py:45 msgid "Username can not be used. Please use other username." @@ -27,7 +26,7 @@ #: account/adapter.py:49 msgid "Too many failed login attempts. Try again later." -msgstr "" +msgstr "Troppo tentativi di accesso. Riprova più tardi." #: account/adapter.py:51 msgid "A user is already registered with this e-mail address." @@ -38,162 +37,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "La password deve essere lunga almeno {0} caratteri." -#: account/apps.py:8 -#, fuzzy +#: account/apps.py:7 msgid "Accounts" msgstr "Account" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Devi digitare la stessa password." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Password" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Ricordami" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Questo account non è attualmente attivo." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "L'indirizzo e-mail e/o la password che hai usato non sono corretti." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Lo username e/o la password che hai usato non sono corretti." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Indirizzo e-mail" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Username" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Username o e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Login" -#: account/forms.py:294 -#, fuzzy -#| msgid "E-mail (optional)" +#: account/forms.py:292 msgid "E-mail (again)" -msgstr "E-mail (opzionale)" - -#: account/forms.py:298 -#, fuzzy -#| msgid "email confirmation" +msgstr "E-mail (di nuovo)" + +#: account/forms.py:296 msgid "E-mail address confirmation" -msgstr "e-mail di conferma" - -#: account/forms.py:306 +msgstr "Conferma dell'indirizzo emai" + +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (opzionale)" -#: account/forms.py:347 -#, fuzzy -#| msgid "You must type the same password each time." +#: account/forms.py:345 msgid "You must type the same email each time." -msgstr "Devi digitare la stessa password." - -#: account/forms.py:370 account/forms.py:479 +msgstr "Devi digitare la stessa password ogni volta." + +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Password (nuovamente)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Questo indirizzo e-mail è già associato a questo account." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Questo indirizzo e-mail è gia associato a un altro account." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Password attuale" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nuova password" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nuova password (nuovamente)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Per favore digita la tua password attuale." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "L'indirizzo e-mail non è assegnato a nessun account utente" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Il codice per il reset della password non è valido." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "utente" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "indirizzo e-mail" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "verificato" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primario" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "indirizzo email" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "indirizzi email" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "creato" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "inviato" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "chiave" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "email di conferma" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "email di conferma" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -202,112 +194,109 @@ "Esiste già un account con questo indirizzo e-mail. Per favore entra con " "quell'account, e successivamente connetti il tuo account %s." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Il tuo account non ha ancora nessuna password." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Non hai ancora verificato il tuo indirizzo e-mail." -#: socialaccount/apps.py:8 -#, fuzzy +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Account" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" -msgstr "" +msgstr "provider" + +#: socialaccount/models.py:45 +msgid "name" +msgstr "nome" + +#: socialaccount/models.py:47 +msgid "client id" +msgstr "Id cliente" #: socialaccount/models.py:49 -#, fuzzy -msgid "name" -msgstr "username" - -#: socialaccount/models.py:51 -msgid "client id" -msgstr "" +msgid "App ID, or consumer key" +msgstr "App ID, o consumer key" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "secret key" #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 -#, fuzzy +#: socialaccount/models.py:58 msgid "Key" msgstr "Chiave" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "Ultimo accesso" + #: socialaccount/models.py:99 -msgid "uid" -msgstr "" +msgid "date joined" +msgstr "data iscrizione" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" -msgstr "" +msgid "extra data" +msgstr "dati aggiuntivi" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "scade il" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" -msgstr "" +msgstr "Dati profilo non validi" #: socialaccount/providers/oauth/client.py:78 #, python-format @@ -404,12 +393,7 @@ msgstr "Sei sicuro di voler rimuovere l'indirizzo e-mail selezionato?" #: templates/account/email/email_confirmation_message.txt:1 -#, fuzzy, python-format -#| msgid "" -#| "User %(user_display)s at %(site_name)s has given this as an email " -#| "address.\n" -#| "\n" -#| "To confirm this is correct, go to %(activate_url)s\n" +#, python-format msgid "" "Hello from %(site_name)s!\n" "\n" @@ -434,18 +418,11 @@ "%(site_domain)s" #: templates/account/email/email_confirmation_subject.txt:3 -#, fuzzy -#| msgid "Confirm E-mail Address" msgid "Please Confirm Your E-mail Address" msgstr "Conferma l'Indirizzo E-Mail" #: templates/account/email/password_reset_key_message.txt:1 -#, fuzzy, python-format -#| msgid "" -#| "You're receiving this e-mail because you or someone else has requested a " -#| "password for your user account at %(site_domain)s.\n" -#| "It can be safely ignored if you did not request a password reset. Click " -#| "the link below to reset your password." +#, python-format msgid "" "Hello from %(site_name)s!\n" "\n" diff --git a/allauth/locale/ja/LC_MESSAGES/django.po b/allauth/locale/ja/LC_MESSAGES/django.po index e6d454e..6028397 100644 --- a/allauth/locale/ja/LC_MESSAGES/django.po +++ b/allauth/locale/ja/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2014-08-12 00:32+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,268 +35,268 @@ msgid "Password must be a minimum of {0} characters." msgstr "パスワードは {0} 文字以上の長さが必要です。" -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "アカウント" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "同じパスワードを入力してください。" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "パスワード" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "ログインしたままにする" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "このアカウントは現在無効です。" -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "入力されたメールアドレスもしくはパスワードが正しくありません。" -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "入力されたユーザー名もしくはパスワードが正しくありません。" -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "メールアドレス" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "メールアドレス" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "ユーザー名" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "ユーザー名またはメールアドレス" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "ログイン" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "メールアドレス（オプション）" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "メールアドレスの確認" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "メールアドレス（オプション）" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "同じパスワードを入力してください。" -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "パスワード（再入力）" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "このメールアドレスはすでに登録されています。" -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "このメールアドレスは別のアカウントで使用されています。" -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "現在のパスワード" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "新しいパスワード" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "新しいパスワード（再入力）" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "現在のパスワードを入力してください。" -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "このメールアドレスで登録されたユーザーアカウントがありません。" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "ユーザー" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "メールアドレス" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "確認済み" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "メイン" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "メールアドレス" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "メールアドレス" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "作成日時" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "送信日時" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "メールアドレスの確認" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "メールアドレスの確認" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " "account first, then connect your %s account." msgstr "" -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "アカウントにパスワードを設定する必要があります。" -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "確認済みのメールアドレスの登録が必要です。" -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "外部アカウント" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "プロバイダー" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "ユーザー名" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "" + #: socialaccount/models.py:99 -msgid "uid" +msgid "date joined" msgstr "" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" +msgid "extra data" msgstr "" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/ko/LC_MESSAGES/django.po b/allauth/locale/ko/LC_MESSAGES/django.po index dd2941e..2239fec 100644 --- a/allauth/locale/ko/LC_MESSAGES/django.po +++ b/allauth/locale/ko/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,155 +35,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "비밀번호는 최소 {0}자 이상이어야 합니다." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "계정" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "동일한 비밀번호를 입력해야 합니다." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "비밀번호" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "아이디 저장" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "해당 계정은 현재 비활성화 상태입니다." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "이메일 또는 비밀번호가 올바르지 않습니다." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "아이디 또는 비밀번호가 올바르지 않습니다." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "이메일 주소" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "이메일" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "아이디" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "아이디 또는 이메일" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "로그인" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "이메일 (확인)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "이메일 주소 확인" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "이메일 (선택사항)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "동일한 이메일을 입력해야 합니다." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "비밀번호 (확인)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "해당 이메일은 이미 이 계정에 등록되어 있습니다." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "해당 이메일은 다른 계정에 등록되어 있습니다." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "현재 비밀번호" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "새 비밀번호" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "새 비밀번호 (확인)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "현재 비밀번호를 입력하세요." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "해당 이메일을 가지고 있는 사용자가 없습니다." -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "비밀번호 초기화 토큰이 올바르지 않습니다." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "사용자" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "이메일 주소" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "인증완료" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "주" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "이메일 주소" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "이메일 주소" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "생성됨" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "전송됨" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "키" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "이메일 확인" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "이메일 확인" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -192,107 +192,107 @@ "해당 이메일을 사용중인 계정이 이미 존재합니다. 해당 계정으로 로그인 후에 %s " "계정으로 연결하세요." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "당신의 계정에 비밀번호가 설정되어있지 않습니다." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "당신의 계정에는 인증된 이메일이 없습니다." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "소셜 계정" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "제공자" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "이름" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "클라이언트 아이디" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "앱 아이디 또는 컨슈머 아이디" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "비밀 키" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "API 비밀 키, 클라이언트 비밀 키, 또는 컨슈머 비밀 키" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "키" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "소셜 어플리케이션" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "소셜 어플리케이션" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "최종 로그인" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "가입 날짜" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "추가 정보" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "소셜 계정" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "소셜 계정" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "토큰" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) 또는 access token (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) 또는 refresh token (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "만료일" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "소셜 어플리케이션 토큰" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "소셜 어플리케이션 토큰" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/ky/LC_MESSAGES/django.po b/allauth/locale/ky/LC_MESSAGES/django.po index 8a67892..2ea3c1a 100644 --- a/allauth/locale/ky/LC_MESSAGES/django.po +++ b/allauth/locale/ky/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2016-07-20 22:24+0600\n" "Last-Translator: Murat Jumashev \n" "Language-Team: LANGUAGE \n" @@ -34,161 +34,161 @@ msgid "Password must be a minimum of {0} characters." msgstr "Купуя жок дегенде {0} белгиден турушу керек." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Эсептер" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Сиз ошол эле купуяны кайрадан териңиз." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Купуя" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Мени эстеп кал" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Бул эсеп учурда активдүү эмес." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Сиз берген эмейл дарек жана/же купуя туура эмес." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Сиз берген колдонуучу аты жана/же купуя туура эмес." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Эмейл дарек" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "Эмейл" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Колдонуучу аты" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Колдонуучу аты же эмейл" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Логин" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "Эмейл (милдеттүү эмес)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "эмейл ырастоо" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "Эмейл (милдеттүү эмес)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "Сиз ошол эле купуяны кайрадан териңиз." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Купуя (дагы бир жолу)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Бул эмейл дарек ушул эсеп менен буга чейин туташтырылган." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Бул эмейл дарек башка бир эсеп менен буга чейин туташтырылган." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Азыркы купуя" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Жаңы купуя" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Жаңы купуя (кайрадан)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Учурдагы купуяңызды жазыңыз." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Эмейл дарек эч бир колдонуучу эсебине байланган эмес" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Купуяны жаңыртуу токени туура эмес." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "колдонуучу" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "эмейл дарек" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "дурусталган" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "негизги" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "эмейл дарек" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "эмейл даректер" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "түзүлгөн" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "жөнөтүлгөн" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "ачкыч" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "эмейл ырастоо" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "эмейл ырастоолор" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -197,107 +197,107 @@ "Бул эмейл менен башка эсеп катталган. Ошол эсеп аркылуу кирип, %s эсебиңизди " "туташтырып алыңыз." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Сиздин эсебиңизде купуя орнотулган эмес." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Сиздин эсебиңизде дурусталган эмейл даректер жок." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Социалдык эсептер" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "провайдер" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "аты" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "кардар id'си" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "Колдонмо ID'си, же керектөөчү ачкычы" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "жашыруун ачкыч" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "API, кардар же керектөөчүнүн жашыруун ачкычы" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Ачкыч" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "социалдык колдонмо" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "социалдык колдонмолор" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "акыркы кириши" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "кошулган күнү" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "кошумча маалымат" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "социалдык эсеп" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "социалдык эсептер" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "токен" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) же жетки токени (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "токендин жашыруун ачкычы" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) же жаңыртуу токени (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "мөөнөтү аяктайт" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "социалдык колдонмо токени" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "социалдык колдонмо токендери" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/lt/LC_MESSAGES/django.po b/allauth/locale/lt/LC_MESSAGES/django.po index e1d1b67..a2619f0 100644 --- a/allauth/locale/lt/LC_MESSAGES/django.po +++ b/allauth/locale/lt/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -37,161 +37,161 @@ msgid "Password must be a minimum of {0} characters." msgstr "Slaptažodis turi būti sudarytas mažiausiai iš {0} simbolių." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Paskyros" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Turite įvesti tą patį slaptažodį kiekvieną kartą." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Slaptažodis" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Prisimink mane" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Šiuo metu ši paskyra yra neaktyvi." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Pateiktas el. pašto adresas ir/arba slaptažodis yra neteisingi." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Pateiktas naudotojo vardas ir/arba slaptažodis yra neteisingi." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "El. pašto adresas" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "El. paštas" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Naudotojo vardas" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Naudotojo vardas arba el. paštas" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Prisijungimo vardas" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "El. paštas (neprivalomas)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "el. pašto patvirtinimas" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "El. paštas (neprivalomas)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "Turite įvesti tą patį slaptažodį kiekvieną kartą." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Slaptažodis (pakartoti)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Šis el. pašto adresas jau susietas su šia paskyra." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Šis el. pašto adresas jau susietas su kita paskyra." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Esamas slaptažodis" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Naujas slaptažodis" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Naujas slaptažodis (pakartoti)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Prašome įvesti esamą jūsų slaptažodį." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "El. pašto adresas nėra susietas su jokia naudotojo paskyra" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Neteisingas slaptažodžio atstatymo atpažinimo ženklas." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "naudotojas" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "el. pašto adresas" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "patvirtintas" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "pirminis" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "el. pašto adresas" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "el. pašto adresai" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "sukurtas" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "išsiųstas" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "raktas" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "el. pašto patvirtinimas" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "el. pašto patvirtinimai" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -200,108 +200,108 @@ "Paskyra su šiuo el. pašto adresu jau egzistuoja. Prašome pirmiausia " "prisijungti prie tos paskyros ir tada prijunkite %s paskyrą." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Jūsų paskyra neturi nustatyto slaptažodžio." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Jūsų paskyra neturi patvirtinto el. pašto adreso." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Socialinės paskyros" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "tiekėjas" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "pavadinimas" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "kliento id" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "App ID arba consumer key" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "secret key" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "API secret, client secret, arba consumer secret" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Raktas" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "socialinė programėlė" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "socialinės programėlės" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "paskutinis prisijungimas" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "registracijos data" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "papildomi duomenys" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "socialinė paskyra" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "socialinės paskyros" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "atpažinimo ženklas" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) arba prieigos atpažinimo ženklas (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "token secret" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" "\"oauth_token_secret\" (OAuth1) arba atnaujintas atpažinimo ženklas (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "galiojimas" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "socialinės programėlės atpažinimo ženklas" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "socialinės programėlės atpažinimo ženklai" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/lv/LC_MESSAGES/django.po b/allauth/locale/lv/LC_MESSAGES/django.po index 2680c9a..2e190c5 100644 --- a/allauth/locale/lv/LC_MESSAGES/django.po +++ b/allauth/locale/lv/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,161 +38,161 @@ msgid "Password must be a minimum of {0} characters." msgstr "Parolei jābūt vismaz {0} simbolus garai." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Konti" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Katru reizi jums ir jāievada tā pati parole." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Parole" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Atcerēties mani" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Šis konts šobrīd ir neaktīvs." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Nepareizs e-pasts un/vai parole." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Nepareizs lietotāja vārds un/vai parole." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-pasta adrese" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-pasts" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Lietotājvārds" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Lietotājvārds vai e-pasts" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Ieiet" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "E-pasts (izvēles)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "e-pasta apstiprinājums" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-pasts (izvēles)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "Katru reizi jums ir jāievada tā pati parole." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Parole (vēlreiz)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Šī e-pasta adrese jau ir piesaistīta šim kontam." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Šī e-pasta adrese jau ir piesaistīta citam kontam." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Šobrīdējā parole" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Jaunā parole" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Jaunā parole (vēlreiz)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Lūdzu ievadiet jūsu šobrīdējo paroli." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "E-pasta adrese nav piesaistīta nevienam lietotāja kontam" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Paroles atjaunošanas marķieris bija nederīgs." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "lietotājs" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "e-pasta adrese" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "apstiprināts" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primārā" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-pasta adrese" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-pasta adreses" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "izveidots" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "nosūtīts" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "atslēga" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "e-pasta apstiprinājums" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "e-pasta apstiprinājumi" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -201,107 +201,107 @@ "Jau eksistē konts ar šo e-pasta adresi. Lūdzu sākumā ieejiet tajā kontā, tad " "pievienojiet %s kontu." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Jūsu kontam nav uzstādīta parole." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Jūsu kontam nav apstiprinātas e-pasta adreses." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Sociālie konti" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "sniedzējs" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "vārds" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "klienta id" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "App ID, vai consumer key" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "secret key" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "API secret, client secret, vai consumer secret" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Key" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "sociālā aplikācija" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "sociālās aplikācijas" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "pēdējā pieslēgšanās" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "reģistrācijas datums" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "papildus informācija" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "sociālais konts" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "sociālie konti" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "token" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) vai piekļūt marķierim (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "token secret" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) vai atjaunot marķieri (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "beidzas" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "sociālās aplikācijas marķieris" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "sociālās aplikācijas marķieri" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/nl/LC_MESSAGES/django.po b/allauth/locale/nl/LC_MESSAGES/django.po index a9a76d2..4ae4809 100644 --- a/allauth/locale/nl/LC_MESSAGES/django.po +++ b/allauth/locale/nl/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2016-07-25 15:18+0200\n" "Last-Translator: pennersr \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/django-allauth/" @@ -25,7 +25,7 @@ #: account/adapter.py:49 msgid "Too many failed login attempts. Try again later." -msgstr "Teveel foutieve inlog pogingen. Probeer het later nogmaals." +msgstr "Te veel inlogpogingen. Probeer het later nogmaals." #: account/adapter.py:51 msgid "A user is already registered with this e-mail address." @@ -36,157 +36,157 @@ msgid "Password must be a minimum of {0} characters." msgstr "Het wachtwoord moet minimaal {0} tekens bevatten." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Accounts" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Je moet hetzelfde wachtwoord twee keer intoetsen." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Wachtwoord" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Onthouden" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Dit account is niet actief" -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Je e-mailadres en wachtwoord komen niet overeen." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Je gebruikersnaam en wachtwoord komen niet overeen." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-mailadres" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Gebruikersnaam" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Gebruikersnaam of e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Login" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "E-mail (optioneel)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Bevestig e-mailadres" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (optioneel)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Je moet hetzelfde e-mailadres twee keer intoetsen." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Wachtwoord (bevestigen)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Dit e-mailadres is al geassocieerd met dit account." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Dit e-mailadres is al geassocieerd met een ander account." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Huidig wachtwoord" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nieuw wachtwoord" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nieuw wachtwoord (bevestigen)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Geef je huidige wachtwoord op." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Dit e-mailadres is niet bij ons bekend" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "De wachtwoordherstel-sleutel is niet geldig." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "gebruiker" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "e-mailadres" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "geverifieerd" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "Primair" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-mailadres" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-mailadressen" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "aangemaakt" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "verstuurd" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "sleutel" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "e-mailadres bevestiging" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "e-mailadres bevestigingen" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -195,107 +195,107 @@ "Er bestaat al een account met dit e-mailadres. Meld je eerst aan met dit " "account, verbind daarna je %s account." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Je account heeft geen wachtwoord ingesteld." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Je account heeft geen geverifieerd e-mailadres." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Sociale accounts" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "naam" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "" + #: socialaccount/models.py:99 -msgid "uid" +msgid "date joined" msgstr "" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" +msgid "extra data" msgstr "" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/no/LC_MESSAGES/django.po b/allauth/locale/no/LC_MESSAGES/django.po index 554454c..17d7e3a 100644 --- a/allauth/locale/no/LC_MESSAGES/django.po +++ b/allauth/locale/no/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" +"PO-Revision-Date: 2019-12-18 18:56+0100\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "Language: \n" @@ -19,7 +19,7 @@ #: account/adapter.py:45 msgid "Username can not be used. Please use other username." -msgstr "Brukernavnet kan ikke brukes. Vennligst bruk et annet brukernavn." +msgstr "Brukernavnet kan ikke benyttes. Vennligst velg et annet brukernavn." #: account/adapter.py:49 msgid "Too many failed login attempts. Try again later." @@ -27,293 +27,293 @@ #: account/adapter.py:51 msgid "A user is already registered with this e-mail address." -msgstr "En bruker med følgende e-postadresse er allerede registrert." +msgstr "En bruker med denne e-postadressen er allerede registrert." #: account/adapter.py:294 #, python-brace-format msgid "Password must be a minimum of {0} characters." msgstr "Passordet må være minst {0} tegn." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Kontoer" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Du må skrive det samme passordet hver gang." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Passord" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Husk meg" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." -msgstr "Denne kontoen er for tiden inaktiv." - -#: account/forms.py:103 +msgstr "Denne kontoen er inaktiv." + +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." -msgstr "E-postadressen og/eller passordet du spesifiserte er feil." - -#: account/forms.py:106 +msgstr "E-postadressen og/eller passordet du oppgav er feil." + +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." -msgstr "Brukernavnet og/eller passordet du spesifiserte er feil." - -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +msgstr "Brukernavnet og/eller passordet du oppgav er feil." + +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-postadresse" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-post" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Brukernavn" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Brukernavn eller e-post" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Logg inn" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-post (igjen)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" -msgstr "E-postadresse bekreftelse" - -#: account/forms.py:306 +msgstr "Bekreftelse av e-postadresse" + +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-post (valgfritt)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Du må skrive inn samme e-post hver gang." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Passord (igjen)" +#: account/forms.py:432 +msgid "This e-mail address is already associated with this account." +msgstr "Denne e-postadressen er allerede tilknyttet denne kontoen." + #: account/forms.py:434 -msgid "This e-mail address is already associated with this account." -msgstr "Denne e-postadressen er allerede assosiert med denne kontoen." - -#: account/forms.py:436 msgid "This e-mail address is already associated with another account." -msgstr "Denne e-postadressen er allerede assosiert med en annen konto." - -#: account/forms.py:458 +msgstr "Denne e-postadressen er tilknyttet en annen konto." + +#: account/forms.py:456 msgid "Current Password" msgstr "Nåværende passord" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nytt passord" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nytt passord (igjen)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Vennligst skriv inn ditt passord." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" -msgstr "E-postadressen er ikke gitt til en brukerkonto" - -#: account/forms.py:570 +msgstr "E-postadressen er ikke tilknyttet noen brukerkonto" + +#: account/forms.py:568 msgid "The password reset token was invalid." -msgstr "Passord gjennoprettelses token var ugyldig." - -#: account/models.py:23 +msgstr "Nøkkelen for passordgjenopprettelse var ugyldig." + +#: account/models.py:21 msgid "user" msgstr "bruker" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "epostadresse" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "verifisert" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primær" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-postadresse" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-postadresser" -#: account/models.py:83 +#: account/models.py:80 msgid "created" -msgstr "laget" - -#: account/models.py:85 +msgstr "opprettet" + +#: account/models.py:82 msgid "sent" msgstr "sendt" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "nøkkel" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" -msgstr "e-post bekreftelse" - -#: account/models.py:92 +msgstr "e-postbekreftelse" + +#: account/models.py:89 msgid "email confirmations" -msgstr "e-post bekreftelser" - -#: socialaccount/adapter.py:27 +msgstr "e-postbekreftelser" + +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " "account first, then connect your %s account." msgstr "" "En konto med denne e-postadressen eksisterer fra før. Vennligst logg inn på " -"den kontoen først, deretter koble til din %s konto." - -#: socialaccount/adapter.py:132 +"den kontoen først for så å koble til din %s konto." + +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." -msgstr "Kontoen din har ingen passord satt opp." - -#: socialaccount/adapter.py:139 +msgstr "Kontoen din har ikke noe passord." + +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Din konto har ingen verifisert e-postadresse." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" -msgstr "Sosialkontoer" - -#: socialaccount/models.py:46 socialaccount/models.py:80 +msgstr "Sosiale kontoer" + +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "tilbyder" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "navn" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" -msgstr "klient id" - -#: socialaccount/models.py:53 +msgstr "klient-ID" + +#: socialaccount/models.py:49 msgid "App ID, or consumer key" -msgstr "App ID, eller konsumer nøkkel" - -#: socialaccount/models.py:54 +msgstr "App-ID eller konsumentnøkkel" + +#: socialaccount/models.py:50 msgid "secret key" msgstr "hemmelig nøkkel" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" -msgstr "API hemmelighet, klient hemmelighet eller konsumer hemmelighet" - -#: socialaccount/models.py:61 +msgstr "API-nøkkel, klient-nøkkel eller konsumentnøkkel" + +#: socialaccount/models.py:58 msgid "Key" msgstr "Nøkkel" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "sosial applikasjon" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" -msgstr "sosial applikasjoner" - -#: socialaccount/models.py:99 +msgstr "sosiale applikasjoner" + +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "siste innlogging" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "ble med dato" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "ekstra data" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "sosialkonto" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "sosialkontoer" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" -msgstr "token" - -#: socialaccount/models.py:138 +msgstr "nøkkel" + +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) eller aksess token (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" -msgstr "token hemmelighet" - -#: socialaccount/models.py:143 +msgstr "hemmelig nøkkel" + +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" -msgstr "\"oauth_token_secret\" (OAuth1) eller forfrisknings token (OAuth2)" - -#: socialaccount/models.py:145 +msgstr "\"oauth_token_secret\" (OAuth1) eller oppdateringsnøkkel (OAuth2)" + +#: socialaccount/models.py:140 msgid "expires at" msgstr "utgår den" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" -msgstr "sosial applikasjon token" - -#: socialaccount/models.py:150 +msgstr "sosial applikasjonsnøkkel" + +#: socialaccount/models.py:145 msgid "social application tokens" -msgstr "sosial applikasjon tokener" - -#: socialaccount/providers/douban/views.py:35 +msgstr "sosial applikasjonsnøkler" + +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" -msgstr "Ugyldig profil data" +msgstr "Ugyldig profildata" #: socialaccount/providers/oauth/client.py:78 #, python-format msgid "Invalid response while obtaining request token from \"%s\"." -msgstr "Ugyldig respons under henting av etterspørseltoken fra \"%s\"." +msgstr "Ugyldig respons ved henting av forespørselsnøkkel fra \"%s\"." #: socialaccount/providers/oauth/client.py:109 #, python-format msgid "Invalid response while obtaining access token from \"%s\"." -msgstr "Ugyldig respons under henting av tilgangstoken fra \"%s\"." +msgstr "Ugyldig respons ved henting av tilgangsnøkkel fra \"%s\"." #: socialaccount/providers/oauth/client.py:128 #, python-format msgid "No request token saved for \"%s\"." -msgstr "Ingen etterspørselstoken lagret for \"%s\"." +msgstr "Ingen etterspørselsnøkler lagret for \"%s\"." #: socialaccount/providers/oauth/client.py:177 #, python-format msgid "No access token saved for \"%s\"." -msgstr "Ingen tilgangstoken lagret for \"%s\"." +msgstr "Ingen tilgangsnøkler lagret for \"%s\"." #: socialaccount/providers/oauth/client.py:197 #, python-format @@ -347,7 +347,7 @@ #: templates/account/email.html:26 msgid "Unverified" -msgstr "Uverifisert" +msgstr "Ikke verifisert" #: templates/account/email.html:28 msgid "Primary" @@ -355,7 +355,7 @@ #: templates/account/email.html:34 msgid "Make Primary" -msgstr "Gjør til primær" +msgstr "Sett som primær" #: templates/account/email.html:35 msgid "Re-send Verification" @@ -375,7 +375,7 @@ "an e-mail address so you can receive notifications, reset your password, etc." msgstr "" "Du har for tiden ingen e-postadresse satt opp. Du burde legge til en e-" -"postadresse slik at du kan motta notifikasjoner, gjennoprette passord ol." +"postadresse slik at du kan motta varsler, gjennoprette passord ol." #: templates/account/email.html:48 msgid "Add E-mail Address" @@ -417,7 +417,7 @@ #: templates/account/email/email_confirmation_subject.txt:3 msgid "Please Confirm Your E-mail Address" -msgstr "Vennligst Bekreft Din E-postadresse" +msgstr "Vennligst bekreft din e-postadresse" #: templates/account/email/password_reset_key_message.txt:1 #, python-format @@ -434,12 +434,12 @@ "Du mottar denne e-postadressen fordi du eller noen andre har etterspurt et " "passord for din brukerkonto.\n" "Meldingen kan trygt ignoreres om du ikke foretok denne etterspørselen. Klikk " -"på linken under for å gjennopprette ditt passord." +"på linken nedenfor for å gjennopprette ditt passord." #: templates/account/email/password_reset_key_message.txt:8 #, python-format msgid "In case you forgot, your username is %(username)s." -msgstr "I tilfelle du glemte, brukernavnet ditt er %(username)s." +msgstr "I tilfelle du har glemt det: Brukernavnet ditt er %(username)s." #: templates/account/email/password_reset_key_message.txt:10 #, python-format @@ -452,12 +452,12 @@ #: templates/account/email/password_reset_key_subject.txt:3 msgid "Password Reset E-mail" -msgstr "Passordgjennopprettelse E-post" +msgstr "E-post for gjenopprettelse av passord" #: templates/account/email_confirm.html:6 #: templates/account/email_confirm.html:10 msgid "Confirm E-mail Address" -msgstr "Bekreft E-postadresse" +msgstr "Bekreft e-postadresse" #: templates/account/email_confirm.html:16 #, python-format @@ -478,8 +478,8 @@ "This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request." msgstr "" -"Denne e-post bekreftelseslinken er utgått eller ugyldig. Vennligst etterspør en ny e-postbekreftelse link." +"Denne e-postbekreftelseslinken er utgått eller ugyldig. Vennligst etterspør en ny e-postbekreftelseslink." #: templates/account/login.html:6 templates/account/login.html:10 #: templates/account/login.html:43 @@ -495,9 +495,8 @@ "for a %(site_name)s account and sign in below:" msgstr "" "Vennligst logg in med en\n" -"av dine eksisterende tredjeparts kontoer. Eller, registrer deg\n" -"for en %(site_name)s konto og logg inn under:" +"av dine eksisterende tredjeparts kontoer på %(site_name)s. Eller, registrer deg\n" +"og logg inn nedenfor:" #: templates/account/login.html:25 msgid "or" @@ -528,17 +527,17 @@ #: templates/account/messages/cannot_delete_primary_email.txt:2 #, python-format msgid "You cannot remove your primary e-mail address (%(email)s)." -msgstr "Du kan ikke fjerne en primær e-postadresse (%(email)s)." +msgstr "Du kan ikke fjerne den primær e-postadressen (%(email)s)." #: templates/account/messages/email_confirmation_sent.txt:2 #, python-format msgid "Confirmation e-mail sent to %(email)s." -msgstr "Bekreftelses e-post er sendt til %(email)s." +msgstr "Bekreftelsese-post er sendt til %(email)s." #: templates/account/messages/email_confirmed.txt:2 #, python-format msgid "You have confirmed %(email)s." -msgstr "Du har blitt bekreftet %(email)s." +msgstr "Du har bekreftet %(email)s." #: templates/account/messages/email_deleted.txt:2 #, python-format @@ -548,7 +547,7 @@ #: templates/account/messages/logged_in.txt:4 #, python-format msgid "Successfully signed in as %(name)s." -msgstr "Innlogging som %(name)s. suksessfull." +msgstr "Logget inn som %(name)s." #: templates/account/messages/logged_out.txt:2 msgid "You have signed out." @@ -585,24 +584,23 @@ #: templates/account/password_reset_done.html:6 #: templates/account/password_reset_done.html:9 msgid "Password Reset" -msgstr "Passord gjennopprettelse" +msgstr "Passordgjenopprettelse" #: templates/account/password_reset.html:15 msgid "" "Forgotten your password? Enter your e-mail address below, and we'll send you " "an e-mail allowing you to reset it." msgstr "" -"Glemt ditt passord? Skriv inn din e-postadresse under, og så sender vi deg " +"Glemt ditt passord? Skriv inn din e-postadresse nedenfor, så sender vi deg " "en e-post for å lage et nytt." #: templates/account/password_reset.html:20 msgid "Reset My Password" -msgstr "Gjennoprett mitt passord" +msgstr "Gjenopprett mitt passord" #: templates/account/password_reset.html:23 msgid "Please contact us if you have any trouble resetting your password." -msgstr "" -"Vennligst kontakt oss om du har problemer med passordgjennopprettelsen." +msgstr "Vennligst kontakt oss om du har problemer med passordgjenopprettelsen." #: templates/account/password_reset_done.html:15 msgid "" @@ -623,9 +621,9 @@ "used. Please request a new password reset." msgstr "" -"Passordgjennoppretelseslinken er ugyldig, mulig fordi den allerede er brukt. " -"Vennligst etterspør en ny passord " -"gjennopprettelse." +"Passordgjenopprettelseslinken er ugyldig – muligens fordi den allerede er " +"brukt. Vennligst etterspør en ny " +"passordgjennopprettelse." #: templates/account/password_reset_from_key.html:17 msgid "change password" @@ -673,14 +671,14 @@ #: templates/account/snippets/already_logged_in.html:5 #, python-format msgid "you are already logged in as %(user_display)s." -msgstr "du er allerede logget in som %(user_display)s." +msgstr "du er allerede logget inn som %(user_display)s." #: templates/account/verification_sent.html:5 #: templates/account/verification_sent.html:8 #: templates/account/verified_email_required.html:5 #: templates/account/verified_email_required.html:8 msgid "Verify Your E-mail Address" -msgstr "Bekreft Din E-postadresse" +msgstr "Bekreft din e-postadresse" #: templates/account/verification_sent.html:10 msgid "" @@ -708,7 +706,7 @@ "contact us if you do not receive it within a few minutes." msgstr "" "Vi har send en e-post til deg for\n" -"verifikasjon. Vennligst klikk på linken i e-posten.Vennligst kontakt oss om " +"verifikasjon. Vennligst klikk på linken i e-posten. Vennligst kontakt oss om " "du ikke mottar den innen et par minutter." #: templates/account/verified_email_required.html:20 @@ -717,24 +715,23 @@ "Note: you can still change your e-" "mail address." msgstr "" -"Notat: du kan fremdeles endre din " +"Merk: du kan fremdeles endre din " "your e-postadresse." #: templates/openid/login.html:9 msgid "OpenID Sign In" -msgstr "OpenID innlogging" +msgstr "OpenID-innlogging" #: templates/socialaccount/authentication_error.html:5 #: templates/socialaccount/authentication_error.html:8 msgid "Social Network Login Failure" -msgstr "Sosialenettverk innlogging feilet" +msgstr "Innlogging ved hjelp av sosialt nettverk mislyktes" #: templates/socialaccount/authentication_error.html:10 msgid "" "An error occurred while attempting to login via your social network account." msgstr "" -"Det skjedde en feil under forsøket på å logge inn via din " -"sosialenettverkskonto." +"Det skjedde en feil ved forsøket på å logge inn via din nettverkskonto." #: templates/socialaccount/connections.html:5 #: templates/socialaccount/connections.html:8 @@ -751,11 +748,11 @@ #: templates/socialaccount/connections.html:43 msgid "" "You currently have no social network accounts connected to this account." -msgstr "Du har for tiden ingen sosialenettverkskontoer tilkoblet din konto." +msgstr "Du har for tiden ingen tredjepartskontoer tilkoblet din konto." #: templates/socialaccount/connections.html:46 msgid "Add a 3rd Party Account" -msgstr "Legg til en tredjeparts konto" +msgstr "Legg til en tredjepartskonto" #: templates/socialaccount/login_cancelled.html:5 #: templates/socialaccount/login_cancelled.html:9 @@ -775,15 +772,15 @@ #: templates/socialaccount/messages/account_connected.txt:2 msgid "The social account has been connected." -msgstr "Sosialkontoen har blitt tilknytet." +msgstr "Tredjepartskontoen har blitt tilknytet." #: templates/socialaccount/messages/account_connected_other.txt:2 msgid "The social account is already connected to a different account." -msgstr "Sosialkontoen er allerede tilknytet til en annen konto." +msgstr "Tredjepartskonten er allerede tilknytet til en annen konto." #: templates/socialaccount/messages/account_disconnected.txt:2 msgid "The social account has been disconnected." -msgstr "Sosialkontoen er blitt frakoblet." +msgstr "Tredjepartskontoen er blitt frakoblet." #: templates/socialaccount/signup.html:10 #, python-format diff --git a/allauth/locale/pl/LC_MESSAGES/django.po b/allauth/locale/pl/LC_MESSAGES/django.po index ca3d478..999b4c8 100644 --- a/allauth/locale/pl/LC_MESSAGES/django.po +++ b/allauth/locale/pl/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2018-10-04 02:18+0200\n" "Last-Translator: Adam Dobrawy \n" "Language-Team: \n" @@ -33,155 +33,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Hasło musi składać się minimalnie z {0} znaków." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Konta" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Musisz wpisać za każdym razem to samo hasło" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Hasło" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Pamiętaj mnie" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Konto jest obecnie nieaktywne." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Adres e-mail i/lub hasło, które podałeś, są niepoprawne." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Użytkownik i/lub hasło które podałeś są niepoprawne." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Adres e-mail" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Nazwa użytkownika" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Nazwa użytkownika lub e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Login" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-mail (ponownie)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Powierdzenie adresu email" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (opcjonalnie)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Musisz wpisać za każdym razem ten sam e-mail." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Hasło (ponownie)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Ten adres e-mail jest już powiązany z tym kontem." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Ten adres e-mail jest już powiązany z innym kontem." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Obecne hasło" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nowe hasło" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nowe hasło (ponownie)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Proszę wpisz swoje obecne hasło" -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Adres e-mail nie jest powiązany z żadnym kontem użytkownika" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Token resetowania hasła był nieprawidłowy." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "użytkownik" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "adres e-mail" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "zweryfikowany" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "podstawowy" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "adres email" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "adresy e-mail" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "utworzono" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "wysłano" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "klucz" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "powierdzenie adresu email" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "potwierdzenia adresów email" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -190,107 +190,107 @@ "Istnieje już konto dla tego adresu e-mail. Zaloguj się wpierw na to konto, a " "następnie połącz swoje konto %s." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Twoje konto nie posiada hasła." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Twoje konto nie ma zweryfikowanego adresu e-mail" -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Konta społecznościowe" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "dostawca usług" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "nazwa" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "klient ID" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "ID aplikacji lub klucz odbiorcy" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "Klucz prywatny" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "Klucz prywatny API/klienta/dbiorcy" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Klucz" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "Aplikacja społecznościowa" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "Aplikacje społecznościowe" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "Data ostatniego logowania" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "Data przyłączenia" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "Dodatkowe dane" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "Konto społecznościowe" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "Konta społecznościowe" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "token" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) lub access token (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "token secret" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) lub refresh token (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "wygasa" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "Token aplikacji społecznościowej" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "Tokeny aplikacji społecznościowych" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Nieprawidłowe dane profilu" diff --git a/allauth/locale/pt_BR/LC_MESSAGES/django.po b/allauth/locale/pt_BR/LC_MESSAGES/django.po index 71d3dc7..9ec4e1c 100644 --- a/allauth/locale/pt_BR/LC_MESSAGES/django.po +++ b/allauth/locale/pt_BR/LC_MESSAGES/django.po @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2014-12-01 01:20+0000\n" "Last-Translator: cacarrara \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" @@ -28,7 +28,7 @@ #: account/adapter.py:49 msgid "Too many failed login attempts. Try again later." -msgstr "" +msgstr "Muitas tentativas de acesso sem sucesso. Tente novamente mais tarde." #: account/adapter.py:51 msgid "A user is already registered with this e-mail address." @@ -39,161 +39,161 @@ msgid "Password must be a minimum of {0} characters." msgstr "A senha deve ter no mínimo {0} caracteres." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Contas" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "A mesma senha deve ser escrita em ambos os campos." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Senha" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Lembrar-me" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Esta conta está desativada no momento." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "O endereço de e-mail e/ou senha especificados não estão corretos." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "O nome de usuário e/ou senha especificados não estão corretos." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Endereço de e-mail" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Nome de usuário" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Nome de usuário ou e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Login" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "E-mail (opcional)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "confirmação de e-mail" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (opcional)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "A mesma senha deve ser escrita em ambos os campos." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Senha (novamente)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Este endereço de e-mail já foi associado com esta conta." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Este endereço de e-mail já foi associado com outra conta." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" -msgstr "senha atual" - -#: account/forms.py:459 account/forms.py:548 +msgstr "Senha Atual" + +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nova Senha" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nova Senha (novamente)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Por favor insira a sua senha atual." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "O endereço de e-mail não está associado a nenhuma conta de usuário" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." -msgstr "" - -#: account/models.py:23 +msgstr "O token de redefinição de senha era inválido" + +#: account/models.py:21 msgid "user" msgstr "usuário" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "endereço de e-mail" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "verificado" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primário" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "endereço de e-mail" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "endereços de e-mail" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "criado" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "enviado" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "chave" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "confirmação de e-mail" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "confirmações de e-mail" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -202,107 +202,107 @@ "Já existe uma conta com esse endereço de e-mail. Por favor, faça login na " "conta existente e, em seguida, conecte com %s." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "A sua conta não tem senha definida." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "A sua conta não tem um endereço de e-mail verificado." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Contas Sociais" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "provedor" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "nome" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "id do cliente" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "App ID ou chave de consumidor" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "Chave secreta" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "Segredo de API, segredo de cliente ou segredo de consumidor" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Chave" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "aplicativo social" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "aplicativos sociais" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "último acesso" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "data de adesão" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "dados extras" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "conta social" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "contas sociais" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) ou token de acesso (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "token secreto" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) ou token de atualização (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "expira em" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "token de aplicativo social" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "tokens de aplicativo social" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/pt_PT/LC_MESSAGES/django.po b/allauth/locale/pt_PT/LC_MESSAGES/django.po index 409a731..183c6ae 100644 --- a/allauth/locale/pt_PT/LC_MESSAGES/django.po +++ b/allauth/locale/pt_PT/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2019-02-26 19:48+0100\n" "Last-Translator: Jannis Š\n" "Language-Team: Portuguese (Portugal) (http://www.transifex.com/projects/p/" @@ -35,157 +35,157 @@ msgid "Password must be a minimum of {0} characters." msgstr "A palavra-passe deve ter no mínimo {0} caracteres." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Contas" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Deve escrever a mesma palavra-passe em ambos os campos." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Palavra-passe" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Lembrar-me" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Esta conta está de momento desactivada" -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "" "O endereço de e-mail e/ou palavra-passe que especificou não estão corretos." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "" "O nome de utilizador e/ou palavra-passe que especificou não estão corretos." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Endereço de e-mail" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Nome de utilizador" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Nome de utilizador ou e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Entrar" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-mail (novamente)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Confirmação de endereço de e-mail" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (opcional)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Deve escrever o mesmo e-mail em ambos os campos." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Palavra-passe (novamente)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Este endereço de e-mail já foi associado com esta conta." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Este endereço de e-mail já foi associado com outra conta." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Palavra-passe atual" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nova Palavra-passe" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nova Palavra-passe (novamente)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Por favor insira a sua palavra-passe atual." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "O endereço de e-mail não está associado a nenhuma conta de utilizador" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "O token para redefinir a palavra-passe está inválido." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "utilizador" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "endereço de e-mail" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "verificado" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primário" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "endereço de e-mail" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "endereços de e-mail" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "criado" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "enviado" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "chave" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "confirmação de e-mail" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "confirmações de e-mail" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -194,107 +194,107 @@ "Já existe uma conta com este endereço de e-mail. Por favor entre com essa " "conta e depois associe a sua conta %s." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "A sua conta não tem palavra-passe definida." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "A sua conta não tem um endereço de e-mail verificado." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Contas de redes sociais" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "fornecedor" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "nome" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Chave" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "aplicação social" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "aplicações sociais" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "último login" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "data de registo" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "dados extra" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "conta social" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "contas sociais" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "expira a" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "token da aplicação social" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "tokens das aplicações sociais" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Dados de perfil inválidos" diff --git a/allauth/locale/ru/LC_MESSAGES/django.po b/allauth/locale/ru/LC_MESSAGES/django.po index 6672cc4..23af358 100644 --- a/allauth/locale/ru/LC_MESSAGES/django.po +++ b/allauth/locale/ru/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2017-04-05 22:48+0300\n" "Last-Translator: \n" "Language-Team: \n" @@ -34,155 +34,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Минимальное количество символов в пароле: {0}." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Аккаунты" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Вы должны ввести одинаковый пароль дважды." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Пароль" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Запомнить меня" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Учетная запись неактивна." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "E-mail адрес и/или пароль не верны." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Имя пользователя и/или пароль не верны." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-mail адрес" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Имя пользователя" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Имя пользователя или e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Войти" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-mail (ещё раз)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Подтверждение email адреса" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (опционально)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Вы должны ввести одинаковый e-mail дважды." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Пароль (ещё раз)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Указанный e-mail уже прикреплен к этому аккаунту." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Указанный e-mail прикреплен к другому пользователю." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Текущий пароль" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Новый пароль" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Новый пароль (ещё раз)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Пожалуйста, введите свой текущий пароль." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Нет пользователя с таким e-mail" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Неправильный код для сброса пароля." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "пользователь" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "e-mail адрес" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "подтвержден" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "основной" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "email адрес" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "email адреса" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "создано" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "отправлено" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "ключ" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "подтверждение email адреса" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "подтверждения email адресов" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -191,107 +191,107 @@ "Пользователь с таким e-mail уже зарегистрирован. Чтобы подключить свой %s " "аккаунт, пожалуйста, авторизуйтесь." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Для вашего аккаунта не установлен пароль." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Нет подтвержденных e-mail адресов для вашего аккаунта." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Социальные аккаунты" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "провайдер" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "имя" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "id клиента" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "ID приложения или ключ потребителя" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "секретный ключ" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "Секретный ключ API, клиента или потребителя" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Ключ" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "социальное приложение" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "социальные приложения" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "UID пользователя" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "дата последнего входа в систему" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "дата регистрации" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "дополнительные данные" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "аккаунт социальной сети" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "аккаунты социальных сетей" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "токен" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) или access token (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "секретный токен" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) или refresh token (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "истекает" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "токен социального приложения" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "токены социальных приложений" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Неверные данные профиля" diff --git a/allauth/locale/sk/LC_MESSAGES/django.po b/allauth/locale/sk/LC_MESSAGES/django.po index d3ded7e..4aa2e03 100644 --- a/allauth/locale/sk/LC_MESSAGES/django.po +++ b/allauth/locale/sk/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2017-04-26 12:48+0200\n" "Last-Translator: Tomas Babej \n" "Language-Team: \n" @@ -34,156 +34,156 @@ msgid "Password must be a minimum of {0} characters." msgstr "Heslo musí mať aspoň {0} znakov." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Účty" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Heslá sa nezhodujú." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Heslo" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Zapamätať si ma" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Tento účet nie je momentálne aktívny." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Uvedený e-mail alebo heslo nie je správne." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Uvedené užívateľské meno alebo heslo nie je správne." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-mailová adresa" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Užívateľské meno" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Užívateľské meno alebo e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Login" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-mail (znova)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Potvrdenie e-mailu" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (nepovinné)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Heslá sa nezhodujú." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Heslo (znovu)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Táto e-mailová adresa je už spojená s týmto účtom." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Táto e-mailová adresa je už spojená s iným účtom." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Súčasné heslo" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nové heslo" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nové heslo (znovu)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Prosím, napíšte svoje súčasné heslo." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "" "Táto e-mailová adresa nie je pridelená k žiadnemu používateľskému kontu" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Token na obnovu hesla bol nesprávny." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "používateľ" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "e-mailová adresa" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "overený" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primárny" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-mailová adresa" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-mailové adresy" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "vytvorený" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "odoslané" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "kľúč" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "potvrdenie e-mailu" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "potvrdenia e-mailu" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -192,110 +192,110 @@ "Účet s touto e-mailovou adresou už existuje. Prosím, prihláste sa najprv na " "tento účet a potom pripojte svoj %s účet." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Váš účet nemá nastavené heslo." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Váš účet nemá overenú e-mailovú adresu." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Účty na sociálnych sieťach" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "poskytovateľ" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "užívateľské meno" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "identifikátor klienta" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "ID aplikácie alebo zákaznícky kľúč" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "tajný kľúč" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "Kľúč API, klienta alebo zákazníka" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Kľúč" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "sociálna aplikácia" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "sociálne aplikácie" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "posledné prihlásenie" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "dáum pripojenia" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "ďalšie údaje" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "sociálny účet" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "sociálne účty" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "token" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "" "\"Oauth_token\" (Podpora protokolu OAuth1) alebo prístup tokenu (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "heslo prístupového tokenu" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" "\"Oauth_token_secret\" (Podpora protokolu OAuth1) alebo token obnovenie " "(OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "vyexpiruje" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "token sociálnej aplikácie" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "tokeny sociálnej aplikácie" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Nesprávne profilové údaje" diff --git a/allauth/locale/sr/LC_MESSAGES/django.po b/allauth/locale/sr/LC_MESSAGES/django.po index fac6227..02d1752 100644 --- a/allauth/locale/sr/LC_MESSAGES/django.po +++ b/allauth/locale/sr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Nikola Vulovic \n" "Language-Team: NONE\n" @@ -37,155 +37,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Лозинка мора бити најмање {0} знакова." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Рачуни" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Морате унијети исту лозинку сваки пут" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Лозинка" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Сети ме се" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Овај налог је тренутно неактиван." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Адреса е-поште и/или лозинка коју сте навели нису тачни." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Корисничко име и/или лозинка коју сте навели нису тачни." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Адреса е-поште" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "Е-пошта" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Корисничко име" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Корисничко име или е-пошта" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Пријавите се" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "Е-пошта (опет)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Потврда адресе е-поште" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "Е-пошта (опционо)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Морате унијети исту адресу е-поште сваки пут." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Лозинка (поново)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Ова адреса е-поште је већ повезана са овим налогом." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Ова адреса е-поште је већ повезана са другим налогом." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Тренутна лозинка" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Нова лозинка" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Нова лозинка (поново)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Молимо унесите тренутну лозинку." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Адреса е-поште није додељена било ком корисничком налогу" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Токен ресетовања лозинке је неважећи." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "корисник" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "адреса е-поште" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "проверено" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "примарна" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "адреса е-поште" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "адресе е-поште" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "створено" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "послат" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "кључ" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "потврда е-поште" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "потврде е-поште" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -194,107 +194,107 @@ "Рачун постоји већ са овом адресом е-поште. Пријавите се на топрви налог, " "затим повежите свој %s налог." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Ваш налог нема подешену лозинку." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Ваш налог нема потврђену е-маил адресу." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Друштвени рачуни" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "провидер" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "име" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "ИД клијента" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "ИД апликације или потрошачки кључ" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "тајни кључ" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "Тајна АПИ-ја, тајна клијента или тајна потрошача" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Кључ" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "друштвена апликација" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "друштвена апликације" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "уид" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "Последње пријављивање" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "Датум придружио" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "додатни подаци" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "друштвени рачун" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "друштвени рачуни" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "токен" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) или токен приступа (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "токен тајна" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) или освежени токен (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "истиче у" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "Токен друштвених апликација" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "токени друштвених апликација" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Невељавни подаци о профилу" diff --git a/allauth/locale/sr_Latn/LC_MESSAGES/django.po b/allauth/locale/sr_Latn/LC_MESSAGES/django.po index 2a36055..00f5a71 100644 --- a/allauth/locale/sr_Latn/LC_MESSAGES/django.po +++ b/allauth/locale/sr_Latn/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Nikola Vulovic \n" "Language-Team: NONE\n" @@ -37,155 +37,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Lozinka mora biti najmanje {0} znakova." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Računi" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Morate unijeti istu lozinku svaki put" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Lozinka" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Seti me se" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Ovaj nalog je trenutno neaktivan." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Adresa e-pošte i/ili lozinka koju ste naveli nisu tačni." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Korisničko ime i/ili lozinka koju ste naveli nisu tačni." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Adresa e-pošte" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-pošta" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Korisničko ime" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Korisničko ime ili e-pošta" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Prijavite se" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-pošta (opet)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "Potvrda adrese e-pošte" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-pošta (opciono)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Morate unijeti istu adresu e-pošte svaki put." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Lozinka (ponovo)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Ova adresa e-pošte je već povezana sa ovim nalogom." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Ova adresa e-pošte je već povezana sa drugim nalogom." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Trenutna lozinka" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nova lozinka" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nova lozinka (ponovo)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Molimo unesite trenutnu lozinku." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Adresa e-pošte nije dodeljena bilo kom korisničkom nalogu" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Token resetovanja lozinke je nevažeći." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "korisnik" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "adresa e-pošte" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "provereno" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "primarna" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "adresa e-pošte" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "adrese e-pošte" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "stvoreno" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "poslat" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "ključ" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "potvrda e-pošte" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "potvrde e-pošte" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -194,107 +194,107 @@ "Račun postoji već sa ovom adresom e-pošte. Prijavite se na toprvi nalog, " "zatim povežite svoj %s nalog." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Vaš nalog nema podešenu lozinku." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Vaš nalog nema potvrđenu e-mail adresu." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Društveni računi" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "provider" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "ime" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "ID klijenta" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "ID aplikacije ili potrošački ključ" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "tajni ključ" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "Tajna API-ja, tajna klijenta ili tajna potrošača" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Ključ" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "društvena aplikacija" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "društvena aplikacije" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "Poslednje prijavljivanje" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "Datum pridružio" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "dodatni podaci" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "društveni račun" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "društveni računi" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "token" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) ili token pristupa (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "token tajna" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) ili osveženi token (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "ističe u" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "Token društvenih aplikacija" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "tokeni društvenih aplikacija" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Neveljavni podaci o profilu" diff --git a/allauth/locale/sv/LC_MESSAGES/django.po b/allauth/locale/sv/LC_MESSAGES/django.po index 139023f..cffe67c 100644 --- a/allauth/locale/sv/LC_MESSAGES/django.po +++ b/allauth/locale/sv/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2014-08-12 00:35+0200\n" "Last-Translator: Jannis Š\n" "Language-Team: Swedish (http://www.transifex.com/projects/p/django-allauth/" @@ -35,274 +35,274 @@ msgid "Password must be a minimum of {0} characters." msgstr "Lösenordet måste vara minst {0} tecken långt" -#: account/apps.py:8 +#: account/apps.py:7 #, fuzzy msgid "Accounts" msgstr "Konto" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Du måste ange samma lösenord" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Lösenord" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Kom ihåg mig" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Detta konto är inaktivt." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Epost-adressen och/eller lösenordet är felaktigt." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Användarnamnet och/eller lösenordet är felaktigt." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "Epost-adress" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "Epost" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Användarnamn" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Användarnamn eller epost-adress" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Logga in" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "Epost (valfritt)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "epost-bekräftelse" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "Epost (valfritt)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "Du måste ange samma lösenord" -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Lösenord (igen)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Denna epost-adress är redan knuten till detta konto" -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Denna epost-adress är redan knuten till ett annat konto" -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Nuvarande lösenord" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Nytt lösenord" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Nytt lösenord (igen)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Skriv in ditt nuvarande lösenord." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Epost-adressen är inte knuten till något konto" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 #, fuzzy msgid "e-mail address" msgstr "epost-adress" -#: account/models.py:28 +#: account/models.py:26 #, fuzzy msgid "verified" msgstr "Ej verifierad" -#: account/models.py:29 +#: account/models.py:27 #, fuzzy msgid "primary" msgstr "Primär" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "epost-adress" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "epost-adresser" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "epost-bekräftelse" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "epost-bekräftelser" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " "account first, then connect your %s account." msgstr "" -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Ditt konto har inget lösenord." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Ditt konto har ingen verifierad epost-adress." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 #, fuzzy msgid "Social Accounts" msgstr "Konto" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 #, fuzzy msgid "name" msgstr "Användarnamn" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "" + #: socialaccount/models.py:99 -msgid "uid" +msgid "date joined" msgstr "" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" +msgid "extra data" msgstr "" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/th/LC_MESSAGES/django.po b/allauth/locale/th/LC_MESSAGES/django.po index d9fb5ef..879e3d8 100644 --- a/allauth/locale/th/LC_MESSAGES/django.po +++ b/allauth/locale/th/LC_MESSAGES/django.po @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2015-06-26 13:09+0700\n" "Last-Translator: Nattaphoom Chaipreecha \n" "Language-Team: Thai \n" @@ -37,268 +37,268 @@ msgid "Password must be a minimum of {0} characters." msgstr "รหัสผ่านต้องมีอย่างน้อย {0} ตัวอักษร" -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "บัญชี" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "ต้องพิมพ์รหัสผ่านเดิมซ้ำอีกครั้ง" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "รหัสผ่าน" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "จดจำการเข้าใช้" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "บัญชีนี้อยู่ในสถานะที่ใช้งานไม่ได้่" -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "อีเมลและ/หรือรหัสผ่านที่ระบุมาไม่ถูกต้อง" -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "ชื่อผู้ใช้และ/หรือรหัสผ่านที่ระบุมาไม่ถูกต้อง" -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "อีเมล" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "อีเมล" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "ชื่อผู้ใช้" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "ชื่อผู้ใช้ หรือ อีเมล" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "ลงชื่อเข้าใช้" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "อีเมล (ไม่จำเป็น)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "การยืนยันอีเมล" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "อีเมล (ไม่จำเป็น)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "ต้องพิมพ์รหัสผ่านเดิมซ้ำอีกครั้ง" -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "รหัสผ่าน (อีกครั้ง)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "อีเมลนี้ได้ถูกเชื่อมกับบัญชีนี้แล้ว" -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "อีเมลนี้ได้ถูกเชื่อมกับบัญชีอื่นแล้ว" -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "รหัสผ่านปัจจุบัน" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "รหัสผ่านใหม่" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "รหัสผ่านใหม่ (อีกครั้ง)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "โปรดใส่รหัสผ่านปัจจุบัน" -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "อีเมลนี้ไม่ได้เชื่อมกับบัญชีใดเลย" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "token ที่ใช้รีเซ็ทรหัสผ่านไม่ถูกต้อง" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "ผู้ใช้" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "อีเมล" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "ยืนยันแล้ว" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "หลัก" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "อีเมล" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "อีเมล" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "สร้างแล้ว" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "ส่งแล้ว" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "คีย์" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "การยืนยันอีเมล" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "การยืนยันอีเมล" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " "account first, then connect your %s account." msgstr "มีบัญชีที่ใช้อีเมลนี้แล้ว โปรดลงชื่อเข้าใช้ก่อนแล้วค่อยเชื่อมต่อกับบัญชี %s ของคุณ" -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "บัญชีของคุณไม่ได้ตั้งรหัสผ่านไว้" -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "บัญชีของคุณไม่มีอีเมลที่ยืนยันแล้ว" -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "บัญชีโซเชียล" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "ผู้ให้บริการ" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "ชื่อ" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "คีย์" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "" + #: socialaccount/models.py:99 -msgid "uid" +msgid "date joined" msgstr "" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" +msgid "extra data" msgstr "" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "token" +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + +#: socialaccount/models.py:136 +msgid "token secret" +msgstr "" + #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/tr/LC_MESSAGES/django.po b/allauth/locale/tr/LC_MESSAGES/django.po index bbd4afb..d264661 100644 --- a/allauth/locale/tr/LC_MESSAGES/django.po +++ b/allauth/locale/tr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2014-08-12 00:35+0200\n" "Last-Translator: Jannis Š\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/django-allauth/" @@ -36,165 +36,165 @@ msgid "Password must be a minimum of {0} characters." msgstr "Parola en az {0} karakter olmalıdır." -#: account/apps.py:8 +#: account/apps.py:7 #, fuzzy msgid "Accounts" msgstr "Hesap" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Her seferinde aynı parolayı girmelisiniz." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Parola" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Beni Hatırla" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Bu hesap şu anda etkin değil." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Girdiğiniz e-posta adresi ve/veya parola doğru değil." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Girdiğiniz kullanıcı adı ve/veya parola doğru değil." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-posta adresi" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-posta" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Kullanıcı adı" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Kullanıcı adı ya da e-posta" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Giriş Yap" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "E-posta (zorunlu değil)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "e-posta onayı" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-posta (zorunlu değil)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "Her seferinde aynı parolayı girmelisiniz." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Parola (tekrar)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Bu e-post adresi zaten bu hesap ile ilişkilendirilmiş." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Bu e-post adresi başka bir hesap ile ilişkilendirilmiş." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Mevcut Parola" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Yeni Parola" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Yeni Parola (tekrar)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Mevcut parolanızı tekrar yazın." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Bu e-posta adresi hiçbir kullanıcı hesabıyla ilişkili değil" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Şifre sıfırlama kodu hatalı." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "kullanıcı" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 #, fuzzy msgid "e-mail address" msgstr "e-posta adresi" -#: account/models.py:28 +#: account/models.py:26 #, fuzzy msgid "verified" msgstr "Doğrulanmamış" -#: account/models.py:29 +#: account/models.py:27 #, fuzzy msgid "primary" msgstr "Birincil" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-posta adresi" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-posta adresleri" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "oluşturuldu" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "gönderildi" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "e-posta onayı" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "e-posta onayları" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -203,109 +203,109 @@ "Bu e-posta ile kayıtlı bir hesap bulunmaktadır. Lütfen önce bu hesaba giriş " "yapıp daha sonra %s hesabınızı bağlayın." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Hesabınız için parola belirlemediniz." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Hesabınızın doğrulanmış e-posta adresi yok." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 #, fuzzy msgid "Social Accounts" msgstr "Hesap" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "sağlayıcı" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 #, fuzzy msgid "name" msgstr "Kullanıcı adı" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "son giriş" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "katıldığı tarih" +#: socialaccount/models.py:101 +msgid "extra data" +msgstr "" + #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Geçersiz profil bilgisi" diff --git a/allauth/locale/uk/LC_MESSAGES/django.po b/allauth/locale/uk/LC_MESSAGES/django.po index 29c6adc..f90a7e7 100644 --- a/allauth/locale/uk/LC_MESSAGES/django.po +++ b/allauth/locale/uk/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2014-08-12 00:36+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -38,155 +38,155 @@ msgid "Password must be a minimum of {0} characters." msgstr "Пароль повинен містити мінімум {0} символів." -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "Акаунти" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "Ви повинні вводити однаковий пароль кожного разу." -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "Пароль" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "Запам'ятати мене" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "Даний акаунт є неактивним." -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "Введена e-mail адреса і/або пароль є некоректними." -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "Введене ім'я користувача і/або пароль є некоректними." -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-mail адреса" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "Ім'я користувача" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "Ім'я користувача або e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "Увійти" -#: account/forms.py:294 +#: account/forms.py:292 msgid "E-mail (again)" msgstr "E-mail (ще раз)" -#: account/forms.py:298 +#: account/forms.py:296 msgid "E-mail address confirmation" msgstr "e-mail адреса підтвердження" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (необов'язковий)" -#: account/forms.py:347 +#: account/forms.py:345 msgid "You must type the same email each time." msgstr "Ви повинні вводити однакову e-mail адресу кожного разу." -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "Пароль (ще раз)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "Вказаний e-mail уже прикріплений до цього акаунту." -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "Вказаний e-mail уже прикріплений до іншого користувача." -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "Поточний пароль" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "Новий пароль" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "Новий пароль (ще раз)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "Будь ласка, вкажіть Ваш поточний пароль." -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "Немає користувача з такою e-mail адресою." -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "Токен відновлення паролю був невірним." -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "користувач" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 msgid "e-mail address" msgstr "e-mail адреса" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "підтверджено" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "основний" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-mail адреса" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-mail адреса" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "створено" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "відправлено" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "ключ" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "e-mail підтвердження" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "e-mail підтвердження" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -195,108 +195,108 @@ "Акаунт з такою e-mail адресою уже існує. Будь ласка, спершу увійдіть у цей " "акаунт, потім приєднайте Ваш %s акаунт." -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "Ваш акаунт не має встановленого паролю." -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "Немає підтвердження по e-mail для Вашого акаунту." -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "Соціальні акаунти" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "постачальник" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "Ім'я" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "ідентифікатор клієнта" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "ідентифікатор додатку або ключ користувача" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "секретний ключ" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "" "секретний ключ додатку, секретний ключ клієнта або секретний ключ користувача" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Ключ" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "соціальний додаток" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "соціальні додатки" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "ID користувача" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "дата останнього входу" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "дата реєстрації" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "додаткові дані" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "аккаунт соціальної мережі" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "акаунти соціальних мереж" -#: socialaccount/models.py:136 +#: socialaccount/models.py:131 msgid "token" msgstr "токен" -#: socialaccount/models.py:138 +#: socialaccount/models.py:133 msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" msgstr "\"oauth_token\" (OAuth1) або access token (OAuth2)" -#: socialaccount/models.py:141 +#: socialaccount/models.py:136 msgid "token secret" msgstr "секретний токен" -#: socialaccount/models.py:143 +#: socialaccount/models.py:138 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "\"oauth_token_secret\" (OAuth1) або refresh token (OAuth2)" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "закінчується" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "токен соціального додатку" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "токени соціальних додатків" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "Невірні дані профілю" diff --git a/allauth/locale/zh_CN/LC_MESSAGES/django.po b/allauth/locale/zh_CN/LC_MESSAGES/django.po index fc3a498..80a5f5e 100644 --- a/allauth/locale/zh_CN/LC_MESSAGES/django.po +++ b/allauth/locale/zh_CN/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2014-08-12 00:36+0200\n" "Last-Translator: jresins \n" "Language-Team: LANGUAGE \n" @@ -33,274 +33,274 @@ msgid "Password must be a minimum of {0} characters." msgstr "密码长度不得少于 {0} 个字符。" -#: account/apps.py:8 +#: account/apps.py:7 #, fuzzy msgid "Accounts" msgstr "账号" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "每次输入的密码必须相同" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "密码" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "记住我" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "此账号当前未激活。" -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "您提供的e-mail地址或密码不正确。" -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "您提供的用户名或密码不正确。" -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-mail地址" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "用户名" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "用户名或e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "账号" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "E-mail （选填项）" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "e-mail确认" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail （选填项）" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "每次输入的密码必须相同" -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "密码（重复）" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "此e-mail地址已关联到这个账号。" -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "此e-mail地址已关联到其他账号。" -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "当前密码" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "新密码" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "新密码（重复）" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "请输入您的当前密码" -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "此e-mail地址未分配给任何用户账号" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "重设密码的token不合法。" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "用户" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 #, fuzzy msgid "e-mail address" msgstr "e-mail地址" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "已验证" -#: account/models.py:29 +#: account/models.py:27 #, fuzzy msgid "primary" msgstr "首选e-mail" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-mail地址" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-mail地址" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "已建立" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "已发送" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "key" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "e-mail确认" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "e-mail确认" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " "account first, then connect your %s account." msgstr "已有一个账号与此e-mail地址关联，请先登录该账号，然后连接你的 %s 账号。" -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "您的账号未设置密码。" -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "您的账号下无任何验证过的e-mail地址。" -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 #, fuzzy msgid "Social Accounts" msgstr "账号" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "提供商" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 #, fuzzy msgid "name" msgstr "用户名" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "客户端 id" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 #, fuzzy msgid "Key" msgstr "key" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "最后登录" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "注册日期" +#: socialaccount/models.py:101 +msgid "extra data" +msgstr "" + #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "社交账号" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "社交账号" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/zh_Hans/LC_MESSAGES/django.po b/allauth/locale/zh_Hans/LC_MESSAGES/django.po index bb2b8a3..cc1e3b5 100644 --- a/allauth/locale/zh_Hans/LC_MESSAGES/django.po +++ b/allauth/locale/zh_Hans/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,274 +35,274 @@ msgid "Password must be a minimum of {0} characters." msgstr "密码长度不得少于 {0} 个字符。" -#: account/apps.py:8 +#: account/apps.py:7 #, fuzzy msgid "Accounts" msgstr "账号" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "每次输入的密码必须相同" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "密码" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "记住我" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "此账号当前未激活。" -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "您提供的e-mail地址或密码不正确。" -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "您提供的用户名或密码不正确。" -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "E-mail地址" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "用户名" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "用户名或e-mail" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "账号" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "E-mail （选填项）" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "e-mail确认" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail （选填项）" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "每次输入的密码必须相同" -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "密码（重复）" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "此e-mail地址已关联到这个账号。" -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "此e-mail地址已关联到其他账号。" -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "当前密码" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "新密码" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "新密码（重复）" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "请输入您的当前密码" -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "此e-mail地址未分配给任何用户账号" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "用户" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 #, fuzzy msgid "e-mail address" msgstr "e-mail地址" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "已验证" -#: account/models.py:29 +#: account/models.py:27 #, fuzzy msgid "primary" msgstr "首选e-mail" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "e-mail地址" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "e-mail地址" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "已建立" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "已发送" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "key" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "e-mail确认" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "e-mail确认" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " "account first, then connect your %s account." msgstr "已有一个账号与此e-mail地址关联，请先登录该账号，然后连接你的 %s 账号。" -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "您的账号未设置密码。" -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "您的账号下无任何验证过的e-mail地址。" -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 #, fuzzy msgid "Social Accounts" msgstr "账号" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 #, fuzzy msgid "name" msgstr "用户名" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "" +#: socialaccount/models.py:49 +msgid "App ID, or consumer key" +msgstr "" + +#: socialaccount/models.py:50 +msgid "secret key" +msgstr "" + #: socialaccount/models.py:53 -msgid "App ID, or consumer key" -msgstr "" - -#: socialaccount/models.py:54 -msgid "secret key" -msgstr "" - -#: socialaccount/models.py:56 msgid "API secret, client secret, or consumer secret" msgstr "" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 #, fuzzy msgid "Key" msgstr "key" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "" +#: socialaccount/models.py:95 +msgid "uid" +msgstr "" + +#: socialaccount/models.py:97 +msgid "last login" +msgstr "" + #: socialaccount/models.py:99 -msgid "uid" +msgid "date joined" msgstr "" #: socialaccount/models.py:101 -msgid "last login" -msgstr "" - -#: socialaccount/models.py:103 -msgid "date joined" +msgid "extra data" msgstr "" #: socialaccount/models.py:105 -msgid "extra data" -msgstr "" - -#: socialaccount/models.py:109 msgid "social account" msgstr "" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" +#: socialaccount/models.py:140 +msgid "expires at" +msgstr "" + +#: socialaccount/models.py:144 +msgid "social application token" +msgstr "" + #: socialaccount/models.py:145 -msgid "expires at" -msgstr "" - -#: socialaccount/models.py:149 -msgid "social application token" -msgstr "" - -#: socialaccount/models.py:150 msgid "social application tokens" msgstr "" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/zh_Hant/LC_MESSAGES/django.po b/allauth/locale/zh_Hant/LC_MESSAGES/django.po index d7439e2..0c3f8de 100644 --- a/allauth/locale/zh_Hant/LC_MESSAGES/django.po +++ b/allauth/locale/zh_Hant/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -35,162 +35,162 @@ msgid "Password must be a minimum of {0} characters." msgstr "密碼長度至少要有 {0} 個字元。" -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "帳號" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "每次輸入的密碼必須相同" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "密碼" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "記住我" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "此帳號目前沒有啟用。" -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "您提供的電子郵件地址或密碼不正確。" -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "您提供的使用者名稱或密碼不正確。" -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "電子郵件地址" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "使用者名稱" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "使用者名稱或電子郵件" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "登入" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "E-mail (可不填)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "電子郵件確認" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (可不填)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "每次輸入的密碼必須相同" -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "密碼 (再一次)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "此電子郵件已與這個帳號連結了。" -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "此電子郵件已經與別的帳號連結了。" -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "目前密碼" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "新密碼" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "新密碼 (再一次)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "請輸入您目前的密碼" -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "還沒有其他帳號使用這個電子郵件地址" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "使用者" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 #, fuzzy msgid "e-mail address" msgstr "電子郵件地址" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "已驗證" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "主要的" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "電子郵件地址" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "電子郵件地址" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "以建立" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "已送出" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "key" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "電子郵件確認" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "電子郵件確認" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -198,107 +198,107 @@ msgstr "" "已經有一個帳號與此電子郵件連結了，請先登入該帳號，然後連接你的 %s 帳號。" -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "您的帳號沒有設置密碼。" -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "您的帳號下沒有驗證過的電子郵件地址。" -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "社群帳號" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "提供者" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "名稱" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "client id" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "App ID, or consumer key" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "secret key" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "API secret, client secret, or consumer secret" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Key" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "社群應用程式" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "社群應用程式" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "最後一次登入" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "加入日期" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "額外資料" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "社群帳號" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "社群帳號" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "過期日" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "社群應用程式 Token" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "社群應用程式 Token" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/locale/zh_TW/LC_MESSAGES/django.po b/allauth/locale/zh_TW/LC_MESSAGES/django.po index 20841f1..3d3e238 100644 --- a/allauth/locale/zh_TW/LC_MESSAGES/django.po +++ b/allauth/locale/zh_TW/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: django-allauth\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-08-29 16:33-0500\n" +"POT-Creation-Date: 2019-12-18 11:53-0600\n" "PO-Revision-Date: 2014-08-12 00:36+0200\n" "Last-Translator: jresins \n" "Language-Team: Chinese (Traditional)\n" @@ -32,162 +32,162 @@ msgid "Password must be a minimum of {0} characters." msgstr "密碼長度至少要有 {0} 個字元。" -#: account/apps.py:8 +#: account/apps.py:7 msgid "Accounts" msgstr "帳號" -#: account/forms.py:63 account/forms.py:400 +#: account/forms.py:61 account/forms.py:398 msgid "You must type the same password each time." msgstr "每次輸入的密碼必須相同" -#: account/forms.py:93 account/forms.py:367 account/forms.py:478 +#: account/forms.py:91 account/forms.py:365 account/forms.py:476 msgid "Password" msgstr "密碼" -#: account/forms.py:94 +#: account/forms.py:92 msgid "Remember Me" msgstr "記住我" -#: account/forms.py:100 +#: account/forms.py:98 msgid "This account is currently inactive." msgstr "此帳號目前沒有啟用。" -#: account/forms.py:103 +#: account/forms.py:101 msgid "The e-mail address and/or password you specified are not correct." msgstr "您提供的電子郵件地址或密碼不正確。" -#: account/forms.py:106 +#: account/forms.py:104 msgid "The username and/or password you specified are not correct." msgstr "您提供的使用者名稱或密碼不正確。" -#: account/forms.py:115 account/forms.py:270 account/forms.py:428 -#: account/forms.py:497 +#: account/forms.py:113 account/forms.py:268 account/forms.py:426 +#: account/forms.py:495 msgid "E-mail address" msgstr "電子郵件地址" -#: account/forms.py:117 account/forms.py:303 account/forms.py:423 -#: account/forms.py:492 +#: account/forms.py:115 account/forms.py:301 account/forms.py:421 +#: account/forms.py:490 msgid "E-mail" msgstr "E-mail" -#: account/forms.py:122 account/forms.py:125 account/forms.py:262 -#: account/forms.py:266 +#: account/forms.py:120 account/forms.py:123 account/forms.py:260 +#: account/forms.py:264 msgid "Username" msgstr "使用者名稱" -#: account/forms.py:132 +#: account/forms.py:130 msgid "Username or e-mail" msgstr "使用者名稱或電子郵件" -#: account/forms.py:135 +#: account/forms.py:133 msgctxt "field label" msgid "Login" msgstr "登入" -#: account/forms.py:294 +#: account/forms.py:292 #, fuzzy #| msgid "E-mail (optional)" msgid "E-mail (again)" msgstr "E-mail (可不填)" -#: account/forms.py:298 +#: account/forms.py:296 #, fuzzy #| msgid "email confirmation" msgid "E-mail address confirmation" msgstr "電子郵件確認" -#: account/forms.py:306 +#: account/forms.py:304 msgid "E-mail (optional)" msgstr "E-mail (可不填)" -#: account/forms.py:347 +#: account/forms.py:345 #, fuzzy #| msgid "You must type the same password each time." msgid "You must type the same email each time." msgstr "每次輸入的密碼必須相同" -#: account/forms.py:370 account/forms.py:479 +#: account/forms.py:368 account/forms.py:477 msgid "Password (again)" msgstr "密碼 (再一次)" -#: account/forms.py:434 +#: account/forms.py:432 msgid "This e-mail address is already associated with this account." msgstr "此電子郵件已與這個帳號連結了。" -#: account/forms.py:436 +#: account/forms.py:434 msgid "This e-mail address is already associated with another account." msgstr "此電子郵件已經與別的帳號連結了。" -#: account/forms.py:458 +#: account/forms.py:456 msgid "Current Password" msgstr "目前密碼" -#: account/forms.py:459 account/forms.py:548 +#: account/forms.py:457 account/forms.py:546 msgid "New Password" msgstr "新密碼" -#: account/forms.py:460 account/forms.py:549 +#: account/forms.py:458 account/forms.py:547 msgid "New Password (again)" msgstr "新密碼 (再一次)" -#: account/forms.py:468 +#: account/forms.py:466 msgid "Please type your current password." msgstr "請輸入您目前的密碼" -#: account/forms.py:506 +#: account/forms.py:504 msgid "The e-mail address is not assigned to any user account" msgstr "還沒有其他帳號使用這個電子郵件地址" -#: account/forms.py:570 +#: account/forms.py:568 msgid "The password reset token was invalid." msgstr "" -#: account/models.py:23 +#: account/models.py:21 msgid "user" msgstr "使用者" -#: account/models.py:27 account/models.py:81 +#: account/models.py:25 account/models.py:78 #, fuzzy msgid "e-mail address" msgstr "電子郵件地址" -#: account/models.py:28 +#: account/models.py:26 msgid "verified" msgstr "已驗證" -#: account/models.py:29 +#: account/models.py:27 msgid "primary" msgstr "主要的" -#: account/models.py:34 +#: account/models.py:32 msgid "email address" msgstr "電子郵件地址" -#: account/models.py:35 +#: account/models.py:33 msgid "email addresses" msgstr "電子郵件地址" -#: account/models.py:83 +#: account/models.py:80 msgid "created" msgstr "以建立" -#: account/models.py:85 +#: account/models.py:82 msgid "sent" msgstr "已送出" -#: account/models.py:86 socialaccount/models.py:58 +#: account/models.py:83 socialaccount/models.py:55 msgid "key" msgstr "key" -#: account/models.py:91 +#: account/models.py:88 msgid "email confirmation" msgstr "電子郵件確認" -#: account/models.py:92 +#: account/models.py:89 msgid "email confirmations" msgstr "電子郵件確認" -#: socialaccount/adapter.py:27 +#: socialaccount/adapter.py:26 #, python-format msgid "" "An account already exists with this e-mail address. Please sign in to that " @@ -195,107 +195,107 @@ msgstr "" "已經有一個帳號與此電子郵件連結了，請先登入該帳號，然後連接你的 %s 帳號。" -#: socialaccount/adapter.py:132 +#: socialaccount/adapter.py:131 msgid "Your account has no password set up." msgstr "您的帳號沒有設置密碼。" -#: socialaccount/adapter.py:139 +#: socialaccount/adapter.py:138 msgid "Your account has no verified e-mail address." msgstr "您的帳號下沒有驗證過的電子郵件地址。" -#: socialaccount/apps.py:8 +#: socialaccount/apps.py:7 msgid "Social Accounts" msgstr "社群帳號" -#: socialaccount/models.py:46 socialaccount/models.py:80 +#: socialaccount/models.py:42 socialaccount/models.py:76 msgid "provider" msgstr "提供者" -#: socialaccount/models.py:49 +#: socialaccount/models.py:45 msgid "name" msgstr "名稱" -#: socialaccount/models.py:51 +#: socialaccount/models.py:47 msgid "client id" msgstr "client id" -#: socialaccount/models.py:53 +#: socialaccount/models.py:49 msgid "App ID, or consumer key" msgstr "App ID, or consumer key" -#: socialaccount/models.py:54 +#: socialaccount/models.py:50 msgid "secret key" msgstr "secret key" -#: socialaccount/models.py:56 +#: socialaccount/models.py:53 msgid "API secret, client secret, or consumer secret" msgstr "API secret, client secret, or consumer secret" -#: socialaccount/models.py:61 +#: socialaccount/models.py:58 msgid "Key" msgstr "Key" -#: socialaccount/models.py:69 +#: socialaccount/models.py:66 msgid "social application" msgstr "社群應用程式" -#: socialaccount/models.py:70 +#: socialaccount/models.py:67 msgid "social applications" msgstr "社群應用程式" -#: socialaccount/models.py:99 +#: socialaccount/models.py:95 msgid "uid" msgstr "uid" -#: socialaccount/models.py:101 +#: socialaccount/models.py:97 msgid "last login" msgstr "最後一次登入" -#: socialaccount/models.py:103 +#: socialaccount/models.py:99 msgid "date joined" msgstr "加入日期" -#: socialaccount/models.py:105 +#: socialaccount/models.py:101 msgid "extra data" msgstr "額外資料" -#: socialaccount/models.py:109 +#: socialaccount/models.py:105 msgid "social account" msgstr "社群帳號" -#: socialaccount/models.py:110 +#: socialaccount/models.py:106 msgid "social accounts" msgstr "社群帳號" +#: socialaccount/models.py:131 +msgid "token" +msgstr "" + +#: socialaccount/models.py:133 +msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" +msgstr "" + #: socialaccount/models.py:136 -msgid "token" +msgid "token secret" msgstr "" #: socialaccount/models.py:138 -msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)" -msgstr "" - -#: socialaccount/models.py:141 -msgid "token secret" -msgstr "" - -#: socialaccount/models.py:143 msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)" msgstr "" -#: socialaccount/models.py:145 +#: socialaccount/models.py:140 msgid "expires at" msgstr "過期日" -#: socialaccount/models.py:149 +#: socialaccount/models.py:144 msgid "social application token" msgstr "社群應用程式 Token" -#: socialaccount/models.py:150 +#: socialaccount/models.py:145 msgid "social application tokens" msgstr "社群應用程式 Token" -#: socialaccount/providers/douban/views.py:35 +#: socialaccount/providers/douban/views.py:36 msgid "Invalid profile data" msgstr "" diff --git a/allauth/socialaccount/adapter.py b/allauth/socialaccount/adapter.py index af7d6cb..f9887f5 100644 --- a/allauth/socialaccount/adapter.py +++ b/allauth/socialaccount/adapter.py @@ -2,8 +2,7 @@ from django.core.exceptions import ValidationError from django.urls import reverse - -from allauth.compat import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ from ..account import app_settings as account_settings from ..account.adapter import get_adapter as get_account_adapter @@ -191,6 +190,19 @@ def serialize_instance(self, instance): return serialize_instance(instance) + def get_app(self, request, provider): + # NOTE: Avoid loading models at top due to registry boot... + from allauth.socialaccount.models import SocialApp + + config = app_settings.PROVIDERS.get(provider, {}).get('APP') + if config: + app = SocialApp(provider=provider) + for field in ['client_id', 'secret', 'key']: + setattr(app, field, config.get(field)) + else: + app = SocialApp.objects.get_current(provider, request) + return app + def get_adapter(request=None): return import_attribute(app_settings.ADAPTER)(request) diff --git a/allauth/socialaccount/apps.py b/allauth/socialaccount/apps.py index 170046e..d9fbbb0 100644 --- a/allauth/socialaccount/apps.py +++ b/allauth/socialaccount/apps.py @@ -1,6 +1,5 @@ from django.apps import AppConfig - -from allauth.compat import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ class SocialAccountConfig(AppConfig): diff --git a/allauth/socialaccount/fields.py b/allauth/socialaccount/fields.py index 1b915a8..8578437 100644 --- a/allauth/socialaccount/fields.py +++ b/allauth/socialaccount/fields.py @@ -4,8 +4,6 @@ import django from django.core.exceptions import ValidationError from django.db import models - -from allauth.compat import six class JSONField(models.TextField): @@ -26,7 +24,7 @@ """ if self.blank and not value: return None - if isinstance(value, six.string_types): + if isinstance(value, str): try: return json.loads(value) except Exception as e: @@ -37,7 +35,7 @@ def validate(self, value, model_instance): """Check value is a valid JSON string, raise ValidationError on error.""" - if isinstance(value, six.string_types): + if isinstance(value, str): super(JSONField, self).validate(value, model_instance) try: json.loads(value) diff --git a/allauth/socialaccount/migrations/0002_token_max_lengths.py b/allauth/socialaccount/migrations/0002_token_max_lengths.py index 2376aae..47f359a 100644 --- a/allauth/socialaccount/migrations/0002_token_max_lengths.py +++ b/allauth/socialaccount/migrations/0002_token_max_lengths.py @@ -30,6 +30,6 @@ migrations.AlterField( model_name='socialapp', name='secret', - field=models.CharField(help_text='API secret, client secret, or consumer secret', max_length=191, verbose_name='secret key'), + field=models.CharField(help_text='API secret, client secret, or consumer secret', max_length=191, verbose_name='secret key', blank=True), ), ] diff --git a/allauth/socialaccount/models.py b/allauth/socialaccount/models.py index 9a3449d..528b30e 100644 --- a/allauth/socialaccount/models.py +++ b/allauth/socialaccount/models.py @@ -6,15 +6,12 @@ from django.core.exceptions import PermissionDenied from django.db import models from django.utils.crypto import get_random_string +from django.utils.encoding import force_str +from django.utils.translation import gettext_lazy as _ import allauth.app_settings from allauth.account.models import EmailAddress from allauth.account.utils import get_next_redirect_url, setup_user_email -from allauth.compat import ( - force_str, - python_2_unicode_compatible, - ugettext_lazy as _, -) from allauth.utils import get_user_model from ..utils import get_request_param @@ -39,7 +36,6 @@ return app -@python_2_unicode_compatible class SocialApp(models.Model): objects = SocialAppManager() @@ -53,6 +49,7 @@ help_text=_('App ID, or consumer key')) secret = models.CharField(verbose_name=_('secret key'), max_length=191, + blank=True, help_text=_('API secret, client secret, or' ' consumer secret')) key = models.CharField(verbose_name=_('key'), @@ -73,7 +70,6 @@ return self.name -@python_2_unicode_compatible class SocialAccount(models.Model): user = models.ForeignKey(allauth.app_settings.USER_MODEL, on_delete=models.CASCADE) @@ -128,7 +124,6 @@ return self.get_provider().wrap_account(self) -@python_2_unicode_compatible class SocialToken(models.Model): app = models.ForeignKey(SocialApp, on_delete=models.CASCADE) account = models.ForeignKey(SocialAccount, on_delete=models.CASCADE) @@ -235,7 +230,7 @@ user.save() self.account.user = user self.account.save() - if app_settings.STORE_TOKENS and self.token: + if app_settings.STORE_TOKENS and self.token and self.token.app.pk: self.token.account = self.account self.token.save() if connect: @@ -265,7 +260,7 @@ self.user = self.account.user a.save() # Update token - if app_settings.STORE_TOKENS and self.token: + if app_settings.STORE_TOKENS and self.token and self.token.app.pk: assert not self.token.pk try: t = SocialToken.objects.get(account=self.account, diff --git a/allauth/socialaccount/providers/amazon_cognito/__init__.py b/allauth/socialaccount/providers/amazon_cognito/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/allauth/socialaccount/providers/amazon_cognito/provider.py b/allauth/socialaccount/providers/amazon_cognito/provider.py new file mode 100644 index 0000000..888a41e --- /dev/null +++ b/allauth/socialaccount/providers/amazon_cognito/provider.py @@ -0,0 +1,87 @@ +from allauth.account.models import EmailAddress +from allauth.socialaccount.providers.amazon_cognito.utils import ( + convert_to_python_bool_if_value_is_json_string_bool, +) +from allauth.socialaccount.providers.base import ProviderAccount +from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider + + +class AmazonCognitoAccount(ProviderAccount): + def to_str(self): + dflt = super(AmazonCognitoAccount, self).to_str() + + return self.account.extra_data.get("username", dflt) + + def get_avatar_url(self): + return self.account.extra_data.get("picture") + + def get_profile_url(self): + return self.account.extra_data.get("profile") + + +class AmazonCognitoProvider(OAuth2Provider): + id = "amazon_cognito" + name = "Amazon Cognito" + account_class = AmazonCognitoAccount + + def extract_uid(self, data): + return str(data["sub"]) + + def extract_common_fields(self, data): + return { + "email": data.get("email"), + "first_name": data.get("given_name"), + "last_name": data.get("family_name"), + } + + def get_default_scope(self): + return ["openid", "profile", "email"] + + def extract_email_addresses(self, data): + email = data.get("email") + verified = convert_to_python_bool_if_value_is_json_string_bool( + data.get("email_verified", False) + ) + + return ( + [ + EmailAddress( + email=email, verified=verified, primary=True + ) + ] + if email + else [] + ) + + def extract_extra_data(self, data): + return { + "address": data.get("address"), + "birthdate": data.get("birthdate"), + "gender": data.get("gender"), + "locale": data.get("locale"), + "middlename": data.get("middlename"), + "nickname": data.get("nickname"), + "phone_number": data.get("phone_number"), + "phone_number_verified": + convert_to_python_bool_if_value_is_json_string_bool( + data.get("phone_number_verified") + ), + "picture": data.get("picture"), + "preferred_username": data.get("preferred_username"), + "profile": data.get("profile"), + "website": data.get("website"), + "zoneinfo": data.get("zoneinfo"), + } + + @classmethod + def get_slug(cls): + # IMPORTANT: Amazon Cognito does not support `_` characters + # as part of their redirect URI. + return ( + super(AmazonCognitoProvider, cls) + .get_slug() + .replace("_", "-") + ) + + +provider_classes = [AmazonCognitoProvider] diff --git a/allauth/socialaccount/providers/amazon_cognito/tests.py b/allauth/socialaccount/providers/amazon_cognito/tests.py new file mode 100644 index 0000000..ad46ae4 --- /dev/null +++ b/allauth/socialaccount/providers/amazon_cognito/tests.py @@ -0,0 +1,75 @@ +import json + +from django.test import override_settings + +from allauth.account.models import EmailAddress +from allauth.socialaccount.models import SocialAccount +from allauth.socialaccount.providers.amazon_cognito.provider import ( + AmazonCognitoProvider, +) +from allauth.socialaccount.providers.amazon_cognito.views import ( + AmazonCognitoOAuth2Adapter, +) +from allauth.socialaccount.tests import OAuth2TestsMixin +from allauth.tests import MockedResponse, TestCase + + +def _get_mocked_claims(): + return { + "sub": "4993b410-8a1b-4c36-b843-a9c1a697e6b7", + "given_name": "John", + "family_name": "Doe", + "email": "jdoe@example.com", + "username": "johndoe", + } + + +@override_settings( + SOCIALACCOUNT_PROVIDERS={ + "amazon_cognito": { + "DOMAIN": "https://domain.auth.us-east-1.amazoncognito.com" + } + } +) +class AmazonCognitoTestCase(OAuth2TestsMixin, TestCase): + provider_id = AmazonCognitoProvider.id + + def get_mocked_response(self): + mocked_payload = json.dumps(_get_mocked_claims()) + + return MockedResponse(status_code=200, content=mocked_payload) + + @override_settings(SOCIALACCOUNT_PROVIDERS={"amazon_cognito": {}}) + def test_oauth2_adapter_raises_if_domain_settings_is_missing( + self, + ): + mocked_response = self.get_mocked_response() + + with self.assertRaises( + ValueError, + msg=AmazonCognitoOAuth2Adapter.DOMAIN_KEY_MISSING_ERROR, + ): + self.login(mocked_response) + + def test_saves_email_as_verified_if_email_is_verified_in_cognito( + self, + ): + mocked_claims = _get_mocked_claims() + mocked_claims["email_verified"] = True + mocked_payload = json.dumps(mocked_claims) + mocked_response = MockedResponse( + status_code=200, content=mocked_payload + ) + + self.login(mocked_response) + + user_id = SocialAccount.objects.get( + uid=mocked_claims["sub"] + ).user_id + email_address = EmailAddress.objects.get(user_id=user_id) + + self.assertEqual(email_address.email, mocked_claims["email"]) + self.assertTrue(email_address.verified) + + def test_provider_slug_replaces_underscores_with_hyphens(self): + self.assertTrue("_" not in self.provider.get_slug()) diff --git a/allauth/socialaccount/providers/amazon_cognito/urls.py b/allauth/socialaccount/providers/amazon_cognito/urls.py new file mode 100644 index 0000000..288f1a3 --- /dev/null +++ b/allauth/socialaccount/providers/amazon_cognito/urls.py @@ -0,0 +1,7 @@ +from allauth.socialaccount.providers.amazon_cognito.provider import ( + AmazonCognitoProvider, +) +from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns + + +urlpatterns = default_urlpatterns(AmazonCognitoProvider) diff --git a/allauth/socialaccount/providers/amazon_cognito/utils.py b/allauth/socialaccount/providers/amazon_cognito/utils.py new file mode 100644 index 0000000..87f15bb --- /dev/null +++ b/allauth/socialaccount/providers/amazon_cognito/utils.py @@ -0,0 +1,7 @@ +def convert_to_python_bool_if_value_is_json_string_bool(s): + if s == "true": + return True + elif s == "false": + return False + + return s diff --git a/allauth/socialaccount/providers/amazon_cognito/views.py b/allauth/socialaccount/providers/amazon_cognito/views.py new file mode 100644 index 0000000..f777be1 --- /dev/null +++ b/allauth/socialaccount/providers/amazon_cognito/views.py @@ -0,0 +1,63 @@ +import requests + +from allauth.socialaccount import app_settings +from allauth.socialaccount.providers.amazon_cognito.provider import ( + AmazonCognitoProvider, +) +from allauth.socialaccount.providers.oauth2.views import ( + OAuth2Adapter, + OAuth2CallbackView, + OAuth2LoginView, +) + + +class AmazonCognitoOAuth2Adapter(OAuth2Adapter): + provider_id = AmazonCognitoProvider.id + + DOMAIN_KEY_MISSING_ERROR = ( + '"DOMAIN" key is missing in Amazon Cognito configuration.' + ) + + @property + def settings(self): + return app_settings.PROVIDERS.get(self.provider_id, {}) + + @property + def domain(self): + domain = self.settings.get("DOMAIN") + + if domain is None: + raise ValueError(self.DOMAIN_KEY_MISSING_ERROR) + + return domain + + @property + def access_token_url(self): + return "{}/oauth2/token".format(self.domain) + + @property + def authorize_url(self): + return "{}/oauth2/authorize".format(self.domain) + + @property + def profile_url(self): + return "{}/oauth2/userInfo".format(self.domain) + + def complete_login(self, request, app, access_token, **kwargs): + headers = { + "Authorization": "Bearer {}".format(access_token), + } + extra_data = requests.get(self.profile_url, headers=headers) + extra_data.raise_for_status() + + return self.get_provider().sociallogin_from_response( + request, extra_data.json() + ) + + +oauth2_login = OAuth2LoginView.adapter_view( + AmazonCognitoOAuth2Adapter +) +oauth2_callback = OAuth2CallbackView.adapter_view( + AmazonCognitoOAuth2Adapter +) diff --git a/allauth/socialaccount/providers/authentiq/views.py b/allauth/socialaccount/providers/authentiq/views.py index 6f9e558..92ed51c 100644 --- a/allauth/socialaccount/providers/authentiq/views.py +++ b/allauth/socialaccount/providers/authentiq/views.py @@ -1,6 +1,6 @@ import requests +from urllib.parse import urljoin -from allauth.compat import urljoin from allauth.socialaccount import app_settings from allauth.socialaccount.providers.oauth2.views import ( OAuth2Adapter, diff --git a/allauth/socialaccount/providers/base.py b/allauth/socialaccount/providers/base.py index bac952f..6db9b83 100644 --- a/allauth/socialaccount/providers/base.py +++ b/allauth/socialaccount/providers/base.py @@ -1,5 +1,4 @@ from allauth.account.models import EmailAddress -from allauth.compat import python_2_unicode_compatible from allauth.socialaccount import app_settings from ..adapter import get_adapter @@ -46,10 +45,8 @@ raise NotImplementedError("get_login_url() for " + self.name) def get_app(self, request): - # NOTE: Avoid loading models at top due to registry boot... - from allauth.socialaccount.models import SocialApp - - return SocialApp.objects.get_current(self.id, request) + adapter = get_adapter(request) + return adapter.get_app(request, self.id) def media_js(self, request): """ @@ -162,7 +159,6 @@ return pkg -@python_2_unicode_compatible class ProviderAccount(object): def __init__(self, social_account): self.account = social_account @@ -192,16 +188,14 @@ def to_str(self): """ - Due to the way python_2_unicode_compatible works, this does not work: - - @python_2_unicode_compatible + This did not use to work in the past due to py2 compatibility: + class GoogleAccount(ProviderAccount): def __str__(self): dflt = super(GoogleAccount, self).__str__() return self.account.extra_data.get('name', dflt) - It will result in and infinite recursion loop. That's why we - add a method `to_str` that can be overriden in a conventional - fashion, without having to worry about @python_2_unicode_compatible + So we have this method `to_str` that can be overriden in a conventional + fashion, without having to worry about it. """ return self.get_brand()['name'] diff --git a/allauth/socialaccount/providers/bitbucket_oauth2/tests.py b/allauth/socialaccount/providers/bitbucket_oauth2/tests.py index 4324278..168a2b9 100644 --- a/allauth/socialaccount/providers/bitbucket_oauth2/tests.py +++ b/allauth/socialaccount/providers/bitbucket_oauth2/tests.py @@ -1,5 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals + +from unittest import mock from django.test.utils import override_settings @@ -9,12 +11,6 @@ from allauth.tests import MockedResponse, patch from .provider import BitbucketOAuth2Provider - - -try: - from unittest import mock -except ImportError: - import mock @override_settings(SOCIALACCOUNT_QUERY_EMAIL=True) diff --git a/allauth/socialaccount/providers/douban/views.py b/allauth/socialaccount/providers/douban/views.py index 98d0806..8bba1f4 100755 --- a/allauth/socialaccount/providers/douban/views.py +++ b/allauth/socialaccount/providers/douban/views.py @@ -1,6 +1,7 @@ import requests -from allauth.compat import ugettext_lazy as _ +from django.utils.translation import gettext_lazy as _ + from allauth.socialaccount.providers.oauth2.views import ( OAuth2Adapter, OAuth2CallbackView, diff --git a/allauth/socialaccount/providers/draugiem/urls.py b/allauth/socialaccount/providers/draugiem/urls.py index bccd4a1..9e0fd57 100644 --- a/allauth/socialaccount/providers/draugiem/urls.py +++ b/allauth/socialaccount/providers/draugiem/urls.py @@ -1,9 +1,9 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url('^draugiem/login/$', views.login, name="draugiem_login"), - url('^draugiem/callback/$', views.callback, name='draugiem_callback'), + path('draugiem/login/', views.login, name="draugiem_login"), + path('draugiem/callback/', views.callback, name='draugiem_callback'), ] diff --git a/allauth/socialaccount/providers/dropbox/tests.py b/allauth/socialaccount/providers/dropbox/tests.py index 204494f..596bd68 100644 --- a/allauth/socialaccount/providers/dropbox/tests.py +++ b/allauth/socialaccount/providers/dropbox/tests.py @@ -34,4 +34,4 @@ "-DfAs?size=128x128"), "referral_link": "https://db.tt/ASDfAsDf" } - return [MockedResponse(200, json.dumps(payload))] + return MockedResponse(200, json.dumps(payload)) diff --git a/allauth/socialaccount/providers/dropbox/views.py b/allauth/socialaccount/providers/dropbox/views.py index bfe64b3..aa757dc 100644 --- a/allauth/socialaccount/providers/dropbox/views.py +++ b/allauth/socialaccount/providers/dropbox/views.py @@ -17,17 +17,13 @@ redirect_uri_protocol = 'https' def complete_login(self, request, app, token, **kwargs): - extra_data = requests.post(self.profile_url, headers={ + response = requests.post(self.profile_url, headers={ 'Authorization': 'Bearer %s' % (token.token, ) }) - - # This only here because of weird response from the test suite - if isinstance(extra_data, list): - extra_data = extra_data[0] - + response.raise_for_status() return self.get_provider().sociallogin_from_response( request, - extra_data.json() + response.json() ) diff --git a/allauth/socialaccount/providers/exist/__init__.py b/allauth/socialaccount/providers/exist/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/allauth/socialaccount/providers/exist/provider.py b/allauth/socialaccount/providers/exist/provider.py new file mode 100644 index 0000000..2b43532 --- /dev/null +++ b/allauth/socialaccount/providers/exist/provider.py @@ -0,0 +1,39 @@ +from allauth.socialaccount.providers.base import ProviderAccount +from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider + + +class ExistAccount(ProviderAccount): + def get_profile_url(self): + username = self.account.extra_data.get("username") + return 'https://exist.io/api/1/users/{}/profile/'.format(username) + + def get_avatar_url(self): + return self.account.extra_data.get('avatar') + + def to_str(self): + name = super(ExistAccount, self).to_str() + return self.account.extra_data.get('name', name) + + +class ExistProvider(OAuth2Provider): + id = 'exist' + name = 'Exist.io' + account_class = ExistAccount + + def extract_uid(self, data): + return data.get('id') + + def extract_common_fields(self, data): + extra_common = super(ExistProvider, self).extract_common_fields(data) + extra_common.update( + username=data.get('username'), + first_name=data.get('first_name'), + last_name=data.get('last_name'), + ) + return extra_common + + def get_default_scope(self): + return ['read'] + + +provider_classes = [ExistProvider] diff --git a/allauth/socialaccount/providers/exist/tests.py b/allauth/socialaccount/providers/exist/tests.py new file mode 100644 index 0000000..7e5f66e --- /dev/null +++ b/allauth/socialaccount/providers/exist/tests.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +from allauth.socialaccount.providers.exist.provider import ExistProvider +from allauth.socialaccount.tests import OAuth2TestsMixin +from allauth.tests import MockedResponse, TestCase + + +class ExistTests(OAuth2TestsMixin, TestCase): + provider_id = ExistProvider.id + + def get_mocked_response(self): + return MockedResponse(200, """ + { + "id": 1, + "username": "josh", + "first_name": "Josh", + "last_name": "Sharp", + "bio": "I made this thing you're using.", + "url": "http://hellocode.co/", + "avatar": "https://exist.io/static/media/avatars/josh_2.png", + "timezone": "Australia/Melbourne", + "local_time": "2020-07-31T22:33:49.359+10:00", + "private": false, + "imperial_units": false, + "imperial_distance": false, + "imperial_weight": false, + "imperial_energy": false, + "imperial_liquid": false, + "imperial_temperature": false, + "attributes": [] + } + """) diff --git a/allauth/socialaccount/providers/exist/urls.py b/allauth/socialaccount/providers/exist/urls.py new file mode 100644 index 0000000..fbe832a --- /dev/null +++ b/allauth/socialaccount/providers/exist/urls.py @@ -0,0 +1,6 @@ +from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns + +from .provider import ExistProvider + + +urlpatterns = default_urlpatterns(ExistProvider) diff --git a/allauth/socialaccount/providers/exist/views.py b/allauth/socialaccount/providers/exist/views.py new file mode 100644 index 0000000..56955e4 --- /dev/null +++ b/allauth/socialaccount/providers/exist/views.py @@ -0,0 +1,28 @@ +import requests + +from allauth.socialaccount.providers.oauth2.views import ( + OAuth2Adapter, + OAuth2CallbackView, + OAuth2LoginView, +) + +from .provider import ExistProvider + + +class ExistOAuth2Adapter(OAuth2Adapter): + provider_id = ExistProvider.id + access_token_url = 'https://exist.io/oauth2/access_token' + authorize_url = 'https://exist.io/oauth2/authorize' + profile_url = 'https://exist.io/api/1/users/$self/profile/' + + def complete_login(self, request, app, token, **kwargs): + headers = {'Authorization': 'Bearer {0}'.format(token.token)} + resp = requests.get(self.profile_url, headers=headers) + extra_data = resp.json() + return self.get_provider().sociallogin_from_response( + request, extra_data + ) + + +oauth2_login = OAuth2LoginView.adapter_view(ExistOAuth2Adapter) +oauth2_callback = OAuth2CallbackView.adapter_view(ExistOAuth2Adapter) diff --git a/allauth/socialaccount/providers/facebook/locale.py b/allauth/socialaccount/providers/facebook/locale.py index 374ab65..95c7d39 100644 --- a/allauth/socialaccount/providers/facebook/locale.py +++ b/allauth/socialaccount/providers/facebook/locale.py @@ -48,7 +48,7 @@ def default_locale(request): """ - Guess an appropiate FB locale based on the active Django locale. + Guess an appropriate FB locale based on the active Django locale. If the active locale is available, it is returned. Otherwise, it tries to return another locale with the same language. If there isn't one avaible, 'en_US' is returned. diff --git a/allauth/socialaccount/providers/facebook/urls.py b/allauth/socialaccount/providers/facebook/urls.py index 3238e09..6d5d14c 100644 --- a/allauth/socialaccount/providers/facebook/urls.py +++ b/allauth/socialaccount/providers/facebook/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url +from django.urls import path from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns @@ -9,7 +9,6 @@ urlpatterns = default_urlpatterns(FacebookProvider) urlpatterns += [ - url(r'^facebook/login/token/$', - views.login_by_token, - name="facebook_login_by_token"), + path('facebook/login/token/', views.login_by_token, + name="facebook_login_by_token"), ] diff --git a/allauth/socialaccount/providers/github/views.py b/allauth/socialaccount/providers/github/views.py index 8ea1e28..06cba31 100644 --- a/allauth/socialaccount/providers/github/views.py +++ b/allauth/socialaccount/providers/github/views.py @@ -28,6 +28,7 @@ def complete_login(self, request, app, token, **kwargs): params = {'access_token': token.token} resp = requests.get(self.profile_url, params=params) + resp.raise_for_status() extra_data = resp.json() if app_settings.QUERY_EMAIL and not extra_data.get('email'): extra_data['email'] = self.get_email(token) @@ -39,6 +40,7 @@ email = None params = {'access_token': token.token} resp = requests.get(self.emails_url, params=params) + resp.raise_for_status() emails = resp.json() if resp.status_code == 200 and emails: email = emails[0] diff --git a/allauth/socialaccount/providers/google/tests.py b/allauth/socialaccount/providers/google/tests.py index 86c2c1c..76a196d 100644 --- a/allauth/socialaccount/providers/google/tests.py +++ b/allauth/socialaccount/providers/google/tests.py @@ -208,3 +208,21 @@ self.assertEqual(len(mail.outbox), 1) self.login(self.get_mocked_response(verified_email=False)) self.assertEqual(len(mail.outbox), 1) + + +@override_settings( + SOCIALACCOUNT_PROVIDERS={ + 'google': { + 'APP': { + 'client_id': 'app123id', + 'key': 'google', + 'secret': 'dummy' + } + } + } +) +class AppInSettingsTests(GoogleTests): + """ + Run the same set of tests but without having a SocialApp entry. + """ + pass diff --git a/allauth/socialaccount/providers/instagram/views.py b/allauth/socialaccount/providers/instagram/views.py index 885bf15..a4bf307 100644 --- a/allauth/socialaccount/providers/instagram/views.py +++ b/allauth/socialaccount/providers/instagram/views.py @@ -18,6 +18,7 @@ def complete_login(self, request, app, token, **kwargs): resp = requests.get(self.profile_url, params={'access_token': token.token}) + resp.raise_for_status() extra_data = resp.json() return self.get_provider().sociallogin_from_response(request, extra_data) diff --git a/allauth/socialaccount/providers/kakao/provider.py b/allauth/socialaccount/providers/kakao/provider.py index d8d0c52..e53315b 100644 --- a/allauth/socialaccount/providers/kakao/provider.py +++ b/allauth/socialaccount/providers/kakao/provider.py @@ -26,7 +26,7 @@ def extract_common_fields(self, data): email = data['kakao_account'].get('email') - nickname = data['properties'].get('nickname') + nickname = data.get('properties', {}).get('nickname') return dict(email=email, username=nickname) diff --git a/allauth/socialaccount/providers/linkedin/views.py b/allauth/socialaccount/providers/linkedin/views.py index 27174e6..078821f 100644 --- a/allauth/socialaccount/providers/linkedin/views.py +++ b/allauth/socialaccount/providers/linkedin/views.py @@ -1,7 +1,6 @@ from xml.etree import ElementTree from xml.parsers.expat import ExpatError -from allauth.compat import six from allauth.socialaccount import providers from allauth.socialaccount.providers.oauth.client import OAuth from allauth.socialaccount.providers.oauth.views import ( @@ -22,8 +21,6 @@ .get_profile_fields() url = self.url + ':(%s)' % ','.join(fields) raw_xml = self.query(url) - if not six.PY3: - raw_xml = raw_xml.encode('utf8') try: return self.to_dict(ElementTree.fromstring(raw_xml)) except (ExpatError, KeyError, IndexError): diff --git a/allauth/socialaccount/providers/linkedin_oauth2/provider.py b/allauth/socialaccount/providers/linkedin_oauth2/provider.py index 7f89a7b..05a566d 100644 --- a/allauth/socialaccount/providers/linkedin_oauth2/provider.py +++ b/allauth/socialaccount/providers/linkedin_oauth2/provider.py @@ -1,4 +1,3 @@ -from allauth.compat import six from allauth.socialaccount import app_settings from allauth.socialaccount.providers.base import ( ProviderAccount, @@ -11,7 +10,7 @@ ret = '' v = data.get(field_name, {}) if v: - if isinstance(v, six.string_types): + if isinstance(v, str): # Old V1 data ret = v else: @@ -48,6 +47,55 @@ if first_name or last_name: ret = ' '.join([first_name, last_name]).strip() return ret + + def get_avatar_url(self): + """ + Attempts the load the avatar associated to the avatar. + + Requires the `profilePicture(displayImage~:playableStreams)` + profile field configured in settings.py + + :return: + """ + provider_configuration = self.account.get_provider().get_settings() + configured_profile_fields = \ + provider_configuration.get('PROFILE_FIELDS', []) + # Can't get the avatar when this field is not specified + picture_field = 'profilePicture(displayImage~:playableStreams)' + if picture_field not in configured_profile_fields: + return super(LinkedInOAuth2Account, self).get_avatar_url() + # Iterate over the fields and attempt to get it by configured size + profile_picture_config = \ + provider_configuration.get('PROFILEPICTURE', {}) + req_size = \ + profile_picture_config.get('display_size_w_h', (100.0, 100.0)) + req_auth_method = \ + profile_picture_config.get('authorization_method', 'PUBLIC') + # Iterate over the data returned by the provider + profile_elements = self.account.extra_data\ + .get('profilePicture', {})\ + .get('displayImage~', {})\ + .get('elements', []) + for single_element in profile_elements: + if not req_auth_method == single_element['authorizationMethod']: + continue + # Get the dimensions from the payload + image_data = single_element.get('data', {})\ + .get('com.linkedin.digitalmedia.mediaartifact.StillImage', {})\ + .get('displaySize', {}) + if not image_data: + continue + width, height = image_data['width'], image_data['height'] + if not width or not height: + continue + if not width == req_size[0] or not height == req_size[1]: + continue + # Get the uri since actual size matches the requested size. + to_return = single_element.get('identifiers', [{}, ])[0]\ + .get('identifier') + if to_return: + return to_return + return super(LinkedInOAuth2Account, self).get_avatar_url() class LinkedInOAuth2Provider(OAuth2Provider): diff --git a/allauth/socialaccount/providers/linkedin_oauth2/tests.py b/allauth/socialaccount/providers/linkedin_oauth2/tests.py index 634bfb8..6b2836b 100644 --- a/allauth/socialaccount/providers/linkedin_oauth2/tests.py +++ b/allauth/socialaccount/providers/linkedin_oauth2/tests.py @@ -1,4 +1,11 @@ +# -*- coding: utf-8 -*- +from json import loads + +from django.test.client import RequestFactory +from django.test.utils import override_settings + from allauth.socialaccount.models import SocialAccount +from allauth.socialaccount.providers.base import ProviderException from allauth.socialaccount.tests import OAuth2TestsMixin from allauth.tests import MockedResponse, TestCase @@ -48,3 +55,481 @@ 'publicProfileUrl': 'https://www.linkedin.com/in/johndoe'} acc = SocialAccount(extra_data=data, provider='linkedin_oauth2') self.assertEqual(acc.get_provider_account().to_str(), 'John Doe') + + def test_get_avatar_url_no_picture_setting(self): + extra_data = ''' +{ + "profilePicture": { + "displayImage": "urn:li:digitalmediaAsset:12345abcdefgh-12abcd" + }, + "id": "1234567", + "lastName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Penners" + } + }, + "firstName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Raymond" + } + } +} +''' + acc = SocialAccount( + extra_data=loads(extra_data), + provider='linkedin_oauth2', + ) + self.assertIsNone(acc.get_avatar_url()) + + @override_settings( + SOCIALACCOUNT_PROVIDERS={ + 'linkedin_oauth2': { + 'PROFILE_FIELDS': [ + 'id', + 'firstName', + 'lastName', + 'profilePicture(displayImage~:playableStreams)', + ], + 'PROFILEPICTURE': { + 'display_size_w_h': (400, 400.0), + }, + }, + }) + def test_get_avatar_url_with_setting(self): + extra_data = ''' +{ + "profilePicture": { + "displayImage": "urn:li:digitalmediaAsset:12345abcdefgh-12abcd" + }, + "id": "1234567", + "lastName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Penners" + } + }, + "firstName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Raymond" + } + } +} +''' + acc = SocialAccount( + extra_data=loads(extra_data), + provider='linkedin_oauth2', + ) + self.assertIsNone(acc.get_avatar_url()) + + @override_settings( + SOCIALACCOUNT_PROVIDERS={ + 'linkedin_oauth2': { + 'PROFILE_FIELDS': [ + 'id', + 'firstName', + 'lastName', + 'profilePicture(displayImage~:playableStreams)', + ], + 'PROFILEPICTURE': { + 'display_size_w_h': (100, 100.0), + }, + }, + }) + def test_get_avatar_url_with_picture(self): + extra_data = ''' +{ + "profilePicture": { + "displayImage": "urn:li:digitalmediaAsset:12345abcdefgh-12abcd" + }, + "id": "1234567", + "lastName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Penners" + } + }, + "firstName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Raymond" + } + }, + "profilePicture": { + "displayImage~": { + "elements": [ + { + "authorizationMethod": "PUBLIC", + "data": { + "com.linkedin.digitalmedia.mediaartifact.StillImage": { + "storageSize": { + "height": 100, + "width": 100 + }, + "storageAspectRatio": { + "heightAspect": 1.0, + "formatted": "1.00:1.00", + "widthAspect": 1.0 + }, + "displaySize": { + "height": 100.0, + "width": 100.0, + "uom": "PX" + }, + "rawCodecSpec": { + "name": "jpeg", + "type": "image" + }, + "displayAspectRatio": { + "heightAspect": 1.0, + "formatted": "1.00:1.00", + "widthAspect": 1.0 + }, + "mediaType": "image/jpeg" + } + }, + "artifact": "urn:li:digitalmediaMediaArtifact:avatar", + "identifiers": [ + { + "identifierExpiresInSeconds": 4, + "file": "urn:li:digitalmediaFile:this-is-the-link", + "index": 0, + "identifier": "this-is-the-link", + "mediaType": "image/jpeg", + "identifierType": "EXTERNAL_URL" + } + ] + } + ] + } + } +} +''' + acc = SocialAccount( + extra_data=loads(extra_data), + provider='linkedin_oauth2', + ) + self.assertEqual('this-is-the-link', acc.get_avatar_url()) + + @override_settings( + SOCIALACCOUNT_PROVIDERS={ + 'linkedin_oauth2': { + 'PROFILE_FIELDS': [ + 'id', + 'firstName', + 'lastName', + 'profilePicture(displayImage~:playableStreams)', + ], + 'PROFILEPICTURE': { + 'display_size_w_h': (400, 400.0), + }, + }, + }) + def test_get_avatar_url_size_mismatch(self): + extra_data = ''' +{ + "profilePicture": { + "displayImage": "urn:li:digitalmediaAsset:12345abcdefgh-12abcd" + }, + "id": "1234567", + "lastName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Penners" + } + }, + "firstName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Raymond" + } + }, + "profilePicture": { + "displayImage~": { + "elements": [ + { + "authorizationMethod": "PUBLIC", + "data": { + "com.linkedin.digitalmedia.mediaartifact.StillImage": { + "storageSize": { + "height": 100, + "width": 100 + }, + "storageAspectRatio": { + "heightAspect": 1.0, + "formatted": "1.00:1.00", + "widthAspect": 1.0 + }, + "displaySize": { + "height": 100.0, + "width": 100.0, + "uom": "PX" + }, + "rawCodecSpec": { + "name": "jpeg", + "type": "image" + }, + "displayAspectRatio": { + "heightAspect": 1.0, + "formatted": "1.00:1.00", + "widthAspect": 1.0 + }, + "mediaType": "image/jpeg" + } + }, + "artifact": "urn:li:digitalmediaMediaArtifact:avatar", + "identifiers": [ + { + "identifierExpiresInSeconds": 4, + "file": "urn:li:digitalmediaFile:this-is-the-link", + "index": 0, + "identifier": "this-is-the-link", + "mediaType": "image/jpeg", + "identifierType": "EXTERNAL_URL" + } + ] + } + ] + } + } +} +''' + acc = SocialAccount( + extra_data=loads(extra_data), + provider='linkedin_oauth2', + ) + self.assertIsNone(acc.get_avatar_url()) + + @override_settings( + SOCIALACCOUNT_PROVIDERS={ + 'linkedin_oauth2': { + 'PROFILE_FIELDS': [ + 'id', + 'firstName', + 'lastName', + 'profilePicture(displayImage~:playableStreams)', + ], + 'PROFILEPICTURE': { + 'display_size_w_h': (400, 400.0), + }, + }, + }) + def test_get_avatar_url_auth_mismatch(self): + extra_data = ''' +{ + "profilePicture": { + "displayImage": "urn:li:digitalmediaAsset:12345abcdefgh-12abcd" + }, + "id": "1234567", + "lastName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Penners" + } + }, + "firstName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Raymond" + } + }, + "profilePicture": { + "displayImage~": { + "elements": [ + { + "authorizationMethod": "PRIVATE", + "data": { + "com.linkedin.digitalmedia.mediaartifact.StillImage": { + "storageSize": { + "height": 100, + "width": 100 + }, + "storageAspectRatio": { + "heightAspect": 1.0, + "formatted": "1.00:1.00", + "widthAspect": 1.0 + }, + "displaySize": { + "height": 100.0, + "width": 100.0, + "uom": "PX" + }, + "rawCodecSpec": { + "name": "jpeg", + "type": "image" + }, + "displayAspectRatio": { + "heightAspect": 1.0, + "formatted": "1.00:1.00", + "widthAspect": 1.0 + }, + "mediaType": "image/jpeg" + } + }, + "artifact": "urn:li:digitalmediaMediaArtifact:avatar", + "identifiers": [ + { + "identifierExpiresInSeconds": 4, + "file": "urn:li:digitalmediaFile:this-is-the-link", + "index": 0, + "identifier": "this-is-the-link", + "mediaType": "image/jpeg", + "identifierType": "EXTERNAL_URL" + } + ] + } + ] + } + } +} +''' + acc = SocialAccount( + extra_data=loads(extra_data), + provider='linkedin_oauth2', + ) + self.assertIsNone(acc.get_avatar_url()) + + @override_settings( + SOCIALACCOUNT_PROVIDERS={ + 'linkedin_oauth2': { + 'PROFILE_FIELDS': [ + 'id', + 'firstName', + 'lastName', + 'profilePicture(displayImage~:playableStreams)', + ], + 'PROFILEPICTURE': { + 'display_size_w_h': (100, 100), + }, + }, + }) + def test_get_avatar_url_float_vs_int(self): + extra_data = ''' +{ + "profilePicture": { + "displayImage": "urn:li:digitalmediaAsset:12345abcdefgh-12abcd" + }, + "id": "1234567", + "lastName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Penners" + } + }, + "firstName": { + "preferredLocale": { + "language": "en", + "country": "US" + }, + "localized": { + "en_US": "Raymond" + } + }, + "profilePicture": { + "displayImage~": { + "elements": [ + { + "authorizationMethod": "PUBLIC", + "data": { + "com.linkedin.digitalmedia.mediaartifact.StillImage": { + "storageSize": { + "height": 100, + "width": 100 + }, + "storageAspectRatio": { + "heightAspect": 1.0, + "formatted": "1.00:1.00", + "widthAspect": 1.0 + }, + "displaySize": { + "height": 100.0, + "width": 100.0, + "uom": "PX" + }, + "rawCodecSpec": { + "name": "jpeg", + "type": "image" + }, + "displayAspectRatio": { + "heightAspect": 1.0, + "formatted": "1.00:1.00", + "widthAspect": 1.0 + }, + "mediaType": "image/jpeg" + } + }, + "artifact": "urn:li:digitalmediaMediaArtifact:avatar", + "identifiers": [ + { + "identifierExpiresInSeconds": 4, + "file": "urn:li:digitalmediaFile:this-is-the-link", + "index": 0, + "identifier": "this-is-the-link", + "mediaType": "image/jpeg", + "identifierType": "EXTERNAL_URL" + } + ] + } + ] + } + } +} +''' + acc = SocialAccount( + extra_data=loads(extra_data), + provider='linkedin_oauth2', + ) + self.assertEqual('this-is-the-link', acc.get_avatar_url()) + + def test_id_missing(self): + extra_data = ''' +{ + "profilePicture": { + "displayImage": "urn:li:digitalmediaAsset:12345abcdefgh-12abcd" + }, + "Id": "1234567" +} +''' + provider = LinkedInOAuth2Provider( + RequestFactory().get('/login') + ) + self.assertRaises( + ProviderException, + provider.extract_uid, + loads(extra_data) + ) diff --git a/allauth/socialaccount/providers/oauth/client.py b/allauth/socialaccount/providers/oauth/client.py index 1c983db..c784106 100644 --- a/allauth/socialaccount/providers/oauth/client.py +++ b/allauth/socialaccount/providers/oauth/client.py @@ -6,6 +6,7 @@ """ import requests +from urllib.parse import parse_qsl, urlparse from django.http import HttpResponseRedirect from django.utils.http import urlencode @@ -13,7 +14,6 @@ from requests_oauthlib import OAuth1 -from allauth.compat import parse_qsl, urlparse from allauth.utils import build_absolute_uri, get_request_param diff --git a/allauth/socialaccount/providers/oauth/provider.py b/allauth/socialaccount/providers/oauth/provider.py index b0c4b50..4da2ef5 100644 --- a/allauth/socialaccount/providers/oauth/provider.py +++ b/allauth/socialaccount/providers/oauth/provider.py @@ -1,7 +1,8 @@ +from urllib.parse import parse_qsl + from django.urls import reverse from django.utils.http import urlencode -from allauth.compat import parse_qsl from allauth.socialaccount.providers.base import Provider diff --git a/allauth/socialaccount/providers/oauth/urls.py b/allauth/socialaccount/providers/oauth/urls.py index 8a69ec2..446c730 100644 --- a/allauth/socialaccount/providers/oauth/urls.py +++ b/allauth/socialaccount/providers/oauth/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.urls import include, path from allauth.utils import import_attribute @@ -10,10 +10,8 @@ provider.get_package() + '.views.oauth_callback') urlpatterns = [ - url('^login/$', - login_view, name=provider.id + "_login"), - url('^login/callback/$', callback_view, - name=provider.id + "_callback"), + path('login/', login_view, name=provider.id + "_login"), + path('login/callback/', callback_view, name=provider.id + "_callback"), ] - return [url('^' + provider.get_slug() + '/', include(urlpatterns))] + return [path(provider.get_slug() + '/', include(urlpatterns))] diff --git a/allauth/socialaccount/providers/oauth2/client.py b/allauth/socialaccount/providers/oauth2/client.py index ad7faf7..c9a9965 100644 --- a/allauth/socialaccount/providers/oauth2/client.py +++ b/allauth/socialaccount/providers/oauth2/client.py @@ -1,8 +1,7 @@ import requests +from urllib.parse import parse_qsl from django.utils.http import urlencode - -from allauth.compat import parse_qsl class OAuth2Error(Exception): diff --git a/allauth/socialaccount/providers/oauth2/provider.py b/allauth/socialaccount/providers/oauth2/provider.py index 0ed1ce3..9fa03d8 100644 --- a/allauth/socialaccount/providers/oauth2/provider.py +++ b/allauth/socialaccount/providers/oauth2/provider.py @@ -1,7 +1,8 @@ +from urllib.parse import parse_qsl + from django.urls import reverse from django.utils.http import urlencode -from allauth.compat import parse_qsl from allauth.socialaccount.providers.base import Provider diff --git a/allauth/socialaccount/providers/oauth2/urls.py b/allauth/socialaccount/providers/oauth2/urls.py index 31287f6..a99e376 100644 --- a/allauth/socialaccount/providers/oauth2/urls.py +++ b/allauth/socialaccount/providers/oauth2/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import include, url +from django.urls import include, path from allauth.utils import import_attribute @@ -10,10 +10,8 @@ provider.get_package() + '.views.oauth2_callback') urlpatterns = [ - url(r'^login/$', - login_view, name=provider.id + "_login"), - url(r'^login/callback/$', - callback_view, name=provider.id + "_callback"), + path('login/', login_view, name=provider.id + "_login"), + path('login/callback/', callback_view, name=provider.id + "_callback"), ] - return [url('^' + provider.get_slug() + '/', include(urlpatterns))] + return [path(provider.get_slug() + '/', include(urlpatterns))] diff --git a/allauth/socialaccount/providers/openid/models.py b/allauth/socialaccount/providers/openid/models.py index 84b6287..7e8aaed 100644 --- a/allauth/socialaccount/providers/openid/models.py +++ b/allauth/socialaccount/providers/openid/models.py @@ -1,9 +1,6 @@ from django.db import models -from allauth.compat import python_2_unicode_compatible - -@python_2_unicode_compatible class OpenIDStore(models.Model): server_url = models.CharField(max_length=255) handle = models.CharField(max_length=255) @@ -16,7 +13,6 @@ return self.server_url -@python_2_unicode_compatible class OpenIDNonce(models.Model): server_url = models.CharField(max_length=255) timestamp = models.IntegerField() diff --git a/allauth/socialaccount/providers/openid/provider.py b/allauth/socialaccount/providers/openid/provider.py index fafeb5d..fb4acb2 100644 --- a/allauth/socialaccount/providers/openid/provider.py +++ b/allauth/socialaccount/providers/openid/provider.py @@ -1,7 +1,8 @@ +from urllib.parse import urlparse + from django.urls import reverse from django.utils.http import urlencode -from allauth.compat import urlparse from allauth.socialaccount.providers.base import Provider, ProviderAccount from .utils import ( @@ -59,7 +60,8 @@ def get_server_settings(self, endpoint): servers = self.get_settings().get('SERVERS', []) for server in servers: - if endpoint == server.get('openid_url'): + if endpoint is not None \ + and endpoint.startswith(server.get('openid_url')): return server return {} diff --git a/allauth/socialaccount/providers/openid/urls.py b/allauth/socialaccount/providers/openid/urls.py index 6c10f4e..8019a8e 100644 --- a/allauth/socialaccount/providers/openid/urls.py +++ b/allauth/socialaccount/providers/openid/urls.py @@ -1,9 +1,9 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url('^openid/login/$', views.login, name="openid_login"), - url('^openid/callback/$', views.callback, name='openid_callback'), + path('openid/login/', views.login, name="openid_login"), + path('openid/callback/', views.callback, name='openid_callback'), ] diff --git a/allauth/socialaccount/providers/openid/utils.py b/allauth/socialaccount/providers/openid/utils.py index bf8fb8a..8acefbb 100644 --- a/allauth/socialaccount/providers/openid/utils.py +++ b/allauth/socialaccount/providers/openid/utils.py @@ -1,12 +1,12 @@ import base64 import pickle +from collections import UserDict from openid.association import Association as OIDAssociation from openid.extensions.ax import FetchResponse from openid.extensions.sreg import SRegResponse from openid.store.interface import OpenIDStore as OIDStore -from allauth.compat import UserDict from allauth.utils import valid_email_or_none from .models import OpenIDNonce, OpenIDStore diff --git a/allauth/socialaccount/providers/openid/views.py b/allauth/socialaccount/providers/openid/views.py index 49df66f..f6a6124 100644 --- a/allauth/socialaccount/providers/openid/views.py +++ b/allauth/socialaccount/providers/openid/views.py @@ -23,8 +23,10 @@ from .utils import AXAttributes, DBOpenIDStore, JSONSafeSession, SRegFields -def _openid_consumer(request): - store = DBOpenIDStore() +def _openid_consumer(request, provider, endpoint): + server_settings = provider.get_server_settings(endpoint) + stateless = server_settings.get('stateless', False) + store = None if stateless else DBOpenIDStore() client = consumer.Consumer(JSONSafeSession(request.session), store) return client @@ -69,8 +71,8 @@ list(self.request.POST.items()) )) - def get_client(self): - return _openid_consumer(self.request) + def get_client(self, provider, endpoint): + return _openid_consumer(self.request, provider, endpoint) def get_realm(self, provider): return provider.get_settings().get( @@ -86,11 +88,12 @@ return form request = self.request - client = self.get_client() provider = self.provider(request) + endpoint = form.cleaned_data['openid'] + client = self.get_client(provider, endpoint) realm = self.get_realm(provider) - auth_request = client.begin(form.cleaned_data['openid']) + auth_request = client.begin(endpoint) if QUERY_EMAIL: sreg = SRegRequest() for name in SRegFields: @@ -131,7 +134,9 @@ provider = OpenIDProvider def get(self, request): - client = self.get_client() + provider = self.provider(request) + endpoint = request.GET.get('openid.op_endpoint', '') + client = self.get_client(provider, endpoint) response = self.get_openid_response(client) if response.status == consumer.SUCCESS: @@ -157,8 +162,8 @@ self.request, self.provider.id, error=error ) - def get_client(self): - return _openid_consumer(self.request) + def get_client(self, provider, endpoint): + return _openid_consumer(self.request, provider, endpoint) def get_openid_response(self, client): return client.complete( diff --git a/allauth/socialaccount/providers/openstreetmap/views.py b/allauth/socialaccount/providers/openstreetmap/views.py index dcf9b52..aaf5871 100644 --- a/allauth/socialaccount/providers/openstreetmap/views.py +++ b/allauth/socialaccount/providers/openstreetmap/views.py @@ -1,7 +1,6 @@ from xml.etree import ElementTree from xml.parsers.expat import ExpatError -from allauth.compat import six from allauth.socialaccount.providers.oauth.client import OAuth from allauth.socialaccount.providers.oauth.views import ( OAuthAdapter, @@ -18,8 +17,6 @@ def get_user_info(self): raw_xml = self.query(self.url) - if not six.PY3: - raw_xml = raw_xml.encode('utf8') try: user_element = ElementTree.fromstring(raw_xml).find('user') user_info = user_element.attrib diff --git a/allauth/socialaccount/providers/persona/urls.py b/allauth/socialaccount/providers/persona/urls.py index 75abc3f..189eba5 100644 --- a/allauth/socialaccount/providers/persona/urls.py +++ b/allauth/socialaccount/providers/persona/urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url('^persona/login/$', views.persona_login, name="persona_login") + path('persona/login/', views.persona_login, name="persona_login") ] diff --git a/allauth/socialaccount/providers/shopify/tests.py b/allauth/socialaccount/providers/shopify/tests.py index 69a0899..5ecd1bf 100644 --- a/allauth/socialaccount/providers/shopify/tests.py +++ b/allauth/socialaccount/providers/shopify/tests.py @@ -1,9 +1,9 @@ import json +from urllib.parse import parse_qs, urlparse from django.test.utils import override_settings from django.urls import reverse -from allauth.compat import parse_qs, urlparse from allauth.socialaccount.models import SocialAccount from allauth.socialaccount.providers import registry from allauth.socialaccount.tests import create_oauth2_tests diff --git a/allauth/socialaccount/providers/stackexchange/views.py b/allauth/socialaccount/providers/stackexchange/views.py index f1d134a..685d4e5 100644 --- a/allauth/socialaccount/providers/stackexchange/views.py +++ b/allauth/socialaccount/providers/stackexchange/views.py @@ -22,6 +22,7 @@ params={'access_token': token.token, 'key': app.key, 'site': site}) + resp.raise_for_status() extra_data = resp.json()['items'][0] return self.get_provider().sociallogin_from_response(request, extra_data) diff --git a/allauth/socialaccount/providers/steam/urls.py b/allauth/socialaccount/providers/steam/urls.py index 228eec4..fa121e4 100644 --- a/allauth/socialaccount/providers/steam/urls.py +++ b/allauth/socialaccount/providers/steam/urls.py @@ -1,9 +1,9 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url("^steam/login/$", views.steam_login, name="steam_login"), - url("^steam/callback/$", views.steam_callback, name="steam_callback"), + path("steam/login/", views.steam_login, name="steam_login"), + path("steam/callback/", views.steam_callback, name="steam_callback"), ] diff --git a/allauth/socialaccount/providers/telegram/urls.py b/allauth/socialaccount/providers/telegram/urls.py index f6aba00..74f8788 100644 --- a/allauth/socialaccount/providers/telegram/urls.py +++ b/allauth/socialaccount/providers/telegram/urls.py @@ -1,8 +1,8 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url('^telegram/login/$', views.telegram_login, name="telegram_login") + path('telegram/login/', views.telegram_login, name="telegram_login") ] diff --git a/allauth/socialaccount/providers/weixin/views.py b/allauth/socialaccount/providers/weixin/views.py index 1cefbb9..ccc412e 100644 --- a/allauth/socialaccount/providers/weixin/views.py +++ b/allauth/socialaccount/providers/weixin/views.py @@ -53,7 +53,7 @@ provider = self.adapter.get_provider() scope = provider.get_scope(request) client = WeixinOAuth2Client( - self.request, app.client_id, app.secret, + request, app.client_id, app.secret, self.adapter.access_token_method, self.adapter.access_token_url, callback_url, diff --git a/allauth/socialaccount/providers/ynab/__init__.py b/allauth/socialaccount/providers/ynab/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/allauth/socialaccount/providers/ynab/provider.py b/allauth/socialaccount/providers/ynab/provider.py new file mode 100644 index 0000000..2f0f2b3 --- /dev/null +++ b/allauth/socialaccount/providers/ynab/provider.py @@ -0,0 +1,33 @@ +from allauth.socialaccount.providers.base import AuthAction, ProviderAccount +from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider + + +class Scope(object): + ACCESS = 'read-only' + + +class YNABAccount(ProviderAccount): + pass + + +class YNABProvider(OAuth2Provider): + id = 'ynab' + name = 'YNAB' + account_class = YNABAccount + + def get_default_scope(self): + scope = [Scope.ACCESS] + return scope + + def get_auth_params(self, request, action): + ret = super(YNABProvider, self).get_auth_params(request, + action) + if action == AuthAction.REAUTHENTICATE: + ret['prompt'] = 'select_account consent' + return ret + + def extract_uid(self, data): + return str(data['data']['user']['id']) + + +provider_classes = [YNABProvider] diff --git a/allauth/socialaccount/providers/ynab/tests.py b/allauth/socialaccount/providers/ynab/tests.py new file mode 100644 index 0000000..d18f0ec --- /dev/null +++ b/allauth/socialaccount/providers/ynab/tests.py @@ -0,0 +1,68 @@ +# -*- coding: utf-8 -*- +from __future__ import absolute_import, unicode_literals + +from requests.exceptions import HTTPError + +from django.test.client import RequestFactory +from django.test.utils import override_settings +from django.urls import reverse + +from allauth.socialaccount.models import SocialToken +from allauth.socialaccount.tests import OAuth2TestsMixin +from allauth.tests import MockedResponse, TestCase, patch + +from .provider import YNABProvider + + +@override_settings( + SOCIALACCOUNT_AUTO_SIGNUP=True, + ACCOUNT_SIGNUP_FORM_CLASS=None, ) +# ACCOUNT_EMAIL_VERIFICATION=account_settings +# .EmailVerificationMethod.MANDATORY) +class YNABTests(OAuth2TestsMixin, TestCase): + provider_id = YNABProvider.id + + def get_mocked_response(self): + return MockedResponse(200, """ + {"data": { + "user":{ + "id": "abcd1234xyz5678" + } + } + } + """) + + def test_ynab_compelete_login_401(self): + from allauth.socialaccount.providers.ynab.views import \ + YNABOAuth2Adapter + + class LessMockedResponse(MockedResponse): + def raise_for_status(self): + if self.status_code != 200: + raise HTTPError(None) + + request = RequestFactory().get( + reverse(self.provider.id + '_login'), + dict(process='login')) + + adapter = YNABOAuth2Adapter(request) + app = adapter.get_provider().get_app(request) + token = SocialToken(token='some_token') + response_with_401 = LessMockedResponse( + 401, """ + {"error": { + "errors": [{ + "domain": "global", + "reason": "authError", + "message": "Invalid Credentials", + "locationType": "header", + "location": "Authorization" } ], + "code": 401, + "message": "Invalid Credentials" } + }""") + with patch( + 'allauth.socialaccount.providers.ynab.views' + '.requests') as patched_requests: + patched_requests.get.return_value = response_with_401 + with self.assertRaises(HTTPError): + adapter.complete_login(request, app, token) diff --git a/allauth/socialaccount/providers/ynab/urls.py b/allauth/socialaccount/providers/ynab/urls.py new file mode 100644 index 0000000..2191a04 --- /dev/null +++ b/allauth/socialaccount/providers/ynab/urls.py @@ -0,0 +1,6 @@ +from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns + +from .provider import YNABProvider + + +urlpatterns = default_urlpatterns(YNABProvider) diff --git a/allauth/socialaccount/providers/ynab/views.py b/allauth/socialaccount/providers/ynab/views.py new file mode 100644 index 0000000..4c735c2 --- /dev/null +++ b/allauth/socialaccount/providers/ynab/views.py @@ -0,0 +1,32 @@ +import requests + +from allauth.socialaccount.providers.oauth2.views import ( + OAuth2Adapter, + OAuth2CallbackView, + OAuth2LoginView, +) + +from .provider import YNABProvider + + +class YNABOAuth2Adapter(OAuth2Adapter): + provider_id = YNABProvider.id + access_token_url = 'https://app.youneedabudget.com/oauth/token' + authorize_url = 'https://app.youneedabudget.com/oauth/authorize' + profile_url = 'https://api.youneedabudget.com/v1/user' + + def complete_login(self, request, app, token, **kwargs): + resp = requests.get(self.profile_url, + headers={ + 'Authorization': + 'Bearer {}'.format(token.token)}) + resp.raise_for_status() + extra_data = resp.json() + login = self.get_provider() \ + .sociallogin_from_response(request, + extra_data) + return login + + +oauth2_login = OAuth2LoginView.adapter_view(YNABOAuth2Adapter) +oauth2_callback = OAuth2CallbackView.adapter_view(YNABOAuth2Adapter) diff --git a/allauth/socialaccount/tests.py b/allauth/socialaccount/tests.py index 264919c..5f8c64d 100644 --- a/allauth/socialaccount/tests.py +++ b/allauth/socialaccount/tests.py @@ -1,6 +1,7 @@ import json import random import warnings +from urllib.parse import parse_qs, urlparse from django.conf import settings from django.contrib.auth.models import AnonymousUser @@ -14,15 +15,27 @@ from ..account import app_settings as account_settings from ..account.models import EmailAddress from ..account.utils import user_email, user_username -from ..compat import parse_qs, urlparse from ..tests import MockedResponse, TestCase, mocked_response from ..utils import get_user_model -from . import providers +from . import app_settings, providers from .helpers import complete_social_login from .models import SocialAccount, SocialApp, SocialLogin from .views import signup +def setup_app(provider): + app = None + if not app_settings.PROVIDERS.get(provider.id, {}).get('APP'): + app = SocialApp.objects.create( + provider=provider.id, + name=provider.id, + client_id='app123id', + key=provider.id, + secret='dummy') + app.sites.add(Site.objects.get_current()) + return app + + class OAuthTestsMixin(object): provider_id = None @@ -32,13 +45,7 @@ def setUp(self): super(OAuthTestsMixin, self).setUp() self.provider = providers.registry.by_id(self.provider_id) - app = SocialApp.objects.create( - provider=self.provider.id, - name=self.provider.id, - client_id='app123id', - key=self.provider.id, - secret='dummy') - app.sites.add(Site.objects.get_current()) + self.app = setup_app(self.provider) @override_settings(SOCIALACCOUNT_AUTO_SIGNUP=False) def test_login(self): @@ -146,12 +153,7 @@ def setUp(self): super(OAuth2TestsMixin, self).setUp() self.provider = providers.registry.by_id(self.provider_id) - app = SocialApp.objects.create(provider=self.provider.id, - name=self.provider.id, - client_id='app123id', - key=self.provider.id, - secret='dummy') - app.sites.add(Site.objects.get_current()) + self.app = setup_app(self.provider) @override_settings(SOCIALACCOUNT_AUTO_SIGNUP=False) def test_login(self): @@ -193,13 +195,14 @@ provider_account.get_brand() provider_account.to_str() # get token - t = sa.socialtoken_set.get() - # verify access_token and refresh_token - self.assertEqual('testac', t.token) - self.assertEqual(t.token_secret, - json.loads(self.get_login_response_json( - with_refresh_token=True)).get( - 'refresh_token', '')) + if self.app: + t = sa.socialtoken_set.get() + # verify access_token and refresh_token + self.assertEqual('testac', t.token) + self.assertEqual(t.token_secret, + json.loads(self.get_login_response_json( + with_refresh_token=True)).get( + 'refresh_token', '')) def test_account_refresh_token_saved_next_login(self): """ diff --git a/allauth/socialaccount/urls.py b/allauth/socialaccount/urls.py index 681836b..18eac8b 100644 --- a/allauth/socialaccount/urls.py +++ b/allauth/socialaccount/urls.py @@ -1,13 +1,13 @@ -from django.conf.urls import url +from django.urls import path from . import views urlpatterns = [ - url(r'^login/cancelled/$', views.login_cancelled, - name='socialaccount_login_cancelled'), - url(r'^login/error/$', views.login_error, - name='socialaccount_login_error'), - url(r'^signup/$', views.signup, name='socialaccount_signup'), - url(r'^connections/$', views.connections, name='socialaccount_connections') + path('login/cancelled/', views.login_cancelled, + name='socialaccount_login_cancelled'), + path('login/error/', views.login_error, + name='socialaccount_login_error'), + path('signup/', views.signup, name='socialaccount_signup'), + path('connections/', views.connections, name='socialaccount_connections') ] diff --git a/allauth/tests.py b/allauth/tests.py index 183b077..6417926 100644 --- a/allauth/tests.py +++ b/allauth/tests.py @@ -8,9 +8,8 @@ from django.core.files.base import ContentFile from django.db import models from django.test import RequestFactory, TestCase +from django.utils.http import base36_to_int, int_to_base36 from django.views import csrf - -from allauth.compat import base36_to_int, int_to_base36 from . import utils diff --git a/allauth/urls.py b/allauth/urls.py index f0a3f02..888118b 100644 --- a/allauth/urls.py +++ b/allauth/urls.py @@ -1,16 +1,16 @@ from importlib import import_module -from django.conf.urls import include, url +from django.urls import include, path from allauth.socialaccount import providers from . import app_settings -urlpatterns = [url(r'^', include('allauth.account.urls'))] +urlpatterns = [path('', include('allauth.account.urls'))] if app_settings.SOCIALACCOUNT_ENABLED: - urlpatterns += [url(r'^social/', include('allauth.socialaccount.urls'))] + urlpatterns += [path('social/', include('allauth.socialaccount.urls'))] # Provider urlpatterns, as separate attribute (for reusability). provider_urlpatterns = [] diff --git a/allauth/utils.py b/allauth/utils.py index fe366ea..5191849 100644 --- a/allauth/utils.py +++ b/allauth/utils.py @@ -6,13 +6,14 @@ import string import unicodedata from collections import OrderedDict +from urllib.parse import urlsplit from django.contrib.auth import get_user_model from django.contrib.sites.models import Site -from django.core.exceptions import ImproperlyConfigured +from django.core.exceptions import FieldDoesNotExist, ImproperlyConfigured from django.core.serializers.json import DjangoJSONEncoder from django.core.validators import ValidationError, validate_email -from django.db.models import FieldDoesNotExist, FileField +from django.db.models import FileField from django.db.models.fields import ( BinaryField, DateField, @@ -21,9 +22,7 @@ TimeField, ) from django.utils import dateparse -from django.utils.encoding import force_bytes - -from allauth.compat import force_str, six, urlsplit +from django.utils.encoding import force_bytes, force_str # Magic number 7: if you run into collisions with this number, then you are @@ -147,7 +146,7 @@ def import_attribute(path): - assert isinstance(path, six.string_types) + assert isinstance(path, str) pkg, attr = path.rsplit('.', 1) ret = getattr(importlib.import_module(pkg), attr) return ret @@ -181,7 +180,7 @@ if isinstance(field, BinaryField): v = force_str(base64.b64encode(v)) elif isinstance(field, FileField): - if v and not isinstance(v, six.string_types): + if v and not isinstance(v, str): v = v.name # Check if the field is serializable. If not, we'll fall back # to serializing the DB values which should cover most use cases. @@ -293,10 +292,12 @@ def get_form_class(forms, form_id, default_form): form_class = forms.get(form_id, default_form) - if isinstance(form_class, six.string_types): + if isinstance(form_class, str): form_class = import_attribute(form_class) return form_class def get_request_param(request, param, default=None): + if request is None: + return default return request.POST.get(param) or request.GET.get(param, default) diff --git a/django_allauth.egg-info/PKG-INFO b/django_allauth.egg-info/PKG-INFO index e4cc20e..be5d1ba 100644 --- a/django_allauth.egg-info/PKG-INFO +++ b/django_allauth.egg-info/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: django-allauth -Version: 0.40.0 +Version: 0.41.0 Summary: Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account authentication. Home-page: http://github.com/pennersr/django-allauth Author: Raymond Penners @@ -9,9 +9,6 @@ Description: ========================== Welcome to django-allauth! ========================== - - .. image:: https://badge.fury.io/py/django-allauth.svg - :target: http://badge.fury.io/py/django-allauth .. image:: https://travis-ci.org/pennersr/django-allauth.svg :target: http://travis-ci.org/pennersr/django-allauth @@ -31,6 +28,9 @@ .. image:: https://img.shields.io/badge/code_style-standard-brightgreen.svg :target: http://standardjs.com + + .. image:: https://pennersr.github.io/img/emacs-badge.svg + :target: https://www.gnu.org/software/emacs/ Integrated set of Django applications addressing authentication, registration, account management as well as 3rd party (social) account @@ -102,12 +102,13 @@ Classifier: License :: OSI Approved :: MIT License Classifier: Operating System :: OS Independent Classifier: Programming Language :: Python -Classifier: Programming Language :: Python :: 2.7 -Classifier: Programming Language :: Python :: 3.4 +Classifier: Programming Language :: Python :: 3 Classifier: Programming Language :: Python :: 3.5 Classifier: Programming Language :: Python :: 3.6 +Classifier: Programming Language :: Python :: 3.7 +Classifier: Programming Language :: Python :: 3.8 Classifier: Framework :: Django -Classifier: Framework :: Django :: 1.11 Classifier: Framework :: Django :: 2.0 Classifier: Framework :: Django :: 2.1 Classifier: Framework :: Django :: 2.2 +Classifier: Framework :: Django :: 3.0 diff --git a/django_allauth.egg-info/SOURCES.txt b/django_allauth.egg-info/SOURCES.txt index 085ec99..d6e2cfe 100644 --- a/django_allauth.egg-info/SOURCES.txt +++ b/django_allauth.egg-info/SOURCES.txt @@ -7,7 +7,6 @@ test_settings.py allauth/__init__.py allauth/app_settings.py -allauth/compat.py allauth/exceptions.py allauth/models.py allauth/tests.py @@ -139,6 +138,12 @@ allauth/socialaccount/providers/amazon/tests.py allauth/socialaccount/providers/amazon/urls.py allauth/socialaccount/providers/amazon/views.py +allauth/socialaccount/providers/amazon_cognito/__init__.py +allauth/socialaccount/providers/amazon_cognito/provider.py +allauth/socialaccount/providers/amazon_cognito/tests.py +allauth/socialaccount/providers/amazon_cognito/urls.py +allauth/socialaccount/providers/amazon_cognito/utils.py +allauth/socialaccount/providers/amazon_cognito/views.py allauth/socialaccount/providers/angellist/__init__.py allauth/socialaccount/providers/angellist/provider.py allauth/socialaccount/providers/angellist/tests.py @@ -286,6 +291,11 @@ allauth/socialaccount/providers/evernote/tests.py allauth/socialaccount/providers/evernote/urls.py allauth/socialaccount/providers/evernote/views.py +allauth/socialaccount/providers/exist/__init__.py +allauth/socialaccount/providers/exist/provider.py +allauth/socialaccount/providers/exist/tests.py +allauth/socialaccount/providers/exist/urls.py +allauth/socialaccount/providers/exist/views.py allauth/socialaccount/providers/facebook/__init__.py allauth/socialaccount/providers/facebook/forms.py allauth/socialaccount/providers/facebook/locale.py @@ -617,6 +627,11 @@ allauth/socialaccount/providers/yahoo/tests.py allauth/socialaccount/providers/yahoo/urls.py allauth/socialaccount/providers/yahoo/views.py +allauth/socialaccount/providers/ynab/__init__.py +allauth/socialaccount/providers/ynab/provider.py +allauth/socialaccount/providers/ynab/tests.py +allauth/socialaccount/providers/ynab/urls.py +allauth/socialaccount/providers/ynab/views.py allauth/socialaccount/templatetags/__init__.py allauth/socialaccount/templatetags/socialaccount.py allauth/templates/base.html diff --git a/django_allauth.egg-info/requires.txt b/django_allauth.egg-info/requires.txt index db4afa3..09e2ba3 100644 --- a/django_allauth.egg-info/requires.txt +++ b/django_allauth.egg-info/requires.txt @@ -1,4 +1,4 @@ -Django>=1.11 +Django>=2.0 python3-openid>=3.0.8 requests-oauthlib>=0.3.0 requests diff --git a/docs/faq.rst b/docs/faq.rst index f44deba..40fed36 100644 --- a/docs/faq.rst +++ b/docs/faq.rst @@ -17,6 +17,7 @@ Here are a few third party resources to help you get started: +- https://www.youtube.com/watch?v=2QLAc7RJ99s - https://speakerdeck.com/tedtieken/signing-up-and-signing-in-users-in-django-with-django-allauth - https://stackoverflow.com/questions/tagged/django-allauth - http://www.sarahhagstrom.com/2013/09/the-missing-django-allauth-tutorial/ @@ -91,3 +92,12 @@ one piece of the puzzle and for example a stack trace indicates another module crashing, please try to come up stripped version of the issue where it is clear that ``allauth`` is the one that is misbehaving. + +- **Social login trouble:** There are many reasons why the social login for a + provider is not working for you. Common causes are errors in setting up the + credential for the OAuth app and/or having setup invalid callback URLs. Filing + issues stating that things are not working for you is not very helpful. It is + simply not feasible to debug your specific setup. If you really do think that + there is an issue in ``allauth``, please do the initial debugging and analysis + yourself, and, provide detailed information in the issue. If the issue does + not point to any concrete issue in ``allauth``, it is likely to get closed. diff --git a/docs/installation.rst b/docs/installation.rst index a5e9810..448911b 100644 --- a/docs/installation.rst +++ b/docs/installation.rst @@ -73,6 +73,7 @@ 'allauth.socialaccount.providers.edmodo', 'allauth.socialaccount.providers.eveonline', 'allauth.socialaccount.providers.evernote', + 'allauth.socialaccount.providers.exist', 'allauth.socialaccount.providers.facebook', 'allauth.socialaccount.providers.feedly', 'allauth.socialaccount.providers.fivehundredpx', @@ -127,10 +128,25 @@ 'allauth.socialaccount.providers.weixin', 'allauth.socialaccount.providers.windowslive', 'allauth.socialaccount.providers.xing', + 'allauth.socialaccount.providers.ynab', ... ) SITE_ID = 1 + + # Provider specific settings + SOCIALACCOUNT_PROVIDERS = { + 'google': { + # For each OAuth based provider, either add a ``SocialApp`` + # (``socialaccount`` app) containing the required client + # credentials, or list them here: + 'APP': { + 'client_id': '123', + 'secret': '456', + 'key': '' + } + } + } urls.py:: @@ -156,6 +172,7 @@ Now start your server, visit your admin pages (e.g. http://localhost:8000/admin/) and follow these steps: -1. Add a ``Site`` for your domain, matching ``settings.SITE_ID`` (``django.contrib.sites`` app). -2. For each OAuth based provider, add a ``Social App`` (``socialaccount`` app). -3. Fill in the site and the OAuth app credentials obtained from the provider. +- Add a ``Site`` for your domain, matching ``settings.SITE_ID`` (``django.contrib.sites`` app). +- For each OAuth based provider, either add a ``SocialApp`` (``socialaccount`` + app) containing the required client credentials, or, make make sure that these are + configured via the ``SOCIALACCOUNT_PROVIDERS[]['APP']`` setting. diff --git a/docs/overview.rst b/docs/overview.rst index 5b68c4d..7bd97c2 100644 --- a/docs/overview.rst +++ b/docs/overview.rst @@ -4,9 +4,9 @@ Requirements ------------ -- Python 2.7, 3.3, 3.4, 3.5 or 3.6 - -- Django (1.11+) +- Python 3.5, 3.6, 3.7 or 3.8 + +- Django (2.0+) - python-openid or python3-openid (depending on your Python version) @@ -41,6 +41,8 @@ - Amazon (OAuth2) +- Amazon Cognito (OAuth2) + - AngelList (OAuth2) - Asana (OAuth2) @@ -87,6 +89,8 @@ - Evernote (OAuth) +- Exist (OAuth2) + - Facebook (both OAuth2 and JS SDK) - Feedly (OAuth2) @@ -192,6 +196,8 @@ - Xing (OAuth) - Yahoo (OAuth2) + +- YNAB (OAuth2) Note: OAuth/OAuth2 support is built using a common code base, making it easy to add support for additional OAuth/OAuth2 providers. More will follow soon... diff --git a/docs/providers.rst b/docs/providers.rst index b3e214c..261a31f 100644 --- a/docs/providers.rst +++ b/docs/providers.rst @@ -80,6 +80,37 @@ Development callback URL https://example.com/accounts/amazon/login/callback/ + +Amazon Cognito +-------------- + +App registration (get your key and secret here) + 1. Go to your https://console.aws.amazon.com/cognito/ and create a Cognito User Pool if you haven't already. + 2. Go to General Settings > App Clients section and create a new App Client if you haven't already. Please make sure you select the option to generate a secret key. + 3. Go to App Integration > App Client Settings section and: + + 1. Enable Cognito User Pool as an identity provider. + 2. Set the callback and sign-out URLs. (see next section for development callback URL) + 3. Enable Authorization Code Grant OAuth flow. + 4. Select the OAuth scopes you'd like to allow. + + 4. Go to App Integration > Domain Name section and create a domain prefix for your Cognito User Pool. + +Development callback URL: + http://localhost:8000/accounts/amazon-cognito/login/callback/ + +In addition, you'll need to specify your user pool's domain like so: + +.. code-block:: python + + SOCIALACCOUNT_PROVIDERS = { + 'amazon_cognito': { + 'DOMAIN': 'https://.auth.us-east-1.amazoncognito.com', + } + } + +Your domain prefix is the value you specified in step 4 of the app registration process. +If you provided a custom domain such as accounts.example.com provide that instead. AngelList --------- @@ -413,6 +444,41 @@ 'EVERNOTE_HOSTNAME': 'evernote.com' # defaults to sandbox.evernote.com } } + + +Exist +----- + +Register your OAuth2 app in apps page: + + https://exist.io/account/apps/ + +During development set the callback url to: + + http://localhost:8000/accounts/exist/login/callback/ + +In production replace localhost with whatever domain you're hosting your app on. + +If your app is writing to certain attributes you need to specify this during the +creation of the app. + +The following Exist settings are available: + +.. code-block:: python + + SOCIALACCOUNT_PROVIDERS = { + 'exist': { + 'SCOPE': ['read+write'], + } + } + +SCOPE: + The default scope is ``read``. If you'd like to change this set the scope to + ``read+write``. + +For more information: +OAuth documentation: http://developer.exist.io/#oauth2-authentication +API documentation: http://developer.exist.io/ Facebook @@ -1071,9 +1137,19 @@ {% load socialaccount %} Google +The OpenID provider can be forced to operate in stateless mode as follows:: + + SOCIALACCOUNT_PROVIDERS = \ + { 'openid': + { 'SERVERS': + [ dict(id='steam', + name='Steam', + openid_url='https://steamcommunity.com/openid', + stateless=True, + )]}} OpenStreetMap ------ +------------- Register your client application under `My Settings`/`oauth settings`: @@ -1112,7 +1188,7 @@ .. code-block:: python SOCIALACCOUNT_PROVIDERS = { - 'paypal': { + 'patreon': { 'VERSION': 'v1', 'SCOPE': ['pledges-to-me', 'users', 'my-campaign'], } @@ -1449,7 +1525,7 @@ Strava ------ +------ Register your OAuth2 app in api settings page: @@ -1718,3 +1794,25 @@ Register your OAuth2 app below and enter the resultant client id and secret into admin https://developer.yahoo.com/apps/create/ + +YNAB +------ + +App Registration + https://app.youneedabudget.com/settings/developer + +Development callback URL + http://127.0.0.1:8000/accounts/ynab/login/callback/ + + + +Default SCOPE permissions are 'read-only'. If this is the desired functionality, do not add SCOPE entry with ynab app +in SOCIALACCOUNT_PROVIDERS. Otherwise, adding SCOPE and an empty string will give you read / write. + +.. code-block:: python + + SOCIALACCOUNT_PROVIDERS = { + 'ynab': { + 'SCOPE': '' + } + } diff --git a/setup.py b/setup.py index 6519eae..52848e1 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import print_function import io import os import sys @@ -61,9 +62,9 @@ or fn.lower() == pattern.lower()): bad_name = True if show_ignored: - print >> sys.stderr, ( + print( "Directory %s ignored by pattern %s" - % (fn, pattern)) + % (fn, pattern), file=sys.stderr) break if bad_name: continue @@ -85,9 +86,9 @@ or fn.lower() == pattern.lower()): bad_name = True if show_ignored: - print >> sys.stderr, ( + print( "File %s ignored by pattern %s" - % (fn, pattern)) + % (fn, pattern), file=sys.stderr) break if bad_name: continue @@ -98,16 +99,6 @@ excluded_directories = standard_exclude_directories package_data = find_package_data(exclude_directories=excluded_directories) - -test_requirements = [] - -IS_PY2 = sys.version_info[0] < 3 - -if IS_PY2: - openid_package = 'python-openid >= 2.2.5' - test_requirements.append('mock >= 1.0.1') -else: - openid_package = 'python3-openid >= 3.0.8' long_description = io.open('README.rst', encoding='utf-8').read() @@ -126,9 +117,9 @@ url='http://github.com/pennersr/django-allauth', keywords='django auth account social openid twitter facebook oauth' ' registration', - tests_require=test_requirements, - install_requires=['Django >= 1.11', - openid_package, + tests_require=[], + install_requires=['Django >= 2.0', + 'python3-openid >= 3.0.8', 'requests-oauthlib >= 0.3.0', "requests"], include_package_data=True, @@ -141,15 +132,16 @@ 'License :: OSI Approved :: MIT License', 'Operating System :: OS Independent', 'Programming Language :: Python', - 'Programming Language :: Python :: 2.7', - 'Programming Language :: Python :: 3.4', + 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.5', 'Programming Language :: Python :: 3.6', + 'Programming Language :: Python :: 3.7', + 'Programming Language :: Python :: 3.8', 'Framework :: Django', - 'Framework :: Django :: 1.11', 'Framework :: Django :: 2.0', 'Framework :: Django :: 2.1', 'Framework :: Django :: 2.2', + 'Framework :: Django :: 3.0', ], packages=find_packages(exclude=['example']), package_data=package_data, diff --git a/test_settings.py b/test_settings.py index e91806f..da51b90 100644 --- a/test_settings.py +++ b/test_settings.py @@ -52,6 +52,7 @@ 'allauth.socialaccount', 'allauth.socialaccount.providers.agave', 'allauth.socialaccount.providers.amazon', + 'allauth.socialaccount.providers.amazon_cognito', 'allauth.socialaccount.providers.angellist', 'allauth.socialaccount.providers.asana', 'allauth.socialaccount.providers.auth0', @@ -80,6 +81,7 @@ 'allauth.socialaccount.providers.eveonline', 'allauth.socialaccount.providers.evernote', 'allauth.socialaccount.providers.eventbrite', + 'allauth.socialaccount.providers.exist', 'allauth.socialaccount.providers.facebook', 'allauth.socialaccount.providers.feedly', 'allauth.socialaccount.providers.fivehundredpx', @@ -139,6 +141,7 @@ 'allauth.socialaccount.providers.windowslive', 'allauth.socialaccount.providers.xing', 'allauth.socialaccount.providers.yahoo', + 'allauth.socialaccount.providers.ynab', ) AUTHENTICATION_BACKENDS = (