diff -Nru django-allauth-0.47.0/allauth/account/adapter.py django-allauth-0.51.0/allauth/account/adapter.py
--- django-allauth-0.47.0/allauth/account/adapter.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/account/adapter.py 2022-06-07 09:42:31.000000000 +0000
@@ -1,9 +1,7 @@
-from __future__ import unicode_literals
-
-import hashlib
+import html
import json
-import time
import warnings
+from datetime import timedelta
from django import forms
from django.conf import settings
@@ -17,7 +15,6 @@
from django.contrib.auth.models import AbstractUser
from django.contrib.auth.password_validation import validate_password
from django.contrib.sites.shortcuts import get_current_site
-from django.core.cache import cache
from django.core.mail import EmailMessage, EmailMultiAlternatives
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import resolve_url
@@ -25,16 +22,21 @@
from django.template.loader import render_to_string
from django.urls import reverse
from django.utils import timezone
+from django.utils.crypto import get_random_string
from django.utils.encoding import force_str
from django.utils.translation import gettext_lazy as _
-from ..utils import (
+from allauth import ratelimit
+from allauth.account import signals
+from allauth.account.app_settings import EmailVerificationMethod
+from allauth.utils import (
build_absolute_uri,
email_address_exists,
generate_unique_username,
get_user_model,
import_attribute,
)
+
from . import app_settings
@@ -96,7 +98,7 @@
"""
return settings.DEFAULT_FROM_EMAIL
- def render_mail(self, template_prefix, email, context):
+ def render_mail(self, template_prefix, email, context, headers=None):
"""
Renders an e-mail to `email`. `template_prefix` identifies the
e-mail that is to be sent, e.g. "account/email/email_confirmation"
@@ -123,11 +125,13 @@
# We need at least one body
raise
if "txt" in bodies:
- msg = EmailMultiAlternatives(subject, bodies["txt"], from_email, to)
+ msg = EmailMultiAlternatives(
+ subject, bodies["txt"], from_email, to, headers=headers
+ )
if "html" in bodies:
msg.attach_alternative(bodies["html"], "text/html")
else:
- msg = EmailMessage(subject, bodies["html"], from_email, to)
+ msg = EmailMessage(subject, bodies["html"], from_email, to, headers=headers)
msg.content_subtype = "html" # Main content is now text/html
return msg
@@ -323,12 +327,13 @@
try:
if message_context is None:
message_context = {}
- message = render_to_string(
+ escaped_message = render_to_string(
message_template,
message_context,
self.request,
).strip()
- if message:
+ if escaped_message:
+ message = html.unescape(escaped_message)
messages.add_message(request, level, message, extra_tags=extra_tags)
except TemplateDoesNotExist:
pass
@@ -380,6 +385,67 @@
form_spec["field_order"].append(field.html_name)
return form_spec
+ def pre_login(
+ self,
+ request,
+ user,
+ *,
+ email_verification,
+ signal_kwargs,
+ email,
+ signup,
+ redirect_url
+ ):
+ from .utils import has_verified_email, send_email_confirmation
+
+ if not user.is_active:
+ return self.respond_user_inactive(request, user)
+
+ if email_verification == EmailVerificationMethod.NONE:
+ pass
+ elif email_verification == EmailVerificationMethod.OPTIONAL:
+ # In case of OPTIONAL verification: send on signup.
+ if not has_verified_email(user, email) and signup:
+ send_email_confirmation(request, user, signup=signup, email=email)
+ elif email_verification == EmailVerificationMethod.MANDATORY:
+ if not has_verified_email(user, email):
+ send_email_confirmation(request, user, signup=signup, email=email)
+ return self.respond_email_verification_sent(request, user)
+
+ def post_login(
+ self,
+ request,
+ user,
+ *,
+ email_verification,
+ signal_kwargs,
+ email,
+ signup,
+ redirect_url
+ ):
+ from .utils import get_login_redirect_url
+
+ response = HttpResponseRedirect(
+ get_login_redirect_url(request, redirect_url, signup=signup)
+ )
+
+ if signal_kwargs is None:
+ signal_kwargs = {}
+ signals.user_logged_in.send(
+ sender=user.__class__,
+ request=request,
+ response=response,
+ user=user,
+ **signal_kwargs,
+ )
+ self.add_message(
+ request,
+ messages.SUCCESS,
+ "account/messages/logged_in.txt",
+ {"user": user},
+ )
+ return response
+
def login(self, request, user):
# HACK: This is not nice. The proper Django way is to use an
# authentication backend
@@ -448,6 +514,25 @@
ret = build_absolute_uri(request, url)
return ret
+ def should_send_confirmation_mail(self, request, email_address):
+ from allauth.account.models import EmailConfirmation
+
+ cooldown_period = timedelta(seconds=app_settings.EMAIL_CONFIRMATION_COOLDOWN)
+ if app_settings.EMAIL_CONFIRMATION_HMAC:
+ send_email = ratelimit.consume(
+ request,
+ action="confirm_email",
+ key=email_address.email.lower(),
+ amount=1,
+ duration=cooldown_period.total_seconds(),
+ )
+ else:
+ send_email = not EmailConfirmation.objects.filter(
+ sent__gt=timezone.now() - cooldown_period,
+ email_address=email_address,
+ ).exists()
+ return send_email
+
def send_confirmation_mail(self, request, emailconfirmation, signup):
current_site = get_current_site(request)
activate_url = self.get_email_confirmation_url(request, emailconfirmation)
@@ -472,31 +557,26 @@
def _get_login_attempts_cache_key(self, request, **credentials):
site = get_current_site(request)
login = credentials.get("email", credentials.get("username", "")).lower()
- login_key = hashlib.sha256(login.encode("utf8")).hexdigest()
- return "allauth/login_attempts@{site_id}:{login}".format(
- site_id=site.pk, login=login_key
- )
+ return "{site}:{login}".format(site=site.domain, login=login)
def _delete_login_attempts_cached_email(self, request, **credentials):
if app_settings.LOGIN_ATTEMPTS_LIMIT:
cache_key = self._get_login_attempts_cache_key(request, **credentials)
- cache.delete(cache_key)
+ ratelimit.clear(request, action="login_failed", key=cache_key)
def pre_authenticate(self, request, **credentials):
if app_settings.LOGIN_ATTEMPTS_LIMIT:
cache_key = self._get_login_attempts_cache_key(request, **credentials)
- login_data = cache.get(cache_key, None)
- if login_data:
- dt = timezone.now()
- current_attempt_time = time.mktime(dt.timetuple())
- if len(
- login_data
- ) >= app_settings.LOGIN_ATTEMPTS_LIMIT and current_attempt_time < (
- login_data[-1] + app_settings.LOGIN_ATTEMPTS_TIMEOUT
- ):
- raise forms.ValidationError(
- self.error_messages["too_many_login_attempts"]
- )
+ if not ratelimit.consume(
+ request,
+ action="login_failed",
+ key=cache_key,
+ amount=app_settings.LOGIN_ATTEMPTS_LIMIT,
+ duration=app_settings.LOGIN_ATTEMPTS_TIMEOUT,
+ ):
+ raise forms.ValidationError(
+ self.error_messages["too_many_login_attempts"]
+ )
def authenticate(self, request, **credentials):
"""Only authenticates, does not actually login. See `login`"""
@@ -514,12 +594,7 @@
return user
def authentication_failed(self, request, **credentials):
- if app_settings.LOGIN_ATTEMPTS_LIMIT:
- cache_key = self._get_login_attempts_cache_key(request, **credentials)
- data = cache.get(cache_key, [])
- dt = timezone.now()
- data.append(time.mktime(dt.timetuple()))
- cache.set(cache_key, data, app_settings.LOGIN_ATTEMPTS_TIMEOUT)
+ pass
def is_ajax(self, request):
return any(
@@ -530,6 +605,18 @@
]
)
+ def get_client_ip(self, request):
+ x_forwarded_for = request.META.get("HTTP_X_FORWARDED_FOR")
+ if x_forwarded_for:
+ ip = x_forwarded_for.split(",")[0]
+ else:
+ ip = request.META.get("REMOTE_ADDR")
+ return ip
+
+ def generate_emailconfirmation_key(self, email):
+ key = get_random_string(64).lower()
+ return key
+
def get_adapter(request=None):
return import_attribute(app_settings.ADAPTER)(request)
diff -Nru django-allauth-0.47.0/allauth/account/app_settings.py django-allauth-0.51.0/allauth/account/app_settings.py
--- django-allauth-0.47.0/allauth/account/app_settings.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/account/app_settings.py 2022-06-07 09:42:31.000000000 +0000
@@ -47,6 +47,10 @@
return getter(self.prefix + name, dflt)
@property
+ def PREVENT_ENUMERATION(self):
+ return self._setting("PREVENT_ENUMERATION", True)
+
+ @property
def DEFAULT_HTTP_PROTOCOL(self):
return self._setting("DEFAULT_HTTP_PROTOCOL", "http").lower()
@@ -168,6 +172,25 @@
return ret
@property
+ def RATE_LIMITS(self):
+ dflt = {
+ # Change password view (for users already logged in)
+ "change_password": "5/m",
+ # Email management (e.g. add, remove, change primary)
+ "manage_email": "10/m",
+ # Request a password reset, global rate limit per IP
+ "reset_password": "20/m",
+ # Rate limit measured per individual email address
+ "reset_password_email": "5/m",
+ # Password reset (the view the password reset email links to).
+ "reset_password_from_key": "20/m",
+ # Signups.
+ "signup": "20/m",
+ # NOTE: Login is already protected via `ACCOUNT_LOGIN_ATTEMPTS_LIMIT`
+ }
+ return self._setting("RATE_LIMITS", dflt)
+
+ @property
def EMAIL_SUBJECT_PREFIX(self):
"""
Subject-line prefix to use for email messages sent
diff -Nru django-allauth-0.47.0/allauth/account/forms.py django-allauth-0.51.0/allauth/account/forms.py
--- django-allauth-0.47.0/allauth/account/forms.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/account/forms.py 2022-06-07 09:42:31.000000000 +0000
@@ -381,7 +381,9 @@
label=_("Password"), autocomplete="new-password"
)
if app_settings.SIGNUP_PASSWORD_ENTER_TWICE:
- self.fields["password2"] = PasswordField(label=_("Password (again)"))
+ self.fields["password2"] = PasswordField(
+ label=_("Password (again)"), autocomplete="new-password"
+ )
if hasattr(self, "field_order"):
set_form_field_order(self, self.field_order)
@@ -392,7 +394,8 @@
# `password` cannot be of type `SetPasswordField`, as we don't
# have a `User` yet. So, let's populate a dummy user to be used
# for password validaton.
- dummy_user = get_user_model()
+ User = get_user_model()
+ dummy_user = User()
user_username(dummy_user, self.cleaned_data.get("username"))
user_email(dummy_user, self.cleaned_data.get("email"))
password = self.cleaned_data.get("password1")
@@ -524,18 +527,34 @@
email = self.cleaned_data["email"]
email = get_adapter().clean_email(email)
self.users = filter_users_by_email(email, is_active=True)
- if not self.users:
+ if not self.users and not app_settings.PREVENT_ENUMERATION:
raise forms.ValidationError(
_("The e-mail address is not assigned to any user account")
)
return self.cleaned_data["email"]
def save(self, request, **kwargs):
- current_site = get_current_site(request)
email = self.cleaned_data["email"]
+ if not self.users:
+ self._send_unknown_account_mail(request, email)
+ else:
+ self._send_password_reset_mail(request, email, self.users, **kwargs)
+ return email
+
+ def _send_unknown_account_mail(self, request, email):
+ signup_url = build_absolute_uri(request, reverse("account_signup"))
+ context = {
+ "current_site": get_current_site(request),
+ "email": email,
+ "request": request,
+ "signup_url": signup_url,
+ }
+ get_adapter(request).send_mail("account/email/unknown_account", email, context)
+
+ def _send_password_reset_mail(self, request, email, users, **kwargs):
token_generator = kwargs.get("token_generator", default_token_generator)
- for user in self.users:
+ for user in users:
temp_key = token_generator.make_token(user)
@@ -551,7 +570,7 @@
url = build_absolute_uri(request, path)
context = {
- "current_site": current_site,
+ "current_site": get_current_site(request),
"user": user,
"password_reset_url": url,
"request": request,
@@ -562,7 +581,6 @@
get_adapter(request).send_mail(
"account/email/password_reset_key", email, context
)
- return self.cleaned_data["email"]
class ResetPasswordKeyForm(PasswordVerificationMixin, forms.Form):
diff -Nru django-allauth-0.47.0/allauth/account/models.py django-allauth-0.51.0/allauth/account/models.py
--- django-allauth-0.47.0/allauth/account/models.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/account/models.py 2022-06-07 09:42:31.000000000 +0000
@@ -1,11 +1,8 @@
-from __future__ import unicode_literals
-
import datetime
from django.core import signing
from django.db import models, transaction
from django.utils import timezone
-from django.utils.crypto import get_random_string
from django.utils.translation import gettext_lazy as _
from .. import app_settings as allauth_app_settings
@@ -98,7 +95,7 @@
@classmethod
def create(cls, email_address):
- key = get_random_string(64).lower()
+ key = get_adapter().generate_emailconfirmation_key(email_address.email)
return cls._default_manager.create(email_address=email_address, key=key)
def key_expired(self):
@@ -145,7 +142,7 @@
try:
max_age = 60 * 60 * 24 * app_settings.EMAIL_CONFIRMATION_EXPIRE_DAYS
pk = signing.loads(key, max_age=max_age, salt=app_settings.SALT)
- ret = EmailConfirmationHMAC(EmailAddress.objects.get(pk=pk))
+ ret = EmailConfirmationHMAC(EmailAddress.objects.get(pk=pk, verified=False))
except (
signing.SignatureExpired,
signing.BadSignature,
diff -Nru django-allauth-0.47.0/allauth/account/tests.py django-allauth-0.51.0/allauth/account/tests.py
--- django-allauth-0.47.0/allauth/account/tests.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/account/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -6,8 +6,11 @@
from django import forms
from django.conf import settings
+from django.contrib import messages
from django.contrib.auth.models import AbstractUser, AnonymousUser
-from django.contrib.sites.models import Site
+from django.contrib.messages.api import get_messages
+from django.contrib.messages.middleware import MessageMiddleware
+from django.contrib.sessions.middleware import SessionMiddleware
from django.core import mail, validators
from django.core.exceptions import ValidationError
from django.db import models
@@ -18,6 +21,7 @@
from django.urls import reverse
from django.utils.timezone import now
+import allauth.app_settings
from allauth.account.forms import BaseSignupForm, ResetPasswordForm, SignupForm
from allauth.account.models import (
EmailAddress,
@@ -62,7 +66,10 @@
from ..socialaccount.models import SocialApp
sa = SocialApp.objects.create(name="testfb", provider="facebook")
- sa.sites.add(Site.objects.get_current())
+ if allauth.app_settings.SITES_ENABLED:
+ from django.contrib.sites.models import Site
+
+ sa.sites.add(Site.objects.get_current())
@override_settings(
ACCOUNT_AUTHENTICATION_METHOD=app_settings.AuthenticationMethod.USERNAME_EMAIL
@@ -123,9 +130,6 @@
},
)
# Fake stash_verified_email
- from django.contrib.messages.middleware import MessageMiddleware
- from django.contrib.sessions.middleware import SessionMiddleware
-
SessionMiddleware(lambda request: None).process_request(request)
MessageMiddleware(lambda request: None).process_request(request)
request.user = AnonymousUser()
@@ -175,9 +179,6 @@
"password2": "johndoe",
},
)
- from django.contrib.messages.middleware import MessageMiddleware
- from django.contrib.sessions.middleware import SessionMiddleware
-
SessionMiddleware(lambda request: None).process_request(request)
MessageMiddleware(lambda request: None).process_request(request)
request.user = AnonymousUser()
@@ -473,7 +474,9 @@
# EmailVerificationMethod.MANDATORY sends us to the confirm-email page
self.assertRedirects(resp, "/confirm-email/")
- @override_settings(ACCOUNT_EMAIL_CONFIRMATION_HMAC=False)
+ @override_settings(
+ ACCOUNT_EMAIL_CONFIRMATION_HMAC=False, ACCOUNT_EMAIL_CONFIRMATION_COOLDOWN=10
+ )
def test_email_verification_mandatory(self):
c = Client()
# Signup
@@ -544,13 +547,17 @@
)
def test_email_escaping(self):
- site = Site.objects.get_current()
- site.name = ''
- site.save()
+ site_name = "testserver"
+ if allauth.app_settings.SITES_ENABLED:
+ from django.contrib.sites.models import Site
+
+ site = Site.objects.get_current()
+ site.name = site_name = ''
+ site.save()
u = get_user_model().objects.create(username="test", email="user@example.com")
request = RequestFactory().get("/")
EmailAddress.objects.add_email(request, u, u.email, confirm=True)
- self.assertTrue(mail.outbox[0].subject[1:].startswith(site.name))
+ self.assertTrue(mail.outbox[0].subject[1:].startswith(site_name))
@override_settings(
ACCOUNT_EMAIL_VERIFICATION=app_settings.EmailVerificationMethod.OPTIONAL
@@ -925,7 +932,8 @@
user=user, email="a@b.com", verified=False, primary=True
)
confirmation = EmailConfirmationHMAC(email)
- confirmation.send()
+ request = RequestFactory().get("/")
+ confirmation.send(request=request)
self.assertEqual(len(mail.outbox), 1)
self.client.post(reverse("account_confirm_email", args=[confirmation.key]))
email = EmailAddress.objects.get(pk=email.pk)
@@ -941,7 +949,8 @@
user=user, email="a@b.com", verified=False, primary=True
)
confirmation = EmailConfirmationHMAC(email)
- confirmation.send()
+ request = RequestFactory().get("/")
+ confirmation.send(request=request)
self.assertEqual(len(mail.outbox), 1)
self.client.post(reverse("account_confirm_email", args=[confirmation.key]))
email = EmailAddress.objects.get(pk=email.pk)
@@ -1028,6 +1037,20 @@
self.assertEqual(user, resp.wsgi_request.user)
+ def test_message_escaping(self):
+ request = RequestFactory().get("/")
+ SessionMiddleware(lambda request: None).process_request(request)
+ MessageMiddleware(lambda request: None).process_request(request)
+ user = get_user_model()()
+ user_username(user, "'<8")
+ context = {"user": user}
+ get_adapter().add_message(
+ request, messages.SUCCESS, "account/messages/logged_in.txt", context
+ )
+ msgs = get_messages(request)
+ actual_message = msgs._queued_messages[0].message
+ assert user.username in actual_message, actual_message
+
class EmailFormTests(TestCase):
def setUp(self):
@@ -1162,6 +1185,15 @@
)
self.assertTemplateUsed(resp, "account/messages/email_confirmation_sent.txt")
+ def test_verify_unknown_email(self):
+ assert EmailAddress.objects.filter(user=self.user).count() == 2
+ self.client.post(
+ reverse("account_email"),
+ {"action_send": "", "email": "email@unknown.org"},
+ )
+ # This unkown email address must not be implicitly added.
+ assert EmailAddress.objects.filter(user=self.user).count() == 2
+
@override_settings(ACCOUNT_MAX_EMAIL_ADDRESSES=2)
def test_add_with_two_limiter(self):
resp = self.client.post(
@@ -1276,6 +1308,29 @@
form = CustomSignupForm()
self.assertEqual(list(form.fields.keys()), expected_field_order)
+ def test_user_class_attribute(self):
+ from django.contrib.auth import get_user_model
+ from django.db.models.query_utils import DeferredAttribute
+
+ class CustomSignupForm(SignupForm):
+ # ACCOUNT_SIGNUP_FORM_CLASS is only abided by when the
+ # BaseSignupForm definition is loaded the first time on Django
+ # startup. @override_settings() has therefore no effect.
+ pass
+
+ User = get_user_model()
+ data = {
+ "username": "username",
+ "email": "user@example.com",
+ "password1": "very-secret",
+ "password2": "very-secret",
+ }
+ form = CustomSignupForm(data, email_required=True)
+
+ assert isinstance(User.username, DeferredAttribute)
+ form.is_valid()
+ assert isinstance(User.username, DeferredAttribute)
+
class AuthenticationBackendTests(TestCase):
def setUp(self):
@@ -1464,6 +1519,7 @@
assert mock_perform_login.called
+@override_settings(ACCOUNT_PREVENT_ENUMERATION=False)
class TestResetPasswordForm(TestCase):
def test_user_email_not_sent_inactive_user(self):
User = get_user_model()
@@ -1475,6 +1531,7 @@
self.assertFalse(form.is_valid())
+@override_settings(ACCOUNT_PREVENT_ENUMERATION=False)
class TestCVE2019_19844(TestCase):
global_request = RequestFactory().get("/")
@@ -1546,3 +1603,24 @@
resp = self._send_post_request(HTTP_ACCEPT="application/json")
self.assertEqual(200, resp.status_code)
self.assertEqual(settings.LOGIN_REDIRECT_URL, resp.json()["location"])
+
+
+@override_settings(
+ CACHES={
+ "default": {
+ "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+ },
+ },
+ ACCOUNT_RATE_LIMITS={"reset_password_email": "1/m"},
+)
+class RateLimitTests(TestCase):
+ def test_case_insensitive_password_reset(self):
+ get_user_model().objects.create(email="a@b.com")
+ resp = self.client.post(
+ reverse("account_reset_password"), data={"email": "a@b.com"}
+ )
+ assert resp.status_code == 302
+ resp = self.client.post(
+ reverse("account_reset_password"), data={"email": "A@B.COM"}
+ )
+ assert resp.status_code == 429
diff -Nru django-allauth-0.47.0/allauth/account/utils.py django-allauth-0.51.0/allauth/account/utils.py
--- django-allauth-0.47.0/allauth/account/utils.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/account/utils.py 2022-06-07 09:42:31.000000000 +0000
@@ -1,6 +1,5 @@
import unicodedata
from collections import OrderedDict
-from datetime import timedelta
from django.conf import settings
from django.contrib import messages
@@ -8,21 +7,18 @@
from django.core.exceptions import FieldDoesNotExist, ValidationError
from django.db import models
from django.db.models import Q
-from django.http import HttpResponseRedirect
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 ..exceptions import ImmediateHttpResponse
-from ..utils import (
+from allauth.account import app_settings, signals
+from allauth.account.adapter import get_adapter
+from allauth.exceptions import ImmediateHttpResponse
+from allauth.utils import (
get_request_param,
get_user_model,
import_callable,
valid_email_or_none,
)
-from . import app_settings, signals
-from .adapter import get_adapter
-from .app_settings import EmailVerificationMethod
def _unicode_ci_compare(s1, s2):
@@ -124,7 +120,7 @@
return user_field(user, app_settings.USER_MODEL_EMAIL_FIELD, *args)
-def _has_verified_for_login(user, email):
+def has_verified_email(user, email=None):
from .models import EmailAddress
emailaddress = None
@@ -161,40 +157,21 @@
# `user_signed_up` signal. Furthermore, social users should be
# stopped anyway.
adapter = get_adapter(request)
- if not user.is_active:
- return adapter.respond_user_inactive(request, user)
-
- if email_verification == EmailVerificationMethod.NONE:
- pass
- elif email_verification == EmailVerificationMethod.OPTIONAL:
- # In case of OPTIONAL verification: send on signup.
- if not _has_verified_for_login(user, email) and signup:
- send_email_confirmation(request, user, signup=signup, email=email)
- elif email_verification == EmailVerificationMethod.MANDATORY:
- if not _has_verified_for_login(user, email):
- send_email_confirmation(request, user, signup=signup, email=email)
- return adapter.respond_email_verification_sent(request, user)
try:
- adapter.login(request, user)
- response = HttpResponseRedirect(
- get_login_redirect_url(request, redirect_url, signup=signup)
- )
-
- if signal_kwargs is None:
- signal_kwargs = {}
- signals.user_logged_in.send(
- sender=user.__class__,
- request=request,
- response=response,
- user=user,
- **signal_kwargs,
- )
- adapter.add_message(
- request,
- messages.SUCCESS,
- "account/messages/logged_in.txt",
- {"user": user},
+ hook_kwargs = dict(
+ email_verification=email_verification,
+ redirect_url=redirect_url,
+ signal_kwargs=signal_kwargs,
+ signup=signup,
+ email=email,
)
+ response = adapter.pre_login(request, user, **hook_kwargs)
+ if response:
+ return response
+ adapter.login(request, user)
+ response = adapter.post_login(request, user, **hook_kwargs)
+ if response:
+ return response
except ImmediateHttpResponse as e:
response = e.response
return response
@@ -325,9 +302,9 @@
a cooldown period before sending a new mail. This cooldown period
can be configured in ACCOUNT_EMAIL_CONFIRMATION_COOLDOWN setting.
"""
- from .models import EmailAddress, EmailConfirmation
+ from .models import EmailAddress
- cooldown_period = timedelta(seconds=app_settings.EMAIL_CONFIRMATION_COOLDOWN)
+ adapter = get_adapter(request)
if not email:
email = user_email(user)
@@ -335,13 +312,9 @@
try:
email_address = EmailAddress.objects.get_for_user(user, email)
if not email_address.verified:
- if app_settings.EMAIL_CONFIRMATION_HMAC:
- send_email = True
- else:
- send_email = not EmailConfirmation.objects.filter(
- sent__gt=now() - cooldown_period,
- email_address=email_address,
- ).exists()
+ send_email = adapter.should_send_confirmation_mail(
+ request, email_address
+ )
if send_email:
email_address.send_confirmation(request, signup=signup)
else:
@@ -354,14 +327,14 @@
assert email_address
# At this point, if we were supposed to send an email we have sent it.
if send_email:
- get_adapter(request).add_message(
+ adapter.add_message(
request,
messages.INFO,
"account/messages/email_confirmation_sent.txt",
{"email": email},
)
if signup:
- get_adapter(request).stash_user(request, user_pk_to_url_str(user))
+ adapter.stash_user(request, user_pk_to_url_str(user))
def sync_user_email_addresses(user):
@@ -385,8 +358,9 @@
):
# Bail out
return
- EmailAddress.objects.create(
- user=user, email=email, primary=False, verified=False
+ # get_or_create() to gracefully handle races
+ EmailAddress.objects.get_or_create(
+ user=user, email=email, defaults={"primary": False, "verified": False}
)
diff -Nru django-allauth-0.47.0/allauth/account/views.py django-allauth-0.51.0/allauth/account/views.py
--- django-allauth-0.47.0/allauth/account/views.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/account/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -13,8 +13,11 @@
from django.views.generic.base import TemplateResponseMixin, TemplateView, View
from django.views.generic.edit import FormView
-from ..exceptions import ImmediateHttpResponse
-from ..utils import get_form_class, get_request_param
+from allauth import ratelimit
+from allauth.decorators import rate_limit
+from allauth.exceptions import ImmediateHttpResponse
+from allauth.utils import get_form_class, get_request_param
+
from . import app_settings, signals
from .adapter import get_adapter
from .forms import (
@@ -35,12 +38,12 @@
logout_on_password_change,
passthrough_next_redirect_url,
perform_login,
+ send_email_confirmation,
sync_user_email_addresses,
url_str_to_user_pk,
)
-INTERNAL_RESET_URL_KEY = "set-password"
INTERNAL_RESET_SESSION_KEY = "_password_reset_key"
@@ -214,6 +217,7 @@
return self.response_class(**response_kwargs)
+@method_decorator(rate_limit(action="signup"), name="dispatch")
class SignupView(
RedirectAuthenticatedUserMixin,
CloseableSignupMixin,
@@ -406,6 +410,7 @@
confirm_email = ConfirmEmailView.as_view()
+@method_decorator(rate_limit(action="manage_email"), name="dispatch")
class EmailView(AjaxCapableProcessFormViewMixin, FormView):
template_name = "account/email." + app_settings.TEMPLATE_EXTENSION
form_class = AddEmailForm
@@ -450,7 +455,7 @@
res = self._action_remove(request)
elif "action_primary" in request.POST:
res = self._action_primary(request)
- res = res or HttpResponseRedirect(self.success_url)
+ res = res or HttpResponseRedirect(self.get_success_url())
# Given that we bypassed AjaxCapableProcessFormViewMixin,
# we'll have to call invoke it manually...
res = _ajax_response(request, res, data=self._get_ajax_data_if())
@@ -460,34 +465,29 @@
res = _ajax_response(request, res, data=self._get_ajax_data_if())
return res
- def _action_send(self, request, *args, **kwargs):
+ def _get_email_address(self, request):
email = request.POST["email"]
try:
- email_address = EmailAddress.objects.get(
- user=request.user,
- email=email,
- )
- get_adapter(request).add_message(
- request,
- messages.INFO,
- "account/messages/email_confirmation_sent.txt",
- {"email": email},
- )
- email_address.send_confirmation(request)
- return HttpResponseRedirect(self.get_success_url())
+ return EmailAddress.objects.get_for_user(user=request.user, email=email)
except EmailAddress.DoesNotExist:
pass
+ def _action_send(self, request, *args, **kwargs):
+ email_address = self._get_email_address(request)
+ if email_address:
+ send_email_confirmation(
+ self.request, request.user, email=email_address.email
+ )
+
def _action_remove(self, request, *args, **kwargs):
- email = request.POST["email"]
- try:
- email_address = EmailAddress.objects.get(user=request.user, email=email)
+ email_address = self._get_email_address(request)
+ if email_address:
if email_address.primary:
get_adapter(request).add_message(
request,
messages.ERROR,
"account/messages/cannot_delete_primary_email.txt",
- {"email": email},
+ {"email": email_address.email},
)
else:
email_address.delete()
@@ -501,18 +501,13 @@
request,
messages.SUCCESS,
"account/messages/email_deleted.txt",
- {"email": email},
+ {"email": email_address.email},
)
return HttpResponseRedirect(self.get_success_url())
- except EmailAddress.DoesNotExist:
- pass
def _action_primary(self, request, *args, **kwargs):
- email = request.POST["email"]
- try:
- email_address = EmailAddress.objects.get_for_user(
- user=request.user, email=email
- )
+ email_address = self._get_email_address(request)
+ if email_address:
# Not primary=True -- Slightly different variation, don't
# require verified unless moving from a verified
# address. Ignore constraint if previous primary email
@@ -551,8 +546,6 @@
to_email_address=email_address,
)
return HttpResponseRedirect(self.get_success_url())
- except EmailAddress.DoesNotExist:
- pass
def get_context_data(self, **kwargs):
ret = super(EmailView, self).get_context_data(**kwargs)
@@ -579,6 +572,7 @@
email = login_required(EmailView.as_view())
+@method_decorator(rate_limit(action="change_password"), name="dispatch")
class PasswordChangeView(AjaxCapableProcessFormViewMixin, FormView):
template_name = "account/password_change." + app_settings.TEMPLATE_EXTENSION
form_class = ChangePasswordForm
@@ -629,6 +623,12 @@
password_change = login_required(PasswordChangeView.as_view())
+@method_decorator(
+ # NOTE: 'change_password' (iso 'set_') is intentional, there is no need to
+ # differentiate between set and change.
+ rate_limit(action="change_password"),
+ name="dispatch",
+)
class PasswordSetView(AjaxCapableProcessFormViewMixin, FormView):
template_name = "account/password_set." + app_settings.TEMPLATE_EXTENSION
form_class = SetPasswordForm
@@ -677,6 +677,7 @@
password_set = login_required(PasswordSetView.as_view())
+@method_decorator(rate_limit(action="reset_password"), name="dispatch")
class PasswordResetView(AjaxCapableProcessFormViewMixin, FormView):
template_name = "account/password_reset." + app_settings.TEMPLATE_EXTENSION
form_class = ResetPasswordForm
@@ -687,6 +688,13 @@
return get_form_class(app_settings.FORMS, "reset_password", self.form_class)
def form_valid(self, form):
+ r429 = ratelimit.consume_or_429(
+ self.request,
+ action="reset_password_email",
+ key=form.cleaned_data["email"].lower(),
+ )
+ if r429:
+ return r429
form.save(self.request)
return super(PasswordResetView, self).form_valid(form)
@@ -712,12 +720,14 @@
password_reset_done = PasswordResetDoneView.as_view()
+@method_decorator(rate_limit(action="reset_password_from_key"), name="dispatch")
class PasswordResetFromKeyView(
AjaxCapableProcessFormViewMixin, LogoutFunctionalityMixin, FormView
):
template_name = "account/password_reset_from_key." + app_settings.TEMPLATE_EXTENSION
form_class = ResetPasswordKeyForm
success_url = reverse_lazy("account_reset_password_from_key_done")
+ reset_url_key = "set-password"
def get_form_class(self):
return get_form_class(
@@ -728,7 +738,7 @@
self.request = request
self.key = key
- if self.key == INTERNAL_RESET_URL_KEY:
+ if self.key == self.reset_url_key:
self.key = self.request.session.get(INTERNAL_RESET_SESSION_KEY, "")
# (Ab)using forms here to be able to handle errors in XHR #890
token_form = UserTokenForm(data={"uidb36": uidb36, "key": self.key})
@@ -756,9 +766,7 @@
# avoids the possibility of leaking the key in the
# HTTP Referer header.
self.request.session[INTERNAL_RESET_SESSION_KEY] = self.key
- redirect_url = self.request.path.replace(
- self.key, INTERNAL_RESET_URL_KEY
- )
+ redirect_url = self.request.path.replace(self.key, self.reset_url_key)
return redirect(redirect_url)
self.reset_user = None
diff -Nru django-allauth-0.47.0/allauth/app_settings.py django-allauth-0.51.0/allauth/app_settings.py
--- django-allauth-0.47.0/allauth/app_settings.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/app_settings.py 2022-06-07 09:42:31.000000000 +0000
@@ -1,6 +1,7 @@
from django.conf import settings
+SITES_ENABLED = "django.contrib.sites" in settings.INSTALLED_APPS
SOCIALACCOUNT_ENABLED = "allauth.socialaccount" in settings.INSTALLED_APPS
LOGIN_REDIRECT_URL = getattr(settings, "LOGIN_REDIRECT_URL", "/")
diff -Nru django-allauth-0.47.0/allauth/decorators.py django-allauth-0.51.0/allauth/decorators.py
--- django-allauth-0.47.0/allauth/decorators.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/decorators.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,25 @@
+from functools import wraps
+
+from allauth import ratelimit
+
+
+def rate_limit(*, action, **rl_kwargs):
+ from allauth.account import app_settings
+
+ rate = app_settings.RATE_LIMITS.get(action)
+ if rate:
+ rate = ratelimit.parse(rate)
+ rl_kwargs.setdefault("duration", rate.duration)
+ rl_kwargs.setdefault("amount", rate.amount)
+
+ def decorator(function):
+ @wraps(function)
+ def wrap(request, *args, **kwargs):
+ resp = ratelimit.consume_or_429(request, action=action, **rl_kwargs)
+ if not resp:
+ resp = function(request, *args, **kwargs)
+ return resp
+
+ return wrap
+
+ return decorator
diff -Nru django-allauth-0.47.0/allauth/__init__.py django-allauth-0.51.0/allauth/__init__.py
--- django-allauth-0.47.0/allauth/__init__.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/__init__.py 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
"""
-VERSION = (0, 47, 0, "final", 0)
+VERSION = (0, 51, 0, "final", 0)
__title__ = "django-allauth"
__version_info__ = VERSION
@@ -17,4 +17,4 @@
)
__author__ = "Raymond Penners"
__license__ = "MIT"
-__copyright__ = "Copyright 2010-2021 Raymond Penners and contributors"
+__copyright__ = "Copyright 2010-2022 Raymond Penners and contributors"
diff -Nru django-allauth-0.47.0/allauth/locale/ar/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/ar/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/ar/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/ar/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2016-01-19 19:32+0100\n"
"Last-Translator: David D Lowe \n"
"Language-Team: Arabic\n"
@@ -19,19 +19,19 @@
"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Poedit 1.8.6\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "اسم المستخدم غير مسموح به. الرجاء اختيار اسم اخر."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "تجاوزت الحد المسموح لمحاولة تسجيل الدخول, حاول في وقت لاحق"
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "هنالك مستخدم مسجل سابقا مع نفس عنوان البريد الالكتروني."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "كلمة المرور يجب أن لا تقل عن {0} حروف."
@@ -40,11 +40,11 @@
msgid "Accounts"
msgstr "الحسابات"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "يجب عليك كتابة نفس كلمة المرور في كل مرة."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "كلمة السر"
@@ -64,13 +64,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "اسم المستخدم و / أو كلمة المرور الذي حددته غير صحيحة."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "عنوان البريد الالكتروني"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "البريد الالكتروني"
@@ -104,89 +104,89 @@
msgid "You must type the same email each time."
msgstr "يجب عليك كتابة نفس البريد الالكتروني في كل مرة."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "كلمة السر )مرة أخرى("
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "عنوان البريد الإلكتروني هذا بالفعل المقترنة مع هذا الحساب."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "عنوان البريد الإلكتروني هذا مقترن بالفعل بحساب آخر."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "حسابك ليس لديه عنوان البريد الإلكتروني تحققنا منها."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "كلمة المرور الحالية"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "كلمة المرور الجديدة"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "كلمة المرور الجديدة (مرة أخرى)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "الرجاء كتابة كلمة المرور الحالية الخاصة بك."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "لم يتم تعيين عنوان البريد الإلكتروني لأي حساب مستخدم"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "خطأ في شهادة اعادة تعيين كلمة المرور."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "مستخدم"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "عنوان بريد إلكتروني"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "تمّ تحقيقه"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "أوّلي"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "عنوان بريد الكتروني"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "عناوين البريد الالكتروني"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "تمّ إنشاؤه"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "تم ارساله"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "مفتاح"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "تأكيد البريد الإلكتروني"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "تأكيدات البريد الإلكتروني"
@@ -211,91 +211,91 @@
msgid "Social Accounts"
msgstr "حسابات التواصل الاجتماعية"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "مزود"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "اسم"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr ""
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "تطبيق اجتماعي"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "تطبيقات اجتماعية"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "أخر دخول"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "تاريخ الانضمام"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "بيانات اضافية"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "حساب تواصل اجتماعي"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "حسابات تواصل اجتماعي"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "ينتهي في"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -304,11 +304,13 @@
msgstr "معلومات بروفايل غير صالحة"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr ""
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr ""
@@ -466,9 +468,36 @@
msgstr "في حال كنت قد نسيت اسم المستخدم الخاص بك هو %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "البريد الإلكتروني لإعادة تعيين كلمة المرور"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"مرحبا من %(site_name)s!\n"
+"\n"
+"أنت تتلقى هذه الرسالة بسبب طلبك أو طلب شخص أخرالحصول على كلمة المرور الخاصة "
+"بك.\n"
+"اذا لم تقم بطلب كلمة مرور يمكنك تجاهل هذه الريالة. اضغط على الرابط بالاسفل "
+"لاعادة تعيين كلمة المرور."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -497,7 +526,7 @@
" إصدار البريد الإلكتروني طلب تأكيد الجديدة ."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "تسجيل الدخول"
@@ -619,12 +648,17 @@
"يرجى الاتصال بنا إذا كان لديك أي مشكلة في إعادة تعيين كلمة المرور الخاصة بك."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"لقد قمنا بإرسال رسالة اليك عبر البريد الإلكتروني. يرجى الاتصال بنا اذا كنت "
-"لا تتلقى في غضون بضع دقائق."
+"لقد أرسلنا رسالة بريد إلكتروني لك للتحقق. الرجاء النقر فوق الارتباط داخل هذا "
+"البريد الإلكتروني. يرجى الاتصال بنا إذا كنت لا تحصل عليه في غضون دقائق قليلة."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -640,11 +674,10 @@
"كان رابط إعادة تعيين كلمة المرور غير صالحة، ربما لأنه قد تم استخدامه مسبقا. "
"يرجى طلب كلمة المرور الجديدة."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "تم تغيير كلمة المرور الخاصة بك"
@@ -695,10 +728,16 @@
msgstr "التحقق من عنوان البريد الإلكتروني الخاص بك"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"لقد أرسلنا رسالة بريد إلكتروني لك للتحقق. اتبع الارتباط المتوفر لإتمام عملية "
"التسجيل. يرجى الاتصال بنا إذا كنت لا تحصل عليه في غضون دقائق قليلة."
@@ -713,9 +752,16 @@
"ملكيتك لعنوان البريد الإلكتروني الخاص بك."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"لقد أرسلنا رسالة بريد إلكتروني لك للتحقق. الرجاء النقر فوق الارتباط داخل هذا "
@@ -767,27 +813,27 @@
msgid "Add a 3rd Party Account"
msgstr "إضافة حساب طرف الثالث"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -828,6 +874,13 @@
"أنت على وشك استخدام حسابك من %(provider_name)s لتسجيل الدخول إلى "
"%(site_name)s. وكخطوة أخيرة، يرجى ملء النموذج التالي:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "لقد قمنا بإرسال رسالة اليك عبر البريد الإلكتروني. يرجى الاتصال بنا اذا "
+#~ "كنت لا تتلقى في غضون بضع دقائق."
+
#~ msgid "Account"
#~ msgstr "حساب"
diff -Nru django-allauth-0.47.0/allauth/locale/bg/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/bg/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/bg/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/bg/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,833 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR , YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: LANGUAGE \n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: account/adapter.py:47
+msgid "Username can not be used. Please use other username."
+msgstr ""
+"Това потребителско име не може да бъде използвано. Моля, изберете друго."
+
+#: account/adapter.py:53
+msgid "Too many failed login attempts. Try again later."
+msgstr "Твърде много неуспешни опити за влизане. Опитайте отново по-късно."
+
+#: account/adapter.py:55
+msgid "A user is already registered with this e-mail address."
+msgstr "Вече има регистриран потребител с този e-mail адрес."
+
+#: account/adapter.py:304
+#, python-brace-format
+msgid "Password must be a minimum of {0} characters."
+msgstr "Паролата трябва да бъде поне {0} символа."
+
+#: account/apps.py:7
+msgid "Accounts"
+msgstr "Акаунти"
+
+#: account/forms.py:59 account/forms.py:416
+msgid "You must type the same password each time."
+msgstr "Трябва да въведете една и съща парола."
+
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
+msgid "Password"
+msgstr "Парола"
+
+#: account/forms.py:93
+msgid "Remember Me"
+msgstr "Запомни ме"
+
+#: account/forms.py:97
+msgid "This account is currently inactive."
+msgstr "Този акаунт в момента е неактивен."
+
+#: account/forms.py:99
+msgid "The e-mail address and/or password you specified are not correct."
+msgstr "E-mail адресът и/или паролата, които въведохте, са грешни."
+
+#: account/forms.py:102
+msgid "The username and/or password you specified are not correct."
+msgstr "Потребителското име и/или паролата, които въведохте, са грешни."
+
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
+msgid "E-mail address"
+msgstr "E-mail адрес"
+
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
+msgid "E-mail"
+msgstr "E-mail"
+
+#: account/forms.py:120 account/forms.py:123 account/forms.py:269
+#: account/forms.py:272
+msgid "Username"
+msgstr "Потребителско име"
+
+#: account/forms.py:133
+msgid "Username or e-mail"
+msgstr "Потребителско име или e-mail"
+
+#: account/forms.py:136
+msgctxt "field label"
+msgid "Login"
+msgstr "Акаунт"
+
+#: account/forms.py:307
+msgid "E-mail (again)"
+msgstr "E-mail (отново)"
+
+#: account/forms.py:311
+msgid "E-mail address confirmation"
+msgstr "Потвърждение на e-mail адрес"
+
+#: account/forms.py:319
+msgid "E-mail (optional)"
+msgstr "E-mail (опционален)"
+
+#: account/forms.py:359
+msgid "You must type the same email each time."
+msgstr "Трябва да въведете един и същ email."
+
+#: account/forms.py:385 account/forms.py:502
+msgid "Password (again)"
+msgstr "Парола (отново)"
+
+#: account/forms.py:451
+msgid "This e-mail address is already associated with this account."
+msgstr "Този e-mail адрес вече е свързан с този акаунт."
+
+#: account/forms.py:454
+msgid "This e-mail address is already associated with another account."
+msgstr "Този e-mail адрес вече е свързан с друг акаунт."
+
+#: account/forms.py:456
+#, python-format
+msgid "You cannot add more than %d e-mail addresses."
+msgstr "Не можете да добавяте повече от %d e-mail адреса."
+
+#: account/forms.py:481
+msgid "Current Password"
+msgstr "Текуща парола"
+
+#: account/forms.py:483 account/forms.py:588
+msgid "New Password"
+msgstr "Нова парола"
+
+#: account/forms.py:484 account/forms.py:589
+msgid "New Password (again)"
+msgstr "Нова парола (отново)"
+
+#: account/forms.py:492
+msgid "Please type your current password."
+msgstr "Моля, въведете вашата текуща парола."
+
+#: account/forms.py:532
+msgid "The e-mail address is not assigned to any user account"
+msgstr "Няма потребител с този e-mail адрес."
+
+#: account/forms.py:610
+msgid "The password reset token was invalid."
+msgstr "Невалиден код за възстановяване на парола."
+
+#: account/models.py:19
+msgid "user"
+msgstr "потребител"
+
+#: account/models.py:25 account/models.py:80
+msgid "e-mail address"
+msgstr "e-mail адрес"
+
+#: account/models.py:27
+msgid "verified"
+msgstr "потвърден"
+
+#: account/models.py:28
+msgid "primary"
+msgstr "основен"
+
+#: account/models.py:33
+msgid "email address"
+msgstr "email адрес"
+
+#: account/models.py:34
+msgid "email addresses"
+msgstr "email адреси"
+
+#: account/models.py:83
+msgid "created"
+msgstr "създадено"
+
+#: account/models.py:84
+msgid "sent"
+msgstr "изпратено"
+
+#: account/models.py:85 socialaccount/models.py:59
+msgid "key"
+msgstr "ключ"
+
+#: account/models.py:90
+msgid "email confirmation"
+msgstr "email потвърждение"
+
+#: account/models.py:91
+msgid "email confirmations"
+msgstr "email потвърждения"
+
+#: 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:131
+msgid "Your account has no password set up."
+msgstr "Вашият акаунт няма парола."
+
+#: socialaccount/adapter.py:138
+msgid "Your account has no verified e-mail address."
+msgstr "Вашият акаунт няма потвърден e-mail адрес."
+
+#: socialaccount/apps.py:7
+msgid "Social Accounts"
+msgstr "Социални акаунти"
+
+#: socialaccount/models.py:42 socialaccount/models.py:86
+msgid "provider"
+msgstr "доставчик"
+
+#: socialaccount/models.py:46
+msgid "name"
+msgstr "име"
+
+#: socialaccount/models.py:48
+msgid "client id"
+msgstr "id на клиент"
+
+#: socialaccount/models.py:50
+msgid "App ID, or consumer key"
+msgstr "ID на приложение, или ключ на консуматор"
+
+#: socialaccount/models.py:53
+msgid "secret key"
+msgstr "таен ключ"
+
+#: socialaccount/models.py:56
+msgid "API secret, client secret, or consumer secret"
+msgstr "таен ключ на API, клиент или консуматор"
+
+#: socialaccount/models.py:59
+msgid "Key"
+msgstr "Ключ"
+
+#: socialaccount/models.py:76
+msgid "social application"
+msgstr "социално приложение"
+
+#: socialaccount/models.py:77
+msgid "social applications"
+msgstr "социални приложения"
+
+#: socialaccount/models.py:107
+msgid "uid"
+msgstr "uid"
+
+#: socialaccount/models.py:109
+msgid "last login"
+msgstr "последно влизане"
+
+#: socialaccount/models.py:110
+msgid "date joined"
+msgstr "дата на регистрация"
+
+#: socialaccount/models.py:111
+msgid "extra data"
+msgstr "допълнителни данни"
+
+#: socialaccount/models.py:115
+msgid "social account"
+msgstr "социален акаунт"
+
+#: socialaccount/models.py:116
+msgid "social accounts"
+msgstr "социални акаунти"
+
+#: socialaccount/models.py:143
+msgid "token"
+msgstr "код"
+
+#: socialaccount/models.py:144
+msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
+msgstr "\"oauth_token\" (OAuth1) или access token (OAuth2)"
+
+#: socialaccount/models.py:148
+msgid "token secret"
+msgstr "таен код"
+
+#: socialaccount/models.py:149
+msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
+msgstr "\"oauth_token_secret\" (OAuth1) или refresh token (OAuth2)"
+
+#: socialaccount/models.py:152
+msgid "expires at"
+msgstr "изтича"
+
+#: socialaccount/models.py:157
+msgid "social application token"
+msgstr "код на социално приложение"
+
+#: socialaccount/models.py:158
+msgid "social application tokens"
+msgstr "кодове на социални приложения"
+
+#: socialaccount/providers/douban/views.py:36
+msgid "Invalid profile data"
+msgstr "Невалидни профилни данни"
+
+#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
+#, python-format
+msgid "Invalid response while obtaining request token from \"%s\"."
+msgstr "Грешен отговор при получаване на код за заявка от \"%s\"."
+
+#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
+#, python-format
+msgid "Invalid response while obtaining access token from \"%s\"."
+msgstr "Грешен отговор при получаване на код за достъп от \"%s\"."
+
+#: socialaccount/providers/oauth/client.py:138
+#, python-format
+msgid "No request token saved for \"%s\"."
+msgstr "Няма запазен код за заявка за \"%s\"."
+
+#: socialaccount/providers/oauth/client.py:189
+#, python-format
+msgid "No access token saved for \"%s\"."
+msgstr "Няма запазен код за достъп за \"%s\"."
+
+#: socialaccount/providers/oauth/client.py:210
+#, python-format
+msgid "No access to private resources at \"%s\"."
+msgstr "Няма достъп до лични данни при \"%s\"."
+
+#: templates/account/account_inactive.html:5
+#: templates/account/account_inactive.html:8
+msgid "Account Inactive"
+msgstr "Неактивен акаунт"
+
+#: templates/account/account_inactive.html:10
+msgid "This account is inactive."
+msgstr "Този акаунт е неактивен."
+
+#: templates/account/email.html:5 templates/account/email.html:8
+msgid "E-mail Addresses"
+msgstr "E-mail адреси"
+
+#: templates/account/email.html:10
+msgid "The following e-mail addresses are associated with your account:"
+msgstr "Следните e-mail адреси са свързани с вашия акаунт:"
+
+#: templates/account/email.html:24
+msgid "Verified"
+msgstr "Потвърден"
+
+#: templates/account/email.html:26
+msgid "Unverified"
+msgstr "Непотвърден"
+
+#: templates/account/email.html:28
+msgid "Primary"
+msgstr "Основен"
+
+#: templates/account/email.html:34
+msgid "Make Primary"
+msgstr "Направи основен"
+
+#: templates/account/email.html:35
+msgid "Re-send Verification"
+msgstr "Изпрати потвърждение отново"
+
+#: templates/account/email.html:36 templates/socialaccount/connections.html:35
+msgid "Remove"
+msgstr "Премахни"
+
+#: templates/account/email.html:43
+msgid "Warning:"
+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 ""
+"В момента нямате регистриран e-mail адрес. Препоръчително е да добавите e-"
+"mail адрес за да можете да получавате известия, да възстановявате паролата "
+"си, и т.н."
+
+#: templates/account/email.html:48
+msgid "Add E-mail Address"
+msgstr "Добяне на е-mail адрес"
+
+#: templates/account/email.html:53
+msgid "Add E-mail"
+msgstr "Добави e-mail"
+
+#: templates/account/email.html:63
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr "Наистина ли искате да премахнете избрания e-mail адрес?"
+
+#: templates/account/email/base_message.txt:1
+#, python-format
+msgid "Hello from %(site_name)s!"
+msgstr "Здравейте от %(site_name)s!"
+
+#: templates/account/email/base_message.txt:5
+#, python-format
+msgid ""
+"Thank you for using %(site_name)s!\n"
+"%(site_domain)s"
+msgstr ""
+"Благодарим, че ползвате %(site_name)s!\n"
+"%(site_domain)s"
+
+#: templates/account/email/email_confirmation_message.txt:5
+#, python-format
+msgid ""
+"You're receiving this e-mail because user %(user_display)s has given your e-"
+"mail address to register an account on %(site_domain)s.\n"
+"\n"
+"To confirm this is correct, go to %(activate_url)s"
+msgstr ""
+"Получавате този e-mail, защото потребител %(user_display)s е дал вашия e-"
+"mail адрес за да регистрира акаунт в %(site_domain)s.\n"
+"\n"
+"За да потвърдите, че това е вярно, посетете %(activate_url)s"
+
+#: templates/account/email/email_confirmation_subject.txt:3
+msgid "Please Confirm Your E-mail Address"
+msgstr "Моля, потвърдете вашия e-mail адрес"
+
+#: templates/account/email/password_reset_key_message.txt:4
+msgid ""
+"You're receiving this e-mail because you or someone else has requested a "
+"password for your user account.\n"
+"It can be safely ignored if you did not request a password reset. Click the "
+"link below to reset your password."
+msgstr ""
+"Получавате този e-mail, защото вие или някой друг е поискал парола за вашия "
+"потребителски акаунт.\n"
+"Можете да го пренебрегнете, ако не сте поискали възстановяване на парола. "
+"Кликнете линка по-долу за да възстановите вашата парола."
+
+#: templates/account/email/password_reset_key_message.txt:9
+#, python-format
+msgid "In case you forgot, your username is %(username)s."
+msgstr "В случай, че сте забравили, вашето потребителско име е %(username)s."
+
+#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
+msgid "Password Reset E-mail"
+msgstr "Възстановяване на парола"
+
+#: templates/account/email/unknown_account_message.txt:4
+#, python-format
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Получавате този e-mail, защото вие или някой друг е поискал парола за вашия "
+"потребителски акаунт.\n"
+"На сървъра обаче не беше намерен потребител свързван с електронния адрес "
+"%(email)s.\n"
+"\n"
+"Можете да пренебрегнете това писмо, ако не сте поискали възстановяване на "
+"парола. Кликнете линка по-долу, за да направите нов акаунт."
+
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr "Потвърждение на e-mail адрес"
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid ""
+"Please confirm that %(email)s is an e-mail "
+"address for user %(user_display)s."
+msgstr ""
+"Моля, потвърдете, че %(email)s е e-mail "
+"адрес на потребител %(user_display)s."
+
+#: templates/account/email_confirm.html:20
+msgid "Confirm"
+msgstr "Потвърди"
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid ""
+"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 templates/socialaccount/login.html:4
+msgid "Sign In"
+msgstr "Вход"
+
+#: templates/account/login.html:15
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts. Or, sign "
+"up\n"
+"for a %(site_name)s account and sign in below:"
+msgstr ""
+"Моля, влезте с някой\n"
+"от съществуващите ви външни акаунти. Или се "
+"регистрирайте\n"
+"за %(site_name)s акаунт и влезте по-долу:"
+
+#: templates/account/login.html:25
+msgid "or"
+msgstr "или"
+
+#: templates/account/login.html:32
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"sign up first."
+msgstr ""
+"Ако все още не сте създали акаунт, моля,\n"
+"регистрирайте се."
+
+#: templates/account/login.html:42 templates/account/password_change.html:14
+msgid "Forgot Password?"
+msgstr "Забравена парола?"
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr "Изход"
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+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)."
+
+#: templates/account/messages/email_confirmation_sent.txt:2
+#, python-format
+msgid "Confirmation e-mail sent to %(email)s."
+msgstr "Потвърждение на e-mail адрес изпратено на %(email)s."
+
+#: templates/account/messages/email_confirmed.txt:2
+#, python-format
+msgid "You have confirmed %(email)s."
+msgstr "Потвърдихте e-mail адрес %(email)s."
+
+#: templates/account/messages/email_deleted.txt:2
+#, python-format
+msgid "Removed e-mail address %(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."
+
+#: templates/account/messages/logged_out.txt:2
+msgid "You have signed out."
+msgstr "Излязохте."
+
+#: templates/account/messages/password_changed.txt:2
+msgid "Password successfully changed."
+msgstr "Паролата беше сменена успешно."
+
+#: templates/account/messages/password_set.txt:2
+msgid "Password successfully set."
+msgstr "Паролата беше запазена успешно."
+
+#: templates/account/messages/primary_email_set.txt:2
+msgid "Primary e-mail address set."
+msgstr "Основният e-mail адрес беше избран."
+
+#: templates/account/messages/unverified_primary_email.txt:2
+msgid "Your primary e-mail address must be verified."
+msgstr "Основният ви e-mail адрес трябва да бъде потвърден."
+
+#: templates/account/password_change.html:5
+#: templates/account/password_change.html:8
+#: templates/account/password_change.html:13
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
+#: templates/account/password_reset_from_key_done.html:4
+#: templates/account/password_reset_from_key_done.html:7
+msgid "Change Password"
+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 "Възстановяване на парола"
+
+#: 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 как да я възстановите."
+
+#: templates/account/password_reset.html:20
+msgid "Reset My Password"
+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. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
+msgstr ""
+"Изпратихме ви електронно писмо. То може да пристигнало в папката Спам. Моля, "
+"свържете се с нас, ако не го получите до няколко минути."
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr "Грешен код"
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used. Please request a new password reset"
+"a>."
+msgstr ""
+"Линкът за възстановяване на парола е невалиден, може би защото вече е бил "
+"използван. Моля, заявете ново "
+"възстановяване на парола."
+
+#: templates/account/password_reset_from_key.html:16
+msgid "change password"
+msgstr "смени паролата"
+
+#: templates/account/password_reset_from_key_done.html:8
+msgid "Your password is now changed."
+msgstr "Паролата ви е сменена."
+
+#: templates/account/password_set.html:5 templates/account/password_set.html:8
+#: templates/account/password_set.html:13
+msgid "Set Password"
+msgstr "Създаване на парола"
+
+#: templates/account/signup.html:5 templates/socialaccount/signup.html:5
+msgid "Signup"
+msgstr "Регистрация"
+
+#: templates/account/signup.html:8 templates/account/signup.html:18
+#: templates/socialaccount/signup.html:8 templates/socialaccount/signup.html:19
+msgid "Sign Up"
+msgstr "Регистрация"
+
+#: templates/account/signup.html:10
+#, python-format
+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 "Регистрацията е затворена"
+
+#: templates/account/signup_closed.html:10
+msgid "We are sorry, but the sign up is currently closed."
+msgstr "Съжаляваме, но в момента регистрацията е затворена."
+
+#: templates/account/snippets/already_logged_in.html:5
+msgid "Note"
+msgstr "Забележка"
+
+#: templates/account/snippets/already_logged_in.html:5
+#, python-format
+msgid "you are already logged in as %(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 адрес"
+
+#: templates/account/verification_sent.html:10
+msgid ""
+"We have sent an e-mail to you for verification. Follow the link provided to "
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
+msgstr ""
+"Изпратихме ви e-mail за потвърждение. Последвайте посочения в него линк за "
+"да завършите процеса на регистрация. То може да е пристигнало в папката "
+"Спам. Моля, свържете се с нас, ако не го получите до няколко минути."
+
+#: templates/account/verified_email_required.html:12
+msgid ""
+"This part of the site requires us to verify that\n"
+"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 адрес. "
+
+#: templates/account/verified_email_required.html:16
+msgid ""
+"We have sent an e-mail to you for\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
+"contact us if you do not receive it within a few minutes."
+msgstr ""
+"Изпратихме ви e-mail за потвърждение. То може да е попаднало в папката Спам. "
+"Моля, кликнете линка в него. Свържете се с нас, ако не го получите до "
+"няколко минути."
+
+#: templates/account/verified_email_required.html:20
+#, python-format
+msgid ""
+"Note: you can still change your e-"
+"mail address."
+msgstr ""
+"Забележка: можете да смените "
+"вашия e-mail адрес."
+
+#: templates/openid/login.html:9
+msgid "OpenID Sign In"
+msgstr "Вход с OpenID"
+
+#: templates/socialaccount/authentication_error.html:5
+#: templates/socialaccount/authentication_error.html:8
+msgid "Social Network Login Failure"
+msgstr "Грешка при вход чрез социална мрежа"
+
+#: templates/socialaccount/authentication_error.html:10
+msgid ""
+"An error occurred while attempting to login via your social network account."
+msgstr ""
+"Възникна грешка при опита за влизане чрез вашия акаунт от социална мрежа."
+
+#: templates/socialaccount/connections.html:5
+#: templates/socialaccount/connections.html:8
+msgid "Account Connections"
+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 "Добавяне на външен акаунт"
+
+#: templates/socialaccount/login.html:8
+#, python-format
+msgid "Connect %(provider)s"
+msgstr ""
+
+#: templates/socialaccount/login.html:10
+#, python-format
+msgid "You are about to connect a new third party account from %(provider)s."
+msgstr ""
+
+#: templates/socialaccount/login.html:12
+#, python-format
+msgid "Sign In Via %(provider)s"
+msgstr ""
+
+#: templates/socialaccount/login.html:14
+#, python-format
+msgid "You are about to sign in using a third party account from %(provider)s."
+msgstr ""
+
+#: templates/socialaccount/login.html:19
+msgid "Continue"
+msgstr ""
+
+#: templates/socialaccount/login_cancelled.html:5
+#: templates/socialaccount/login_cancelled.html:9
+msgid "Login Cancelled"
+msgstr "Вход прекъснат"
+
+#: templates/socialaccount/login_cancelled.html:13
+#, python-format
+msgid ""
+"You decided to cancel logging in to our site using one of your existing "
+"accounts. If this was a mistake, please proceed to sign in."
+msgstr ""
+"Прекъснахте влизането в нашия сайт чрез ваш съществуващ акаунт. Ако това е "
+"било грешка, моля, влезте."
+
+#: templates/socialaccount/messages/account_connected.txt:2
+msgid "The social account has been connected."
+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 "Социалният акаунт беше изключен."
+
+#: templates/socialaccount/signup.html:10
+#, python-format
+msgid ""
+"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. Като последна стъпка, моля, попълнете следната форма:"
diff -Nru django-allauth-0.47.0/allauth/locale/ca/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/ca/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/ca/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/ca/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,853 @@
+# DJANGO-ALLAUTH.
+# Copyright (C) 2016
+# This file is distributed under the same license as the django-allauth package.
+#
+# Translators:
+# Marc Seguí Coll , 2022.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: django-allauth\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: Marc Seguí Coll \n"
+"Language-Team: Català \n"
+"Language: ca\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"
+
+#: account/adapter.py:47
+msgid "Username can not be used. Please use other username."
+msgstr ""
+"Aquest nom d'usuari no pot ser emprat. Si us plau utilitzeu-ne un altre."
+
+#: account/adapter.py:53
+msgid "Too many failed login attempts. Try again later."
+msgstr "Massa intents fallits. Intenteu-ho de nou més tard."
+
+#: account/adapter.py:55
+msgid "A user is already registered with this e-mail address."
+msgstr ""
+"Un usuari ja ha estat registrat amb aquesta direcció de correu electrònic."
+
+#: account/adapter.py:304
+#, python-brace-format
+msgid "Password must be a minimum of {0} characters."
+msgstr "La contrasenya ha de contenir al menys {0} caràcters."
+
+#: account/apps.py:7
+msgid "Accounts"
+msgstr "Comptes"
+
+#: account/forms.py:59 account/forms.py:416
+msgid "You must type the same password each time."
+msgstr "Heu d'escriure la mateixa contrasenya cada cop."
+
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
+msgid "Password"
+msgstr "Contrasenya"
+
+#: account/forms.py:93
+msgid "Remember Me"
+msgstr "Recordar-me"
+
+#: account/forms.py:97
+msgid "This account is currently inactive."
+msgstr "Ara mateix aquest compte està inactiu."
+
+#: account/forms.py:99
+msgid "The e-mail address and/or password you specified are not correct."
+msgstr ""
+"El correu electrònic i/o la contrasenya que heu especificat no són correctes."
+
+#: account/forms.py:102
+msgid "The username and/or password you specified are not correct."
+msgstr "L'usuari i/o la contrasenya que heu especificat no són correctes."
+
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
+msgid "E-mail address"
+msgstr "Correu electrònic"
+
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
+msgid "E-mail"
+msgstr "Correu electrònic"
+
+#: account/forms.py:120 account/forms.py:123 account/forms.py:269
+#: account/forms.py:272
+msgid "Username"
+msgstr "Nom d'usuari"
+
+#: account/forms.py:133
+msgid "Username or e-mail"
+msgstr "Nom d'usuari o correu electrònic"
+
+#: account/forms.py:136
+msgctxt "field label"
+msgid "Login"
+msgstr "Iniciar sessió"
+
+#: account/forms.py:307
+msgid "E-mail (again)"
+msgstr "Correu electrònic (un altre cop)"
+
+#: account/forms.py:311
+msgid "E-mail address confirmation"
+msgstr "Confirmació de direcció de correu electrònic"
+
+#: account/forms.py:319
+msgid "E-mail (optional)"
+msgstr "Correu electrònic (opcional)"
+
+#: account/forms.py:359
+msgid "You must type the same email each time."
+msgstr "Heu d'escriure el mateix correu electrònic cada cop."
+
+#: account/forms.py:385 account/forms.py:502
+msgid "Password (again)"
+msgstr "Contrasenya (de nou)"
+
+#: account/forms.py:451
+msgid "This e-mail address is already associated with this account."
+msgstr "Aquest correu electrònic ja està associat amb aquest compte."
+
+#: account/forms.py:454
+msgid "This e-mail address is already associated with another account."
+msgstr "Aquest correu electrònic ja està associat amb un altre compte."
+
+#: account/forms.py:456
+#, python-format
+msgid "You cannot add more than %d e-mail addresses."
+msgstr "No es poden afegit més de %d adreces de correu electrònic."
+
+#: account/forms.py:481
+msgid "Current Password"
+msgstr "Contrasenya actual"
+
+#: account/forms.py:483 account/forms.py:588
+msgid "New Password"
+msgstr "Nova contrasenya"
+
+#: account/forms.py:484 account/forms.py:589
+msgid "New Password (again)"
+msgstr "Nova contrasenya (de nou)"
+
+#: account/forms.py:492
+msgid "Please type your current password."
+msgstr "Si us plau, escriviu la vostra contrasenya actual."
+
+#: account/forms.py:532
+msgid "The e-mail address is not assigned to any user account"
+msgstr "El correu electrònic no està assignat a cap compte d'usuari"
+
+#: account/forms.py:610
+msgid "The password reset token was invalid."
+msgstr "El token per reiniciar la contrasenya no és vàlid."
+
+#: account/models.py:19
+msgid "user"
+msgstr "usuari"
+
+#: account/models.py:25 account/models.py:80
+msgid "e-mail address"
+msgstr "correu electrònic"
+
+#: account/models.py:27
+msgid "verified"
+msgstr "verificat"
+
+#: account/models.py:28
+msgid "primary"
+msgstr "principal"
+
+#: account/models.py:33
+msgid "email address"
+msgstr "correu electrònic"
+
+#: account/models.py:34
+msgid "email addresses"
+msgstr "correus electrònics"
+
+#: account/models.py:83
+msgid "created"
+msgstr "creat"
+
+#: account/models.py:84
+msgid "sent"
+msgstr "enviat"
+
+#: account/models.py:85 socialaccount/models.py:59
+msgid "key"
+msgstr "clau"
+
+#: account/models.py:90
+msgid "email confirmation"
+msgstr "confirmació de correu electrònic"
+
+#: account/models.py:91
+msgid "email confirmations"
+msgstr "confirmacions de correu electrònic"
+
+#: 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 ""
+"Ja existeix un compte associat a aquesta adreça de correu electrònic. Si us "
+"plau, primer identifiqueu-vos utilitzant aquest compte, i després vinculeu "
+"el vostre compte %s."
+
+#: socialaccount/adapter.py:131
+msgid "Your account has no password set up."
+msgstr "El vostre compte no té una contrasenya definida."
+
+#: socialaccount/adapter.py:138
+msgid "Your account has no verified e-mail address."
+msgstr "El vostre compte no té un correu electrònic verificat."
+
+#: socialaccount/apps.py:7
+msgid "Social Accounts"
+msgstr "Comptes de xarxes socials"
+
+#: socialaccount/models.py:42 socialaccount/models.py:86
+msgid "provider"
+msgstr "proveïdor"
+
+#: socialaccount/models.py:46
+msgid "name"
+msgstr "nom"
+
+#: socialaccount/models.py:48
+msgid "client id"
+msgstr "identificador client"
+
+#: socialaccount/models.py:50
+msgid "App ID, or consumer key"
+msgstr "Identificador de App o clau de consumidor"
+
+#: socialaccount/models.py:53
+msgid "secret key"
+msgstr "clau secreta"
+
+#: socialaccount/models.py:56
+msgid "API secret, client secret, or consumer secret"
+msgstr ""
+"frase secrete de API, frase secreta client o frase secreta de consumidor"
+
+#: socialaccount/models.py:59
+msgid "Key"
+msgstr "Clau"
+
+#: socialaccount/models.py:76
+msgid "social application"
+msgstr "aplicació de xarxa social"
+
+#: socialaccount/models.py:77
+msgid "social applications"
+msgstr "aplicacions de xarxes socials"
+
+#: socialaccount/models.py:107
+msgid "uid"
+msgstr ""
+
+#: socialaccount/models.py:109
+msgid "last login"
+msgstr "darrer inici de sessió"
+
+#: socialaccount/models.py:110
+msgid "date joined"
+msgstr "data d'incorporació"
+
+#: socialaccount/models.py:111
+msgid "extra data"
+msgstr "dades extra"
+
+#: socialaccount/models.py:115
+msgid "social account"
+msgstr "compte de xarxa social"
+
+#: socialaccount/models.py:116
+msgid "social accounts"
+msgstr "comptes de xarxes socials"
+
+#: socialaccount/models.py:143
+msgid "token"
+msgstr ""
+
+#: socialaccount/models.py:144
+msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
+msgstr "\"oauth_token\" (OAuth1) o token d'accés (OAuth2)"
+
+#: socialaccount/models.py:148
+msgid "token secret"
+msgstr "frase secreta de token"
+
+#: socialaccount/models.py:149
+msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
+msgstr "\"oauth_token_secret\" (OAuth1) o token de refrescament (OAuth2)"
+
+#: socialaccount/models.py:152
+msgid "expires at"
+msgstr "expira el"
+
+#: socialaccount/models.py:157
+msgid "social application token"
+msgstr "token d'aplicació de xarxa social"
+
+#: socialaccount/models.py:158
+msgid "social application tokens"
+msgstr "tokens d'aplicació de xarxa social"
+
+#: socialaccount/providers/douban/views.py:36
+msgid "Invalid profile data"
+msgstr "Dades de perfil invàlides"
+
+#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
+#, python-format
+msgid "Invalid response while obtaining request token from \"%s\"."
+msgstr "Resposta invàlida a l'hora d'obtenir token de sol·licitud de \"%s\"."
+
+#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
+#, python-format
+msgid "Invalid response while obtaining access token from \"%s\"."
+msgstr "Resposta invàlida a l'hora d'obtenir token d'accés de \"%s\"."
+
+#: socialaccount/providers/oauth/client.py:138
+#, python-format
+msgid "No request token saved for \"%s\"."
+msgstr "No hi ha token de sol·licitud guardat per \"%s\"."
+
+#: socialaccount/providers/oauth/client.py:189
+#, python-format
+msgid "No access token saved for \"%s\"."
+msgstr "No hi ha token d'accés guardat per \"%s\"."
+
+#: socialaccount/providers/oauth/client.py:210
+#, python-format
+msgid "No access to private resources at \"%s\"."
+msgstr "Sense accés recursos privats de \"%s\"."
+
+#: templates/account/account_inactive.html:5
+#: templates/account/account_inactive.html:8
+msgid "Account Inactive"
+msgstr "Compte inactiu"
+
+#: templates/account/account_inactive.html:10
+msgid "This account is inactive."
+msgstr "Aquest compte està inactiu."
+
+#: templates/account/email.html:5 templates/account/email.html:8
+msgid "E-mail Addresses"
+msgstr "Adreces de correu electrònic"
+
+#: templates/account/email.html:10
+msgid "The following e-mail addresses are associated with your account:"
+msgstr ""
+"Les següents adreces de correu electrònic estan associades al vostre compte:"
+
+#: templates/account/email.html:24
+msgid "Verified"
+msgstr "Verificat"
+
+#: templates/account/email.html:26
+msgid "Unverified"
+msgstr "Sense verificar"
+
+#: templates/account/email.html:28
+msgid "Primary"
+msgstr "Principal"
+
+#: templates/account/email.html:34
+msgid "Make Primary"
+msgstr "Definir com a principal"
+
+#: templates/account/email.html:35
+msgid "Re-send Verification"
+msgstr "Reenviar Verificació"
+
+#: templates/account/email.html:36 templates/socialaccount/connections.html:35
+msgid "Remove"
+msgstr "Eliminar"
+
+#: templates/account/email.html:43
+msgid "Warning:"
+msgstr "Advertència:"
+
+#: 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 ""
+"Actualment no teniu cap adreça de correu electrònic definida. Hauríeu "
+"d'afegir una adreça de correu electrònic per poder rebre notificacions, "
+"restablir la contrasenya, etc."
+
+#: templates/account/email.html:48
+msgid "Add E-mail Address"
+msgstr "Afegir adreça de correu electrònic"
+
+#: templates/account/email.html:53
+msgid "Add E-mail"
+msgstr "Afegir correu electrònic"
+
+#: templates/account/email.html:63
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr ""
+"Esteu segurs de voler eliminar l'adreça de correu electrònic seleccionada?"
+
+#: templates/account/email/base_message.txt:1
+#, python-format
+msgid "Hello from %(site_name)s!"
+msgstr "Hola des de %(site_name)s!"
+
+#: templates/account/email/base_message.txt:5
+#, python-format
+msgid ""
+"Thank you for using %(site_name)s!\n"
+"%(site_domain)s"
+msgstr ""
+"Gràcies per utilitzar %(site_name)s!\n"
+"%(site_domain)s"
+
+#: templates/account/email/email_confirmation_message.txt:5
+#, python-format
+msgid ""
+"You're receiving this e-mail because user %(user_display)s has given your e-"
+"mail address to register an account on %(site_domain)s.\n"
+"\n"
+"To confirm this is correct, go to %(activate_url)s"
+msgstr ""
+"Heu rebut aquest missatge perquè l'usuari %(user_display)s ha proporcionat "
+"la vostra adreça per registrar un compte a %(site_domain)s.\n"
+"\n"
+"Per confirmar que això és correcte, seguiu aquest enllaç %(activate_url)s"
+
+#: templates/account/email/email_confirmation_subject.txt:3
+msgid "Please Confirm Your E-mail Address"
+msgstr "Si us plau, confirmeu la vostra adreça de correu electrònic"
+
+#: templates/account/email/password_reset_key_message.txt:4
+msgid ""
+"You're receiving this e-mail because you or someone else has requested a "
+"password for your user account.\n"
+"It can be safely ignored if you did not request a password reset. Click the "
+"link below to reset your password."
+msgstr ""
+"Heu rebut aquest correu electrònic perquè vosaltres o una altra persona heu "
+"sol·licitat una contrasenya per al vostre compte d'usuari.\n"
+"Es pot ignorar de forma segura si no es va sol·licitar el restabliment de "
+"contrasenya. Seguiu el següent enllaç per restablir la vostra contrasenya."
+
+#: templates/account/email/password_reset_key_message.txt:9
+#, python-format
+msgid "In case you forgot, your username is %(username)s."
+msgstr "En cas d'haver-lo oblidat, el vostre nom d'usuari és %(username)s."
+
+#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
+msgid "Password Reset E-mail"
+msgstr "Correu electrònic per restablir contrasenya"
+
+#: templates/account/email/unknown_account_message.txt:4
+#, python-format
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Has rebut aquest correu electrònic perquè vosaltres o algú altre heu "
+"sol·licitat una\n"
+"contrasenya per al vostre compte d'usuari. Tot i això, no tenim cap registre "
+"d'un usuari\n"
+"amb correu electrònic %(email)s a la nostra base de dades.\n"
+"\n"
+"Aquest correu es pot ignorar de forma segura si no heu sol·licitat un canvi "
+"de contrasenya.\n"
+"\n"
+"Si heu estat vosaltres, podeu registrar un compte d'usuari utilitzant el "
+"link de sota."
+
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr "Confirmar adreça de correu electrònic"
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid ""
+"Please confirm that %(email)s is an e-mail "
+"address for user %(user_display)s."
+msgstr ""
+"Si us plau confirmeu que %(email)s és una "
+"adreça de correu electrònic de l'usuari %(user_display)s."
+
+#: templates/account/email_confirm.html:20
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid ""
+"This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request."
+msgstr ""
+"Aquest enllaç de verificació de correu electrònic ha expirat o és invàlid. "
+"Si us plau, sol·liciteu una nova verificació per "
+"correu electrònic.."
+
+#: templates/account/login.html:6 templates/account/login.html:10
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
+msgid "Sign In"
+msgstr "Iniciar sessió"
+
+#: templates/account/login.html:15
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts. Or, sign "
+"up\n"
+"for a %(site_name)s account and sign in below:"
+msgstr ""
+"Si us plau, inicieu sessió amb un\n"
+"compte d'una altra xarxa social. O registreu-vos"
+"a> \n"
+"com a usuari de %(site_name)s i inicieu sessió a continuació:"
+
+#: templates/account/login.html:25
+msgid "or"
+msgstr "o"
+
+#: templates/account/login.html:32
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"sign up first."
+msgstr ""
+"Si encara no heu creat un compte, llavors si us plau\n"
+"registreu-vos primer."
+
+#: templates/account/login.html:42 templates/account/password_change.html:14
+msgid "Forgot Password?"
+msgstr "Heu oblidat la vostra contrasenya?"
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr "Tancar sessió"
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr "Esteu segurs de voler tancar sessió?"
+
+#: templates/account/messages/cannot_delete_primary_email.txt:2
+#, python-format
+msgid "You cannot remove your primary e-mail address (%(email)s)."
+msgstr "No podeu eliminar el vostre correu electrònic principal (%(email)s)."
+
+#: templates/account/messages/email_confirmation_sent.txt:2
+#, python-format
+msgid "Confirmation e-mail sent to %(email)s."
+msgstr "Correu electrònic de confirmació enviat a %(email)s."
+
+#: templates/account/messages/email_confirmed.txt:2
+#, python-format
+msgid "You have confirmed %(email)s."
+msgstr "Heu confirmat %(email)s."
+
+#: templates/account/messages/email_deleted.txt:2
+#, python-format
+msgid "Removed e-mail address %(email)s."
+msgstr "Eliminat correu electrònic %(email)s."
+
+#: templates/account/messages/logged_in.txt:4
+#, python-format
+msgid "Successfully signed in as %(name)s."
+msgstr "Heu iniciat sessió exitosament com a %(name)s."
+
+#: templates/account/messages/logged_out.txt:2
+msgid "You have signed out."
+msgstr "Heu tancat sessió."
+
+#: templates/account/messages/password_changed.txt:2
+msgid "Password successfully changed."
+msgstr "Contrasenya canviada amb èxit."
+
+#: templates/account/messages/password_set.txt:2
+msgid "Password successfully set."
+msgstr "Contrasenya establerta amb èxit."
+
+#: templates/account/messages/primary_email_set.txt:2
+msgid "Primary e-mail address set."
+msgstr "Adreça de correu electrònic principal establerta"
+
+#: templates/account/messages/unverified_primary_email.txt:2
+msgid "Your primary e-mail address must be verified."
+msgstr "La vostra adreça de correu electrònic principal ha de ser verificada."
+
+#: templates/account/password_change.html:5
+#: templates/account/password_change.html:8
+#: templates/account/password_change.html:13
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
+#: templates/account/password_reset_from_key_done.html:4
+#: templates/account/password_reset_from_key_done.html:7
+msgid "Change Password"
+msgstr "Canviar Contrasenya"
+
+#: 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 "Restablir Contrasenya"
+
+#: 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 ""
+"Heu oblidat la vostra contrasenya? Introduïu el vostre correu electrònic i "
+"us enviarem un correu que us permetrà restablir-la."
+
+#: templates/account/password_reset.html:20
+msgid "Reset My Password"
+msgstr "Restablir la meva contrasenya"
+
+#: templates/account/password_reset.html:23
+msgid "Please contact us if you have any trouble resetting your password."
+msgstr ""
+"Si us plau contacteu-nis si teniu algun problema per restablir la vostra "
+"contrasenya."
+
+#: templates/account/password_reset_done.html:15
+msgid ""
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
+msgstr ""
+"Us hem enviat un correu electrònic. Si us plau contacteu-nos si no el rebeu "
+"en uns minuts."
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr ""
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used. Please request a new password reset"
+"a>."
+msgstr ""
+"L'enllaç per restablir la contrasenya és invàlid, probablement porquè ja ha "
+"estat utilitzat. Si us plau soliciteu restablir la contrasenya novament."
+
+#: templates/account/password_reset_from_key.html:16
+msgid "change password"
+msgstr "canviar la contrasenya"
+
+#: templates/account/password_reset_from_key_done.html:8
+msgid "Your password is now changed."
+msgstr "La vostra contrasenya ha canviat."
+
+#: templates/account/password_set.html:5 templates/account/password_set.html:8
+#: templates/account/password_set.html:13
+msgid "Set Password"
+msgstr "Establir contrasenya"
+
+#: templates/account/signup.html:5 templates/socialaccount/signup.html:5
+msgid "Signup"
+msgstr "Registrar-se"
+
+#: templates/account/signup.html:8 templates/account/signup.html:18
+#: templates/socialaccount/signup.html:8 templates/socialaccount/signup.html:19
+msgid "Sign Up"
+msgstr "Registrar-se"
+
+#: templates/account/signup.html:10
+#, python-format
+msgid ""
+"Already have an account? Then please sign in."
+msgstr ""
+"Ja teniu un compte? Si us plau inicieu sessió."
+
+#: templates/account/signup_closed.html:5
+#: templates/account/signup_closed.html:8
+msgid "Sign Up Closed"
+msgstr "Registre tancat"
+
+#: templates/account/signup_closed.html:10
+msgid "We are sorry, but the sign up is currently closed."
+msgstr "Ho sentim, en aquest moment el registre está tancat."
+
+#: templates/account/snippets/already_logged_in.html:5
+msgid "Note"
+msgstr "Nota"
+
+#: templates/account/snippets/already_logged_in.html:5
+#, python-format
+msgid "you are already logged in as %(user_display)s."
+msgstr "ja heu iniciat sessió com a %(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 "Verifiqueu la vostra direcció de correu electrònic"
+
+#: templates/account/verification_sent.html:10
+msgid ""
+"We have sent an e-mail to you for verification. Follow the link provided to "
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
+msgstr ""
+"Us hem enviat un correu electrònic per la seva verificació. Seguiu l'enllaç "
+"per completar el procés de registre. Si us plau contacteu-nos si no el rebeu "
+"en uns minuts."
+
+#: templates/account/verified_email_required.html:12
+msgid ""
+"This part of the site requires us to verify that\n"
+"you are who you claim to be. For this purpose, we require that you\n"
+"verify ownership of your e-mail address. "
+msgstr ""
+"Aquesta part del lloc web requereix que verifiquem que sou qui dieu ser. Per "
+"això us requerim que verifiqueu la propietat del vostre correu electrònic. "
+
+#: templates/account/verified_email_required.html:16
+msgid ""
+"We have sent an e-mail to you for\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
+"contact us if you do not receive it within a few minutes."
+msgstr ""
+"Us hem enviat un correu electrònic per la vostra\n"
+"verificació. Si us plau accediu al link dins el correu electrònic. Si no "
+"veieu el correu de verificació a la vostra bústia principal, comproveu la "
+"carpeta d'spam. D'altra banda\n"
+"contacteu-nos si no el rebeu en uns minuts."
+
+#: templates/account/verified_email_required.html:20
+#, python-format
+msgid ""
+"Note: you can still change your e-"
+"mail address."
+msgstr ""
+"Nota: encara podeu canviar la "
+"vostra adreça de correu electrònic."
+
+#: templates/openid/login.html:9
+msgid "OpenID Sign In"
+msgstr "Iniciar sessió amb OpenID"
+
+#: templates/socialaccount/authentication_error.html:5
+#: templates/socialaccount/authentication_error.html:8
+msgid "Social Network Login Failure"
+msgstr "Error d'inici de sessió amb xarxa social"
+
+#: templates/socialaccount/authentication_error.html:10
+msgid ""
+"An error occurred while attempting to login via your social network account."
+msgstr ""
+"S'ha produït un error intentant iniciar sessió a través del vostre compte de "
+"xarxa social."
+
+#: templates/socialaccount/connections.html:5
+#: templates/socialaccount/connections.html:8
+msgid "Account Connections"
+msgstr "Connexions de Compte"
+
+#: templates/socialaccount/connections.html:11
+msgid ""
+"You can sign in to your account using any of the following third party "
+"accounts:"
+msgstr "Podeu iniciar sessió amb algun dels següents comptes externs:"
+
+#: templates/socialaccount/connections.html:43
+msgid ""
+"You currently have no social network accounts connected to this account."
+msgstr ""
+"Actualment no tens cap compte de xarxa social associat a aquest compte."
+
+#: templates/socialaccount/connections.html:46
+msgid "Add a 3rd Party Account"
+msgstr "Afegir un compte d'una xarxa social externa"
+
+#: templates/socialaccount/login.html:8
+#, python-format
+msgid "Connect %(provider)s"
+msgstr "Connectar %(provider)s"
+
+#: templates/socialaccount/login.html:10
+#, python-format
+msgid "You are about to connect a new third party account from %(provider)s."
+msgstr "Esteu a punt de connectar un nou compte extern des de %(provider)s."
+
+#: templates/socialaccount/login.html:12
+#, python-format
+msgid "Sign In Via %(provider)s"
+msgstr "Iniciar sessió via %(provider)s"
+
+#: templates/socialaccount/login.html:14
+#, python-format
+msgid "You are about to sign in using a third party account from %(provider)s."
+msgstr ""
+"Esteu a punt d'iniciar sessió utilitzant un compte extern des de "
+"%(provider)s."
+
+#: templates/socialaccount/login.html:19
+msgid "Continue"
+msgstr "Continuar"
+
+#: templates/socialaccount/login_cancelled.html:5
+#: templates/socialaccount/login_cancelled.html:9
+msgid "Login Cancelled"
+msgstr "Inici de sessió cancel·lat"
+
+#: templates/socialaccount/login_cancelled.html:13
+#, python-format
+msgid ""
+"You decided to cancel logging in to our site using one of your existing "
+"accounts. If this was a mistake, please proceed to sign in."
+msgstr ""
+"Heu decidit cancel·lar l'inici de sessió al vostre lloc web utilitzant un "
+"dels vostres comptes existents. Si ha estat un error, si us plau inicieu sessió."
+
+#: templates/socialaccount/messages/account_connected.txt:2
+msgid "The social account has been connected."
+msgstr "El compte de xarxa social ha estat connectat."
+
+#: templates/socialaccount/messages/account_connected_other.txt:2
+msgid "The social account is already connected to a different account."
+msgstr "El compte de xarxa social ja està connectada a un compte diferent."
+
+#: templates/socialaccount/messages/account_disconnected.txt:2
+msgid "The social account has been disconnected."
+msgstr "El compte de xarxa social s'ha desconnectat."
+
+#: templates/socialaccount/signup.html:10
+#, python-format
+msgid ""
+"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 ""
+"Esteu a punt d'utilitzar el vostre compte de %(provider_name)s per iniciar "
+"sessió a\n"
+"%(site_name)s. Com a pas final, si us plau completeu el següent formulari:"
diff -Nru django-allauth-0.47.0/allauth/locale/cs/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/cs/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/cs/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/cs/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: 0.35\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2018-04-17 16:52+0200\n"
"Last-Translator: Beda Kosata \n"
"Language-Team: Czech <>\n"
@@ -20,19 +20,19 @@
"<= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
"X-Generator: Gtranslator 2.91.7\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Toto uživatelské jméno nemůže být zvoleno. Prosím, zvolte si jiné."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Příliš mnoho pokusů o přihlášení. Zkuste to prosím později."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Uživatel s tímto e-mailem je již registrován."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Heslo musí obsahovat minimálně {0} znaků."
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "Účty"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Hesla se musí shodovat."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Heslo"
@@ -65,13 +65,13 @@
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:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-mailová adresa"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -105,89 +105,89 @@
msgid "You must type the same email each time."
msgstr "Vložené emaily se musí shodovat."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Heslo (znovu)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Váš účet nemá žádný ověřený e-mail."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Současné heslo"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nové heslo"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nové heslo (znovu)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Prosím, zadejte svoje současné heslo."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Token pro reset hesla není platný."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "uživatel"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "e-mailová adresa"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "ověřeno"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primární"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "e-mailová adresa"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "e-mailové adresy"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "vytvořil"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "odeslaný"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "klíč"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "Potvrzovací e-mail"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "Ověřovací e-maily"
@@ -212,91 +212,91 @@
msgid "Social Accounts"
msgstr "Účty sociálních sítí"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "poskytovatel"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "jméno"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "id klienta"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App ID nebo uživatelský klíč"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "tajný klíč"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "tajný API klíč, tajný klientský klíč nebo uživatelský tajný klíč"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Klíč"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "sociální aplikace"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "sociální aplikace"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "poslední přihlášení"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "datum registrace"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "extra data"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "účet sociální sítě"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "účty sociálních sítí"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "token"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) nebo přístupový token (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "tajný token"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) nebo token pro obnovu (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "vyprší"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "token sociální aplikace"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "tokeny sociálních aplikací"
@@ -305,11 +305,13 @@
msgstr "Neplatná data profilu"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Chyba při odesílání požadavku: \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Chyba připojení: \"%s\"."
@@ -469,9 +471,36 @@
"Pro případ, že byste zapomněli, vaše uživatelské jméno je %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail pro reset hesla"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Zdravíme z %(site_name)s!\n"
+"\n"
+"Tento e-mail jste obdrželi protože jste vy nebo někdo jiný zažádal o změnu "
+"hesla uživatelského účtu.\n"
+"Pokud jste to nebyli vy, můžete tento e-mail ignorovat. Pokud ano, klikněte "
+"na odkaz níže pro změnu vašeho hesla."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -500,7 +529,7 @@
"\"%(email_url)s\">zažádejte si o nový."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Přihlásit se"
@@ -622,12 +651,19 @@
"Prosím, kontaktujte nás, pokud máte jakékoliv potíže s resetováním hesla."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Zaslali jsme vám e-mail. Prosím, kontaktujte nás, pokud ho nedostanete do "
-"několika minut."
+"Zaslali jsme na vaši e-mailovou adresu\n"
+"ověřovací e-mail. Prosím, klikněte na odkaz uvnitř e-mailu.\n"
+"Neváhejte nás kontaktovat v případě, pokud e-mail nedostanete do několika "
+"minut."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -643,11 +679,10 @@
"Odkaz pro změnu hesla není platný, protože již byl použit. Prosím, zažádejte si o nové."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "změnit heslo"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Vaše heslo bylo změněno."
@@ -698,10 +733,16 @@
msgstr "Ověřte svoji e-mailovou adresu."
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Byl vám zaslán ověřovací e-mail. Následujte odkaz v e-mailu pro dokončení "
"registračního procesu. Neváhejte nás kontaktovat v případě, pokud e-mail do "
@@ -718,9 +759,16 @@
"ověření vlastnictví vaší e-mailové adresy."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Zaslali jsme na vaši e-mailovou adresu\n"
@@ -771,27 +819,27 @@
msgid "Add a 3rd Party Account"
msgstr "Přidejte další účet"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -831,6 +879,13 @@
"Chystáte se použít vaš %(provider_name)s účtu k přihlášení na naše stránky \n"
"%(site_name)s. Jako poslední krok, prosím, vyplňte následující formulář:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Zaslali jsme vám e-mail. Prosím, kontaktujte nás, pokud ho nedostanete do "
+#~ "několika minut."
+
#~ msgid "Account"
#~ msgstr "Účet"
diff -Nru django-allauth-0.47.0/allauth/locale/da/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/da/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/da/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/da/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2018-09-03 16:04+0200\n"
"Last-Translator: b'Tuk Bredsdorff '\n"
"Language-Team: \n"
@@ -18,21 +18,21 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.1.1\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Brugernavn kan ikke bruges. Brug venligst et andet brugernavn."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Der er for mange mislykkede logonforsøg. Prøv igen senere."
-#: account/adapter.py:53
+#: account/adapter.py:55
#, fuzzy
#| msgid "A user is already registered with this address."
msgid "A user is already registered with this e-mail address."
msgstr "En bruger er allerede registreret med denne emailadresse."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Adgangskoden skal være på mindst {0} tegn."
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "Konti"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Du skal skrive den samme adgangskode hver gang."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Adgangskode"
@@ -65,13 +65,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Det angivne brugernavn og/eller adgangskoden er ikke korrekt."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Emailadresse"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "Email"
@@ -105,89 +105,89 @@
msgid "You must type the same email each time."
msgstr "Du skal skrive den samme emailadresse hver gang."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Adgangskode (igen)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Denne emailadresse er allerede knyttet til denne konto."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Denne emailadresse er allerede knyttet til en anden konto."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Din konto har ikke nogen bekræftet emailadresse."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Nuværende adgangskode"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Ny adgangskode"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Ny adgangskode (igen)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Indtast din nuværende adgangskode."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Emailadressen er ikke tildelt til nogen brugerkonto"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Token for nulstilling af adgangskode var ugyldig."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "bruger"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "emailadresse"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "bekræftet"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primær"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "emailadresse"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "emailadresser"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "oprettet"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "sendt"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "nøgle"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "emailbekræfelse"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "emailbekræftelse"
@@ -212,91 +212,91 @@
msgid "Social Accounts"
msgstr "Sociale konti"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "udbyder"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "navn"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "klient id"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App ID, eller konsumer nøgle"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "hemmelig nøgle"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API hemmelighed, klient hemmelighed eller konsumet hemmelighed"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Nøgle"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "social applikation"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "sociale applikationer"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "sidste log ind"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "dato oprettet"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "ekstra data"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "social konto"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "sociale konti"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "token"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "“oauth_token” (OAuth1) eller adgangstoken (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "token hemmelighed"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "“oauth_token_secret” (OAuth1) eller fornyelsestoken (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "udløber den"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "socialt applikationstoken"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "sociale applikationstokener"
@@ -305,11 +305,13 @@
msgstr "Ugyldig profildata"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Ugyldig respons under forsøg på at hente request token fra “%s”."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Ugyldig respons under forsøg på at hente adgangstoken fra “%s”."
@@ -468,9 +470,36 @@
msgstr "I tilfælde af at du har glemt det er dit brugernavn %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Token for nulstilling af adgangskode var ugyldig"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Hej fra %(site_name)s!\n"
+"\n"
+"Du har modtaget denne email fordi du eller en anden har bedt om et password "
+"til din konto.\n"
+"Den kan trygt ses bort fra, hvis du ikke har bedt om at få nulstillet dit "
+"password. Klik linket herunder for at nulstille dit password."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -499,7 +528,7 @@
"et nyt."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Log ind"
@@ -622,12 +651,18 @@
"Kontakt os venligst, hvis du har problemer med at nulstille dit password."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Vi har sendt dig en email. Kontakt os venligst, hvis du ikke modtager den i "
-"løbet af et par minutter."
+"Vi har sendt en email til dig for bekræftelse.\n"
+"Klik på linket i den. Kontakt os venligst, hvis du ikke modtager\n"
+" den i løbet af et par minutter."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -643,11 +678,10 @@
"Linket til nulstilling af password var ugyldigt, muligvis fordi det allerede "
"er blevet brugt. Lav venligst et nyt."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "ændr password"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Dit password er nu ændret."
@@ -698,10 +732,16 @@
msgstr "Bekræft din emailadresse"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Vi har sendt en email til dig. Følg linket i den for at færdiggøre "
"oprettelsesprocessen. Kontakt os venligst, hvis du ikke modtager den i løbet "
@@ -718,9 +758,16 @@
"bekræfte, at du ejer din emailadresse "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Vi har sendt en email til dig for bekræftelse.\n"
@@ -771,27 +818,27 @@
msgid "Add a 3rd Party Account"
msgstr "Tilføj tredjeparts konto"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -832,5 +879,12 @@
"Du er ved at bruge din %(provider_name)s -konto til at logge ind i\n"
"%(site_name)s. Som et sidste skridt, udfyld venligst denne formular:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Vi har sendt dig en email. Kontakt os venligst, hvis du ikke modtager den "
+#~ "i løbet af et par minutter."
+
#~ msgid "Account"
#~ msgstr "Konto"
diff -Nru django-allauth-0.47.0/allauth/locale/de/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/de/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/de/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/de/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2020-10-15 19:48+0200\n"
"Last-Translator: Jannis Vajen \n"
"Language-Team: German (http://www.transifex.com/projects/p/django-allauth/"
@@ -20,21 +20,21 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.2.1\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"Anmeldename kann nicht verwendet werden. Bitte wähle einen anderen Namen."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
"Zu viele gescheiterte Anmeldeversuche. Bitte versuche es später erneut."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Es ist bereits jemand mit dieser E-Mail-Adresse registriert."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Das Passwort muss aus mindestens {0} Zeichen bestehen."
@@ -43,11 +43,11 @@
msgid "Accounts"
msgstr "Konten"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Du musst zweimal das selbe Passwort eingeben."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Passwort"
@@ -67,13 +67,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Der Anmeldename und/oder das Passwort sind leider falsch."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-Mail-Adresse"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-Mail"
@@ -107,89 +107,89 @@
msgid "You must type the same email each time."
msgstr "Du musst zweimal dieselbe E-Mail-Adresse eingeben."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Passwort (Wiederholung)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Dein Konto hat keine bestätigte E-Mail-Adresse."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Aktuelles Passwort"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Neues Passwort"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Neues Passwort (Wiederholung)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Bitte gib dein aktuelles Passwort ein."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Diese E-Mail-Adresse ist keinem Konto zugeordnet"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Das Sicherheits-Token zum Zurücksetzen des Passwortes war ungültig."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "Benutzer"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "E-Mail-Adresse"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "bestätigt"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "Primär"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "E-Mail-Adresse"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "E-Mail-Adressen"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "Erstellt"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "Gesendet"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "Schlüssel"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "E-Mail-Bestätigung"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "E-Mail-Bestätigungen"
@@ -214,91 +214,91 @@
msgid "Social Accounts"
msgstr "Konto"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "Anbieter"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "Anmeldename"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "Client-ID"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App-ID oder 'Consumer key'"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "Geheimer Schlüssel"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "'API secret', 'client secret' oder 'consumer secret'"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Schlüssel"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "Soziale Anwendung"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "Soziale Anwendungen"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "UID"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "Letzte Anmeldung"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "Registrierdatum"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "Weitere Daten"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "Soziales Konto"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "Soziale Konten"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "Token"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) oder \"access token\" (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "Geheimes Token"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) oder \"refresh token\" (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "Läuft ab"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "Token für soziale Anwendung"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "Tokens für soziale Anwendungen"
@@ -307,11 +307,13 @@
msgstr "Ungültige Profildaten"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Ungültige Antwort von \"%s\" als Anfrageschlüssel erbeten wurde."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Ungültige Antwort von \"%s\" als Zugangsschlüssel erbeten wurde."
@@ -449,9 +451,32 @@
"%(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-Mail zum Zurücksetzen des Passworts"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Du erhältst diese E-Mail weil du oder jemand anderes die Zurücksetzung des "
+"Passwortes für dein Konto gefordert hat.\n"
+"Falls es sich dabei nicht um dich handelt, kann diese Nachricht ignoriert "
+"werden. Rufe folgende Adresse auf um dein Passwort zurückzusetzen."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -480,7 +505,7 @@
"href=\"%(email_url)s\">Bestätigungs-Mail schicken."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Anmeldung"
@@ -602,12 +627,19 @@
"Bitte kontaktiere uns, wenn das Zurücksetzen des Passworts nicht klappt."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Wir haben Dir eine E-Mail geschickt. Bitte kontaktiere uns, wenn du sie "
-"nicht in ein paar Minuten erhalten hast."
+"Wir haben Dir eine E-Mail geschickt, um deine\n"
+"Adresse zu verifizieren. Bitte klick auf den Link\n"
+"in der E-Mail. Wenn die E-Mail nicht in ein paar Minuten\n"
+"angekommen ist, gib uns bitte Bescheid."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -624,11 +656,10 @@
"Link bereits benutzt. Bitte lass dein Passwort noch mal zurücksetzen."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "Passwort ändern"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Dein Passwort wurde geändert."
@@ -681,10 +712,16 @@
msgstr "Bestätige deine E-Mail-Adresse"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Wir haben dir eine E-Mail geschickt, um deine Adresse zu verifizieren. Bitte "
"folge dem Link in der E-Mail um den Anmeldeprozess abzuschließen. Bitte "
@@ -701,9 +738,16 @@
"Dazu musst du deine E-Mail-Adresse verifizieren. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Wir haben Dir eine E-Mail geschickt, um deine\n"
@@ -756,27 +800,27 @@
msgid "Add a 3rd Party Account"
msgstr "Soziales Netzwerk hinzufügen"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -820,6 +864,13 @@
"%(site_name)s anzumelden. Zum Abschluss bitte das folgende Formular "
"ausfüllen:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Wir haben Dir eine E-Mail geschickt. Bitte kontaktiere uns, wenn du sie "
+#~ "nicht in ein paar Minuten erhalten hast."
+
#~ msgid "Account"
#~ msgstr "Konto"
diff -Nru django-allauth-0.47.0/allauth/locale/el/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/el/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/el/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/el/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2014-08-12 00:29+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Δεν μπορεί να χρησιμοποιηθεί αυτό το όνομα χρήστη. Δοκιμάστε άλλο."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Πολλές αποτυχημένες προσπάθειες σύνδεσης. Προσπαθήστε ξανά αργότερα."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Υπάρχει ήδη εγγεγραμμένος χρήστης με αυτό το e-mail."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Το συνθηματικό πρέπει να περιέχει τουλάχιστον {0} χαρακτήρες."
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "Λογαριασμοί"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Πρέπει να δοθεί το ίδιο συνθηματικό κάθε φορά."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Συνθηματικό"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Το όνομα χρήστη ή/και το συνθηματικό που δόθηκαν δεν είναι σωστά."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Διεύθυνση e-mail"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -109,89 +109,89 @@
msgid "You must type the same email each time."
msgstr "Πρέπει να δοθεί το ίδιο email κάθε φορά."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Συνθηματικό (επιβεβαίωση)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Αυτό το e-mail χρησιμοποιείται ήδη από αυτό το λογαριασμό."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Αυτό το e-mail χρησιμοποιείται ήδη από άλλο λογαριασμό."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Δεν έχει επιβεβαιωθεί κανένα e-mail του λογαριασμού σας."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Τρέχον συνθηματικό"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Νέο συνθηματικό"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Νέο συνθηματικό (επιβεβαίωση)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Παρακαλώ γράψτε το τρέχον συνθηματικό σας."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Το e-mail δεν χρησιμοποιείται από κανέναν λογαριασμό"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Το κουπόνι επαναφοράς του συνθηματικού δεν ήταν έγκυρο."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "χρήστης"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "διεύθυνση e-mail"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "επαληθευμένο"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "πρωτεύον"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "διεύθυνση e-mail"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "διευθύνσεις e-mail"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "δημιουργήθηκε"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "απστάλει"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "κλειδί"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "e-mail επιβεβαίωσης"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "e-mail επιβεβαίωσης"
@@ -216,91 +216,91 @@
msgid "Social Accounts"
msgstr "Λογαριασμοί Κοινωνικών Μέσων"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "πάροχος"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "όνομα"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "id πελάτη"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App ID ή consumer key(κλειδί καταναλωτή)"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "μυστικό κλειδί"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API secret, client secret, ή consumer secret"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Κλειδί"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "εφαρμογή κοινωνικών μέσων"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "εφαρμογές κοινωνικών μέσων"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "τελευταία σύνδεση"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "ημερομηνία εγγραφής"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "έξτρα δεδομένα"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "λογαριασμός κοινωνικών μέσων"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "λογαριασμοί κοινωνικών μέσων"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "κουπόνι"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) ή access token (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "token secret"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) ή refresh token (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "λήγει στις"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "token (κουπόνι) εφαρμογής κοινωνικών μέσων"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "tokens (κουπόνια) εφαρμογής κοινωνικών μέσων"
@@ -309,11 +309,13 @@
msgstr "Άκυρα δεδομένα προφίλ"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Μη-έγκυρη απάντηση κατά την απόκτηση κουπονιού αιτήματος από \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Μη-έγκυρη απάντηση κατά την απόκτηση κουπονιού πρόσβασης από \"%s\"."
@@ -474,9 +476,36 @@
msgstr "Σε περίπτωση που ξεχάσατε, το όνομα χρήστη σας είναι %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail επαναφοράς συνθηματικού"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Χαιρετίσματα από το %(site_name)s!\n"
+"\n"
+"Λαμβάνετε αυτό το e-mail επειδή εσείς ή κάποιος άλλος έχει κάνει αίτηση "
+"συνθηματικού για τον λογαριασμό σας.\n"
+"Αν δεν ζητήσατε επαναφορά συνθηματικού, μπορεί να αγνοηθεί με ασφάλεια. "
+"Πατήστε στον σύνδεσμο που ακολουθεί για να επαναφέρετε το συνθηματικό σας."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -505,7 +534,7 @@
"κάντε καινούρια αίτηση επιβεβαίωσης e-mail."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Σύνδεση"
@@ -629,12 +658,18 @@
"επαναφορά του συνθηματικού σας."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Σας έχουμε στείλει ένα e-mail. Παρακαλούμε επικοινωνήστε μαζί μας αν δεν το "
-"έχετε παραλάβει μέσα σε λίγα λεπτά."
+"Σας στείλαμε ένα e-mail για επαλήθευση.\n"
+"Παρακαλούμε ακολουθήστε τον σύνδεσμο που αυτό περιέχει. Παρακαλούμε\n"
+"επικοινωνήστε μαζί μας αν δεν το έχετε παραλάβει μέσα σε λίγα λεπτά."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -651,11 +686,10 @@
"χρησιμοποιηθεί. Παρακαλούμε κάντε εκ νέου επαναφορά συνθηματικού."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "Το συνθηματικό σας έχει αλλάξει."
@@ -708,10 +742,16 @@
msgstr "Επιβεβαιώστε την διεύθυνση e-mail σας"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Σας στείλαμε ένα e-mail για επαλήθευση. Ακολουθήστε τον σύνδεσμο που λάβατε "
"γιατην ολοκλήρωση της διαδικασίας εγγραφής. Παρακαλούμε επικοινωνήστε μαζί "
@@ -728,9 +768,16 @@
"επαληθεύσετε την ιδιοκτησία της e-mail διεύθυνσης σας. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Σας στείλαμε ένα e-mail για επαλήθευση.\n"
@@ -785,27 +832,27 @@
msgid "Add a 3rd Party Account"
msgstr "Προσθήκη εξωτερικού λογαριασμού"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -849,5 +896,12 @@
"συνδεθείτε στην σελίδα\n"
"%(site_name)s. Ως τελικό βήμα, παρακαλούμε συμπληρώστε την παρακάτω φόρμα:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Σας έχουμε στείλει ένα e-mail. Παρακαλούμε επικοινωνήστε μαζί μας αν δεν "
+#~ "το έχετε παραλάβει μέσα σε λίγα λεπτά."
+
#~ msgid "Account"
#~ msgstr "Λογαριασμός"
diff -Nru django-allauth-0.47.0/allauth/locale/en/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/en/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/en/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/en/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr ""
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr ""
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr ""
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr ""
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr ""
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr ""
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr ""
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr ""
@@ -103,88 +103,88 @@
msgid "You must type the same email each time."
msgstr ""
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr ""
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr ""
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr ""
-#: account/forms.py:453
+#: account/forms.py:456
#, python-format
msgid "You cannot add more than %d e-mail addresses."
msgstr ""
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr ""
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr ""
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr ""
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr ""
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr ""
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr ""
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr ""
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr ""
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr ""
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr ""
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr ""
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr ""
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr ""
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr ""
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr ""
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr ""
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr ""
@@ -207,91 +207,91 @@
msgid "Social Accounts"
msgstr ""
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr ""
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr ""
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr ""
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr ""
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr ""
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -300,11 +300,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr ""
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr ""
@@ -426,9 +428,23 @@
msgstr ""
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr ""
+#: templates/account/email/unknown_account_message.txt:4
+#, python-format
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -453,7 +469,7 @@
msgstr ""
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr ""
@@ -568,8 +584,8 @@
#: 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."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
#: templates/account/password_reset_from_key.html:7
@@ -584,11 +600,10 @@
"a>."
msgstr ""
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 ""
@@ -641,8 +656,9 @@
#: templates/account/verification_sent.html:10
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
#: templates/account/verified_email_required.html:12
@@ -655,7 +671,9 @@
#: templates/account/verified_email_required.html:16
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
@@ -700,27 +718,27 @@
msgid "Add a 3rd Party Account"
msgstr ""
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
diff -Nru django-allauth-0.47.0/allauth/locale/es/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/es/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/es/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/es/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\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/"
@@ -19,32 +19,33 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.7.1\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
-msgstr "Este nombre de usuario no puede ser usado. Por favor ingresa otro."
+msgstr "Este nombre de usuario no puede ser usado. Por favor utilice otro."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
-msgstr "Demasiados intentos fallidos, intenta más tarde."
+msgstr "Demasiados intentos fallidos, inténtelo más tarde."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
-msgstr "Un usuario ya fue registrado con esta dirección de correo electrónico."
+msgstr ""
+"Un usuario ya ha sido registrado con esta dirección de correo electrónico."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
-msgstr "Una contraseña necesita al menos {0} caracteres."
+msgstr "La contraseña necesita al menos {0} caracteres."
#: account/apps.py:7
msgid "Accounts"
msgstr "Cuentas"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
-msgstr "Debes escribir la misma contraseña cada vez."
+msgstr "Debe escribir la misma contraseña cada vez."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Contraseña"
@@ -54,24 +55,25 @@
#: account/forms.py:97
msgid "This account is currently inactive."
-msgstr "Esta cuenta está desactivada actualmente."
+msgstr "Esta cuenta se encuentra ahora mismo desactivada."
#: account/forms.py:99
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."
+"El correo electrónico y/o la contraseña que se especificaron no son "
+"correctos."
#: account/forms.py:102
msgid "The username and/or password you specified are not correct."
-msgstr "El usuario y/o la contraseña que especificaste no son correctos."
+msgstr "El usuario y/o la contraseña que se especificaron no son correctos."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Correo electrónico"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "Correo electrónico"
@@ -82,7 +84,7 @@
#: account/forms.py:133
msgid "Username or e-mail"
-msgstr "Nombre de usuario o correo electrónico"
+msgstr "Usuario o correo electrónico"
#: account/forms.py:136
msgctxt "field label"
@@ -95,7 +97,7 @@
#: account/forms.py:311
msgid "E-mail address confirmation"
-msgstr "Confirmación de la dirección de correo electrónico"
+msgstr "Confirmación de dirección de correo electrónico"
#: account/forms.py:319
msgid "E-mail (optional)"
@@ -105,93 +107,91 @@
msgid "You must type the same email each time."
msgstr "Debe escribir el mismo correo electrónico cada vez."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Contraseña (de nuevo)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
-msgstr "Tu cuenta no tiene un correo electrónico verificado."
+msgstr "No se pueden añadir más de %d direcciones de correo electrónico."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Contraseña actual"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nueva contraseña"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nueva contraseña (de nuevo)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Por favor, escribe tu contraseña actual."
-#: account/forms.py:529
+#: account/forms.py:532
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"
+msgstr "El correo electrónico no está asignado a ninguna cuenta de usuario"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
-msgstr ""
+msgstr "El token para reiniciar la contraseña no es válido"
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "usuario"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "correo electrónico"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "verificado"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
-msgstr "primero"
+msgstr "principal"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "correo electrónico"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "correos electrónicos"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "creado"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "enviado"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
-msgstr ""
+msgstr "clave"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "confirmación de correo electrónico"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
-msgstr "confirmación de correos electrónicos"
+msgstr "confirmaciones de correo electrónico"
#: socialaccount/adapter.py:26
#, python-format
@@ -200,118 +200,121 @@
"account first, then connect your %s account."
msgstr ""
"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."
+"favor, primero identifíquese usando esa cuenta, y luego vincule su cuenta %s."
#: socialaccount/adapter.py:131
msgid "Your account has no password set up."
-msgstr "Tu cuenta no tiene una contraseña definida."
+msgstr "Su cuenta no tiene una contraseña definida."
#: socialaccount/adapter.py:138
msgid "Your account has no verified e-mail address."
-msgstr "Tu cuenta no tiene un correo electrónico verificado."
+msgstr "Su cuenta no tiene un correo electrónico verificado."
#: socialaccount/apps.py:7
msgid "Social Accounts"
-msgstr "Cuentas Sociales"
+msgstr "Cuentas de redes sociales"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "proveedor"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "nombre"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
-msgstr ""
+msgstr "identificador cliente"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
-msgstr ""
+msgstr "Identificador de App o clave de consumidor"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
-msgstr ""
+msgstr "clave secreta"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
+"frase secreta de API, frase secreta cliente o frase secreta de consumidor"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
-msgstr ""
+msgstr "clave"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
-msgstr ""
+msgstr "aplicación de redes sociales"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
-msgstr ""
+msgstr "aplicaciones de redes sociales"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "último inicio de sesión"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
-msgstr ""
+msgstr "fecha de incorporación"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
-msgstr ""
+msgstr "datos extra"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
-msgstr ""
+msgstr "cuenta de redes sociales"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
-msgstr ""
+msgstr "cuentas de redes sociales"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
-msgstr ""
+msgstr "\"oauth_token\" (OAuth1) o token de acceso (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
-msgstr ""
+msgstr "frase secreta de token"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
-msgstr ""
+msgstr "\"oauth_token_secret\" (OAuth1) o token de refresco (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
-msgstr ""
+msgstr "expira el"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
-msgstr ""
+msgstr "token de aplicación de redes sociales"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
-msgstr ""
+msgstr "tokens de aplicación de redes sociales"
#: socialaccount/providers/douban/views.py:36
msgid "Invalid profile data"
msgstr "Datos de perfil inválidos"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
-msgstr "Respuesta no válida al obtener token de solicitud de \"%s\"."
+msgstr "Respuesta inválida al obtener token de solicitud de \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Respuesta inválida al obtener token de acceso de \"%s\"."
@@ -319,7 +322,7 @@
#: socialaccount/providers/oauth/client.py:138
#, python-format
msgid "No request token saved for \"%s\"."
-msgstr "No hay token de solicitud guardados para \"%s\"."
+msgstr "No hay token de solicitud guardado para \"%s\"."
#: socialaccount/providers/oauth/client.py:189
#, python-format
@@ -347,7 +350,7 @@
#: templates/account/email.html:10
msgid "The following e-mail addresses are associated with your account:"
msgstr ""
-"Las siguientes direcciones de correo electrónico están asociadas a tu cuenta:"
+"Las siguientes direcciones de correo electrónico están asociadas a su cuenta:"
#: templates/account/email.html:24
msgid "Verified"
@@ -382,8 +385,8 @@
"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 ""
-"Actualmente no tienes ninguna dirección de correo electrónico definida. "
-"Debes añadir una dirección de correo electrónico para poder recibir "
+"Actualmente no tiene ninguna dirección de correo electrónico definida. "
+"Debería añadir una dirección de correo electrónico para poder recibir "
"notificaciones, restablecer la contraseña, etc."
#: templates/account/email.html:48
@@ -397,7 +400,7 @@
#: templates/account/email.html:63
msgid "Do you really want to remove the selected e-mail address?"
msgstr ""
-"¿Estás seguro de querer eliminar la dirección de correo electrónico "
+"¿Está seguro de querer eliminar la dirección de correo electrónico "
"seleccionada?"
#: templates/account/email/base_message.txt:1
@@ -406,9 +409,7 @@
#| "Thank you from %(site_name)s!\n"
#| "%(site_domain)s"
msgid "Hello from %(site_name)s!"
-msgstr ""
-"Gracias %(site_name)s!\n"
-"%(site_domain)s"
+msgstr "¡Hola desde %(site_name)s!"
#: templates/account/email/base_message.txt:5
#, python-format
@@ -416,7 +417,7 @@
"Thank you for using %(site_name)s!\n"
"%(site_domain)s"
msgstr ""
-"Muchas gracias por usar %(site_name)s!\n"
+"¡Gracias por usar %(site_name)s!\n"
"%(site_domain)s"
#: templates/account/email/email_confirmation_message.txt:5
@@ -434,16 +435,14 @@
"\n"
"To confirm this is correct, go to %(activate_url)s"
msgstr ""
-"¡Te saluda %(site_name)s!\n"
-"\n"
-"Estás recibiendo este correo electrónico porque el usuario %(user_display)s "
-"ha dado su correo electrónico para conectar su cuenta.\n"
+"Recibe este mensaje porque el usuario %(user_display)s ha proporcionado "
+"sudirección para registrar una cuenta en %(site_domain)s.\n"
"\n"
-"Para confirmar que esto es correcto, haz clic en %(activate_url)s\n"
+"Para confirmar que esto es correcto, siga este enlace %(activate_url)s"
#: templates/account/email/email_confirmation_subject.txt:3
msgid "Please Confirm Your E-mail Address"
-msgstr "Por favor confirmar dirección de correo electrónico"
+msgstr "Por favor, confirme su dirección de correo electrónico"
#: templates/account/email/password_reset_key_message.txt:4
#, fuzzy
@@ -460,21 +459,44 @@
"It can be safely ignored if you did not request a password reset. Click the "
"link below to reset your password."
msgstr ""
-"¡Te saluda %(site_name)s!\n"
-"\n"
-"Estás recibiendo este correo electrónico porque usted u otra persona ha "
+"Está recibiendo este correo electrónico porque usted u otra persona ha "
"solicitado una contraseña para su cuenta de usuario.\n"
"Se puede ignorar de forma segura si no solicitó un restablecimiento de "
-"contraseña. Haga clic en el siguiente enlace para restablecer su contraseña."
+"contraseña. Siga el siguiente enlace para restablecer su contraseña."
#: templates/account/email/password_reset_key_message.txt:9
#, python-format
msgid "In case you forgot, your username is %(username)s."
-msgstr "En caso de haber olvidado tu nombre de usuario, es %(username)s."
+msgstr "En caso de haberlo olvidado, su usuario es %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
-msgstr "Correo para restablecer contraseña"
+msgstr "Correo electrónico para restablecer contraseña"
+
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Está recibiendo este correo electrónico porque usted u otra persona ha "
+"solicitado una contraseña para su cuenta de usuario.\n"
+"Se puede ignorar de forma segura si no solicitó un restablecimiento de "
+"contraseña. Siga el siguiente enlace para restablecer su contraseña."
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
@@ -487,7 +509,7 @@
"Please confirm that %(email)s is an e-mail "
"address for user %(user_display)s."
msgstr ""
-"Por favor confirma que %(email)s es una "
+"Por favor confirme que %(email)s es una "
"dirección de correo electrónico del usuario %(user_display)s."
#: templates/account/email_confirm.html:20
@@ -501,11 +523,11 @@
"\"%(email_url)s\">issue a new e-mail confirmation request."
msgstr ""
"Este enlace de verificación de correo ha expirado o es inválido. Por favor "
-"solicita una nueva verificación por correo "
+"solicite una nueva verificación por correo "
"electrónico.."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Iniciar sesión"
@@ -517,9 +539,9 @@
"up\n"
"for a %(site_name)s account and sign in below:"
msgstr ""
-"Por favor inicia sesión con una\n"
-"cuenta de otra red social. O, regístrese \n"
-"como usuario de %(site_name)s e inicia sesión a continuación:"
+"Por favor, inicie sesión con una\n"
+"cuenta de otra red social. O regístrese \n"
+"como usuario de %(site_name)s e inicie sesión a continuación:"
#: templates/account/login.html:25
msgid "or"
@@ -531,12 +553,12 @@
"If you have not created an account yet, then please\n"
"sign up first."
msgstr ""
-"Si todavía no has creado una cuenta, entonces por favor\n"
-"regístrate primero."
+"Si todavía no ha creado una cuenta, entonces por favor\n"
+"regístrese primero."
#: templates/account/login.html:42 templates/account/password_change.html:14
msgid "Forgot Password?"
-msgstr "¿Olvidaste tu contraseña?"
+msgstr "¿Olvidó su contraseña?"
#: templates/account/logout.html:5 templates/account/logout.html:8
#: templates/account/logout.html:17
@@ -545,12 +567,12 @@
#: templates/account/logout.html:10
msgid "Are you sure you want to sign out?"
-msgstr "¿Estás seguro de querer cerrar sesión?"
+msgstr "¿Está seguro de querer cerrar sesión?"
#: templates/account/messages/cannot_delete_primary_email.txt:2
#, python-format
msgid "You cannot remove your primary e-mail address (%(email)s)."
-msgstr "No puedes eliminar tu correo electrónico principal (%(email)s)."
+msgstr "No puede eliminar su correo electrónico principal (%(email)s)."
#: templates/account/messages/email_confirmation_sent.txt:2
#, python-format
@@ -560,21 +582,21 @@
#: templates/account/messages/email_confirmed.txt:2
#, python-format
msgid "You have confirmed %(email)s."
-msgstr "Has confirmado %(email)s."
+msgstr "Ha confirmado %(email)s."
#: templates/account/messages/email_deleted.txt:2
#, python-format
msgid "Removed e-mail address %(email)s."
-msgstr "Correo electrónico eliminado %(email)s."
+msgstr "Eliminado correo electrónico %(email)s."
#: templates/account/messages/logged_in.txt:4
#, python-format
msgid "Successfully signed in as %(name)s."
-msgstr "Has iniciado sesión exitosamente como %(name)s."
+msgstr "Ha iniciado sesión exitosamente como %(name)s."
#: templates/account/messages/logged_out.txt:2
msgid "You have signed out."
-msgstr "Has cerrado sesión."
+msgstr "Ha cerrado sesión."
#: templates/account/messages/password_changed.txt:2
msgid "Password successfully changed."
@@ -582,7 +604,7 @@
#: templates/account/messages/password_set.txt:2
msgid "Password successfully set."
-msgstr "Contraseña establecida exitosamente."
+msgstr "Contraseña establecida con éxito."
#: templates/account/messages/primary_email_set.txt:2
msgid "Primary e-mail address set."
@@ -590,7 +612,7 @@
#: templates/account/messages/unverified_primary_email.txt:2
msgid "Your primary e-mail address must be verified."
-msgstr "Tu dirección principal de correo eletrónico debe ser verificado."
+msgstr "Su dirección principal de correo eletrónico debe ser verificada."
#: templates/account/password_change.html:5
#: templates/account/password_change.html:8
@@ -614,8 +636,8 @@
"Forgotten your password? Enter your e-mail address below, and we'll send you "
"an e-mail allowing you to reset it."
msgstr ""
-"¿Has olvidado tu contraseña? Ingresa tu correo electrónico y te enviaremos "
-"un correo que te permitirá restablecerla."
+"¿Ha olvidado su contraseña? Introduzca su correo electrónico y le enviaremos "
+"un correo que le permitirá restablecerla."
#: templates/account/password_reset.html:20
msgid "Reset My Password"
@@ -624,16 +646,21 @@
#: templates/account/password_reset.html:23
msgid "Please contact us if you have any trouble resetting your password."
msgstr ""
-"Si tiene alguna dificultad para restablecer tu contraseña, por favor "
-"contáctanos."
+"Si tiene alguna dificultad para restablecer su contraseña, por favor "
+"contáctenos."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Te hemos enviado un correo electrónico. Por favor contáctanos si no recibes "
-"el correo en unos minutos."
+"Le hemos enviado un correo electrónico para su verificación. Por favor, siga "
+"el enlace de ese correo. Contáctenos si no lo recibe en unos minutos."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -647,17 +674,16 @@
"a>."
msgstr ""
"El enlace para restablecer la contraseña es inválido, probablemente porque "
-"ya ha sido utilizado. Por favor solicita retablecer la contraseña de nuevo."
+"ya ha sido utilizado. Por favor solicite restablecer la contraseña de nuevo."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "cambiar la contraseña"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
-msgstr "Tu contraseña ha cambiado."
+msgstr "Su contraseña ha cambiado."
#: templates/account/password_set.html:5 templates/account/password_set.html:8
#: templates/account/password_set.html:13
@@ -666,19 +692,19 @@
#: templates/account/signup.html:5 templates/socialaccount/signup.html:5
msgid "Signup"
-msgstr "Regístrate"
+msgstr "Regístrarse"
#: templates/account/signup.html:8 templates/account/signup.html:18
#: templates/socialaccount/signup.html:8 templates/socialaccount/signup.html:19
msgid "Sign Up"
-msgstr "Regístrate"
+msgstr "Regístrarse"
#: templates/account/signup.html:10
#, python-format
msgid ""
"Already have an account? Then please sign in."
msgstr ""
-"¿Ya tienes una cuenta? Por favor inicia sesión."
+"¿Ya tiene una cuenta? Por favor inicie sesión."
#: templates/account/signup_closed.html:5
#: templates/account/signup_closed.html:8
@@ -696,24 +722,30 @@
#: templates/account/snippets/already_logged_in.html:5
#, python-format
msgid "you are already logged in as %(user_display)s."
-msgstr "has iniciado sesión como %(user_display)s."
+msgstr "ya ha iniciado sesión como %(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 "Verifica tu dirección de correo electrónico"
+msgstr "Verifique su dirección de correo electrónico"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
-msgstr ""
-"Te hemos enviado un correo electrónico para tu verificación. Sigue el enlace "
-"para completar el proceso de registro. Por favor contáctanos si no recibes "
-"el correo en unos minutos."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
+msgstr ""
+"Le hemos enviado un correo electrónico para su verificación. Siga el enlace "
+"para completar el proceso de registro. Por favor contáctenos si no lo recibe "
+"en unos minutos."
#: templates/account/verified_email_required.html:12
msgid ""
@@ -721,19 +753,25 @@
"you are who you claim to be. For this purpose, we require that you\n"
"verify ownership of your e-mail address. "
msgstr ""
-"Esta parte del sitio requiere que verifiquemos que tu eres quien dices ser. "
-"Para este fin, pedimos que verifiques que eres el dueño de tu correo "
+"Esta parte del sitio web requiere que verifiquemos que es quien dice ser. "
+"Para este fin, le requerimos que verifique la propiedad de su correo "
"electrónico. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
-"Te hemos enviado un correo electrónico para tu verificación. Por favor, haz "
-"clic en el enlace de este correo. Por favor contáctanos si no recibes el "
-"correo en unos minutos."
+"Le hemos enviado un correo electrónico para su verificación. Por favor, siga "
+"el enlace de ese correo. Contáctenos si no lo recibe en unos minutos."
#: templates/account/verified_email_required.html:20
#, python-format
@@ -741,7 +779,7 @@
"Note: you can still change your e-"
"mail address."
msgstr ""
-"Nota: todavía puede cambiar tu "
+"Nota: todavía puede cambiar su "
"dirección de correo electrónico."
#: templates/openid/login.html:9
@@ -751,13 +789,13 @@
#: templates/socialaccount/authentication_error.html:5
#: templates/socialaccount/authentication_error.html:8
msgid "Social Network Login Failure"
-msgstr "Error de inicio de sesión con Red Social"
+msgstr "Error de inicio de sesión con red social"
#: templates/socialaccount/authentication_error.html:10
msgid ""
"An error occurred while attempting to login via your social network account."
msgstr ""
-"Se produjo un error al intentar iniciar sesión a través de tu cuenta de red "
+"Se produjo un error al intentar iniciar sesión a través de su cuenta de red "
"social."
#: templates/socialaccount/connections.html:5
@@ -769,39 +807,39 @@
msgid ""
"You can sign in to your account using any of the following third party "
"accounts:"
-msgstr "Puedes iniciar sesión con alguna de las siguientes cuentas externas:"
+msgstr "Puede iniciar sesión con alguna de las siguientes cuentas externas:"
#: templates/socialaccount/connections.html:43
msgid ""
"You currently have no social network accounts connected to this account."
msgstr ""
-"Actualmente no tienes ninguna cuenta de red social asociada a esta cuenta."
+"Actualmente no tiene ninguna cuenta de red social asociada a esta cuenta."
#: templates/socialaccount/connections.html:46
msgid "Add a 3rd Party Account"
msgstr "Agregar una cuenta de una red social externa"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -817,20 +855,20 @@
"accounts. If this was a mistake, please proceed to sign in."
msgstr ""
-"Has decidido cancelar el inicio de sesión a nuestro sitio usando una de tus "
+"Ha decidido cancelar el inicio de sesión en nuestro sitio usando una de sus "
"cuentas. Si esto fue un error, inicie sesión."
#: templates/socialaccount/messages/account_connected.txt:2
msgid "The social account has been connected."
-msgstr "La cuenta externa ha sido conectada."
+msgstr "La cuenta de red social ha sido conectada."
#: templates/socialaccount/messages/account_connected_other.txt:2
msgid "The social account is already connected to a different account."
-msgstr "Esta cuenta externa ya ha sido conetada a otra cuenta."
+msgstr "Esta cuenta de red social ya ha sido asociada a otra cuenta."
#: templates/socialaccount/messages/account_disconnected.txt:2
msgid "The social account has been disconnected."
-msgstr "La cuenta externa ha sido desconectada."
+msgstr "La cuenta de red social ha sido desconectada."
#: templates/socialaccount/signup.html:10
#, python-format
@@ -838,15 +876,22 @@
"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 ""
-"Estás a punto de utilizar tu cuenta %(provider_name)s para acceder a "
-"%(site_name)s. Como paso final, por favor completa el siguiente formulario:"
+"Está a punto de utilizar su cuenta de %(provider_name)s para acceder a "
+"%(site_name)s. Como paso final, por favor complete el siguiente formulario:"
+
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Le hemos enviado un correo electrónico. Por favor contáctenos si no lo "
+#~ "recibe en unos minutos."
#~ msgid "Account"
#~ msgstr "Cuenta"
#~ msgid "The login and/or password you specified are not correct."
#~ msgstr ""
-#~ "El correo electrónico/usuario y/o la contraseña que especificaste no son "
+#~ "El correo electrónico/usuario y/o la contraseña que especificó no son "
#~ "correctos."
#~ msgid "Usernames can only contain letters, digits and @/./+/-/_."
diff -Nru django-allauth-0.47.0/allauth/locale/eu/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/eu/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/eu/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/eu/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2018-08-29 08:16+0200\n"
"Last-Translator: Eneko Illarramendi \n"
"Language-Team: Basque \n"
@@ -18,21 +18,21 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.1.1\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"Erabiltzaile izen hau ezin da erabili. Aukeratu beste erabiltzaile izen bat."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Huts egite gehiegi saioa hasterakoan. Saiatu berriro beranduago."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr ""
"Erabiltzaile batek kontu bat sortu du iada helbide elektroniko honekin."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Pasahitzak gutxienez {0} karaktere izan behar ditu."
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "Kontuak"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Pasahitz berdina idatzi behar duzu aldi bakoitzean."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Pasahitza"
@@ -65,13 +65,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Sartutako erabiltzailea eta/edo pasahitza ez dira zuzenak."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Helbide elektronikoa"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "Emaila"
@@ -105,88 +105,88 @@
msgid "You must type the same email each time."
msgstr "Email berdina idatzi behar duzu aldi bakoitzean."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Pasahitza (berriro)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Helbide elektroniko hau dagoeneko kontu honi lotuta dago."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Helbide elektroniko hau dagoeneko beste kontu bati lotuta dago."
-#: account/forms.py:453
+#: account/forms.py:456
#, python-format
msgid "You cannot add more than %d e-mail addresses."
msgstr "Ezin dituzu %d email helbide baino gehiago erabili."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Oraingo pasahitza"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Pasahitz berria"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Pasahitz berria (berriro)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Mesedez idatzi zure oraingo pasahitza."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Helbide elektroniko hau ez dago kontu bati lotuta"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Pasahitza berrezartzeko \"token\"-a baliogabea da."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "erabiltzailea"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "helbide elektronikoa"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "egiaztatuta"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "nagusia"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "helbide elektronikoa"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "helbide elektronikoak"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "sortuta"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "bidalita"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "giltza"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "email egiaztapena"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "email egiaztapenak"
@@ -211,91 +211,91 @@
msgid "Social Accounts"
msgstr "Sare sozial kontuak"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "zerbitzua"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "izena"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "client id"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "Aplikazioaren ID-a, edo \"consumer key\"-a"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "\"secret key\"-a"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "\"API secret\"-a, \"client secret\"-a edo \"consumer secret\"-a"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Giltza"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "aplikazio soziala"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "aplikazio sozialak"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "azken logina"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "erregistro eguna"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "datu gehigarriak"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "sare sozial kontua"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "sare sozial kontuak"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "\"token\"-a"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\"-a (OAuth1) edo \"access token\"-a (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "\"token secret\"-a"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\"-a (OAuth1) edo \"refresh token\"-a (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "iraungitze data"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "aplikazio sozial \"token\"-a"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "aplikazio sozial \"token\"-ak"
@@ -304,11 +304,13 @@
msgstr "Profil datu baliogabeak"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Erantzun baliogabea \"%s\"-tik \"request token\"-a eskuratzean."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Erantzun baliogabea \"%s\"-tik \"access token\"-a eskuratzean."
@@ -443,9 +445,32 @@
msgstr "Ahaztu baduzu, zure erabiltzaile izena %(username)s da."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Pasahitza berrezartzeko emaila"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Email hau jaso duzu zuk edo beste norbaitek pasahitza berrezartzeko eskaera "
+"egin duelako zure kontuarentzat.\n"
+"Eskaera zuk egin ez baduzu mezu hau alde batera utzi dezakezu. Edo egin klik "
+"ondorengo estekan zure pasahitza berrezartzeko."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -474,7 +499,7 @@
"href=\"%(email_url)s\">egiaztapen email berri bat."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Saioa hasi"
@@ -597,12 +622,19 @@
"baduzu."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Email bat bidali dizugu. Mesedez jarri gurekin kontaktuan hurrengo "
-"minutuetan jasotzen ez baduzu."
+"Email bat bidali dizugu zure helbidea egiaztatzeko.\n"
+"Mesedez egin klik bertan aurkituko duzun estekan,\n"
+"edo jarri gurekin kontaktuan hurrengo minutuetan\n"
+"emailik jasotzen ez baduzu."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -619,11 +651,10 @@
"delako. Mesedez eskatu pasahitza "
"berrezartzeko email berri bat."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "pasahitza aldatu"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Zure pasahitza aldatuta dago orain."
@@ -676,10 +707,16 @@
msgstr "Zure helbide elektronikoa egiaztatu"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Email bat bidali dizugu zure helbidea egiaztatzeko. Mesedez egin klik bertan "
"aurkituko duzun estekan kontua sortzeko prozesua amaitzeko, edo jarri "
@@ -696,9 +733,16 @@
"egiaztatzea beharrezkoa da. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Email bat bidali dizugu zure helbidea egiaztatzeko.\n"
@@ -752,27 +796,27 @@
msgid "Add a 3rd Party Account"
msgstr "Sare sozial kontu bat gehitu"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -814,5 +858,12 @@
"webgunean saioa hasteko. Azken pausu bezala, mesedez osa ezazu\n"
"formulario hau:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Email bat bidali dizugu. Mesedez jarri gurekin kontaktuan hurrengo "
+#~ "minutuetan jasotzen ez baduzu."
+
#~ msgid "Account"
#~ msgstr "Kontua"
diff -Nru django-allauth-0.47.0/allauth/locale/fa/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/fa/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/fa/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/fa/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2020-06-14 17:00-0000\n"
"Last-Translator: Mohammad Ali Amini \n"
"Language-Team: \n"
@@ -17,19 +17,19 @@
"X-Generator: Poedit 1.7.4\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "نامکاربری قابل استفاده نیست. لطفا نامکاربری دیگری استفاده کن."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "خیلی زیاد تلاش ناموفق کردی، لطفا بعدا ازنو سعی کن."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "یک کاربر ازقبل با این نشانی رایانامه ثبت شده."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "گذرواژه باید حداقل {0} کاراکتر باشد."
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "حسابها"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "هربار باید گذرواژهی یکسانی وارد کنی."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "گذرواژه"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "نامکاربری یا گذرواژه نادرست است."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "نشانی رایانامه"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "رایانامه"
@@ -109,91 +109,91 @@
msgid "You must type the same email each time."
msgstr "هربار باید رایانامهی یکسانی وارد کنی."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "گذرواژه (ازنو)"
-#: account/forms.py:448
+#: account/forms.py:451
#, fuzzy
#| msgid "This e-mail address is already associated with another account."
msgid "This e-mail address is already associated with this account."
msgstr "این نشانی رایانامه ازقبل به این حساب وصل شده."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "این نشانی رایانامه ازقبل به حساب دیگری وصل شده."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "حسابات هیچ رایانامهي تاییدشدهای ندارد."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "گذرواژه کنونی"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "گذرواژه جدید"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "گذرواژه جدید (ازنو)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "لطفا گذرواژه کنونیات را وارد کن."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "این نشانی رایانامه به هیچ حساب کاربریای منتسب نشده."
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "توکن بازنشانی گذرواژه نامعتبر است."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "کاربر"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "نشانی رایانامه"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "تاییدشده"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "اصلی"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "نشانی رایانامه"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "نشانیهای رایانامه"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "ایجادشده"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "ارسال شد"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "کلید"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "تاییدیهی رایانامه"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "تاییدیههای رایانامه"
@@ -219,93 +219,93 @@
msgid "Social Accounts"
msgstr "حسابهای اجتماعی"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "فراهمکننده"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
#, fuzzy
msgid "name"
msgstr "نام"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "شناسه مشتری"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "شناسه اپ، یا کلید مصرفکننده"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "کلید محرمانه"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "رمز رابک (رابط برنامهی کاربردی API)، رمز مشتری، یا رمز مصرفکننده"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
#, fuzzy
msgid "Key"
msgstr "کلید"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "اپلیکیشن اجتماعی"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "اپلیکیشنهای اجتماعی"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "شناسهکاربری"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "آخرین ورود"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "تاریخ پیوستشده"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "داده اضافی"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "حساب اجتماعی"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "حسابهای اجتماعی"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "توکن"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) یا توکن دسترسی (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "رمز توکن"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) یا توکن تازهسازی (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "انقضا"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "توکن اپلیکشن اجتماعی"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "توکنهای اپلیکیشن اجتماعی"
@@ -314,11 +314,13 @@
msgstr "داده نامعتبر نمایه"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "پاسخ نامعتبر هنگام دریافت توکن درخواست از \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "پاسخ نامعتبر هنگام دریافت توکن دسترسی از \"%s\""
@@ -472,9 +474,29 @@
msgstr "در صورت فراموشی، نامکاربریات %(username)s است."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "رایانامهی بازنشانی گذرواژه"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"سلام،\n"
+"\n"
+"این رایانامه را دریافت کردهای چون برای حساب کاربریات در %(site_name)s، از "
+"جانب خودت یا کسی دیگر، یه گذرواژه درخواست شده.\n"
+"برای بازنشانی گذرواژه پیوند زیر را دنبال کن. وگرنه چشمپوشی از این هنگامی که "
+"خودت هم درخواست نکردی میتواند امن باشد."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -503,7 +525,7 @@
"\"%(email_url)s\">تاییدیه جدید رایانامه درخواست کن."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "ورود"
@@ -623,12 +645,17 @@
msgstr "اگر مشکلی در بازنشانی گذرواژهات داری، لطفا با ما تماس بگیر."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"بهت یه رایانامه فرستادیم. اگر تا چند دقیقهی دیگر دریافتش نکردی باهامون تماس "
-"بگیر."
+"ما یه رایانامه تاییدیه بهت فرستادیم؛ لطفا روی پیوند درونش کلیک کن. اگر تا "
+"دقایقی دیگر دریافتش نکردی با ما تماس بگیر."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -649,11 +676,10 @@
"\"alert-link\" href=\"{{ passwd_reset_url }}\">بازنشان جدید گذرواژه"
"a>درخواست کن."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "گذرواژهات اکنون تغییر کرد."
@@ -704,10 +730,16 @@
msgstr "تایید نشانی رایانامه"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"یه رایانامه تاییدیه بهت فرستادیم. پیوند درونش را برای کامل کردن فرایند "
"ثبتنام دنبال کن. اگر تا چند دقیقهی دیگر دریافتش نکردی، لطفا با ما تماس بگیر."
@@ -722,9 +754,16 @@
"نیازد داریم مالکیتت بر نشانی رایانامهات را تایید کنی."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"ما یه رایانامه تاییدیه بهت فرستادیم؛ لطفا روی پیوند درونش کلیک کن. اگر تا "
@@ -773,27 +812,27 @@
msgid "Add a 3rd Party Account"
msgstr "افزودن یه حساب سوم شخص"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -833,6 +872,13 @@
"چند قدمی ورود به %(site_name)s با حسابات %(provider_name)s هستی. در گام آخر، "
"لطفا فرم زیر را کامل کن:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "بهت یه رایانامه فرستادیم. اگر تا چند دقیقهی دیگر دریافتش نکردی باهامون "
+#~ "تماس بگیر."
+
#~ msgid "Account"
#~ msgstr "حساب"
diff -Nru django-allauth-0.47.0/allauth/locale/fi/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/fi/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/fi/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/fi/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2020-10-15 19:56+0200\n"
"Last-Translator: Anonymous User \n"
"Language-Team: LANGUAGE \n"
@@ -19,20 +19,20 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Translated-Using: django-rosetta 0.7.6\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Käyttäjänimeä ei voi käyttää. Valitse toinen käyttäjänimi."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
"Liian monta virheellistä kirjautumisyritystä. Yritä myöhemmin uudelleen."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Tämä sähköpostiosoite on jo käytössä."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Salasanan tulee olla vähintään {0} merkkiä pitkä."
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "Tili"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Salasanojen tulee olla samat."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Salasana"
@@ -65,13 +65,13 @@
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:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Sähköpostiosoite"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "Sähköposti"
@@ -111,89 +111,89 @@
msgid "You must type the same email each time."
msgstr "Salasanojen tulee olla samat."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Salasana (uudestaan)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Sähköpostiosoite on jo liitetty toiseen tiliin."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Tiliisi ei ole liitetty vahvistettua sähköpostiosoitetta."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Nykyinen salasana"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Uusi salasana"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Uusi salasana (uudestaan)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Ole hyvä ja anna nykyinen salasanasi."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Salasanan uusimistarkiste ei kelpaa."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "käyttäjä"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "sähköpostiosoite"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "vahvistettu"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "ensisijainen"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "sähköpostiosoite"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "sähköpostiosoitteet"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "luotu"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "lähetetty"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "avain"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "sähköpostivarmistus"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "sähköpostivarmistukset"
@@ -218,91 +218,91 @@
msgid "Social Accounts"
msgstr "Sosiaalisen median tilit"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "tarjoaja"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "nimi"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "asiakas id"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "Sovellus ID tai kuluttajan avain"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "salainen avain"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API:n, asiakkaan tai kuluttajan salaisuus"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Avain"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "sosiaalinen applikaatio"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "sosiaaliset applikaatiot"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "viimeisin sisäänkirjautuminen"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "liittymispäivämäärä"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "lisätiedot"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "sosiaalisen median tili"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "sosiaalisen median tilit"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "vanhenee"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -311,11 +311,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Virheellinen vastaus palvelusta \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Virhe hankittaessa käyttöoikeustunnistetta palvelusta \"%s\""
@@ -449,9 +451,32 @@
msgstr "Muistathan, että käyttäjätunnuksesi on %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Salasanan uusimissähköposti"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Sait tämän sähköpostin, koska sinä tai joku muu on pyytänyt salasasi "
+"uusimista palvelussa %(site_domain)s.\n"
+"Tämän viestin voi jättää huomiotta, jos et pyytänyt salasanan uusimista. "
+"Klikkaa alla olevaa linkkiä uusiaksesi salasanasi."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -481,7 +506,7 @@
"vahvistuslinkin sähköpostiosoitteellesi."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Kirjaudu sisään"
@@ -602,12 +627,18 @@
msgstr "Ota meihin yhteyttä, jos sinulla on ongelmia salasanasi uusimisessa."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Olemme lähettäneet sinulle sähköpostia. Ota meihin yhteyttä, jos et saa sitä "
-"muutaman minuutin sisällä."
+"Olemme lähettäneet sinulle sähköpostivahvistuksen. Klikkaa sähköpostissa "
+"olevaa linkkiä vahvistaaksesi sähköpostiosoitteesi. Ota meihin yhteyttä, jos "
+"et saanut vahvistusviestiä muutaman minuutin sisällä."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -624,11 +655,10 @@
"käytetty. Voit kuitenkin uusia salasanan "
"uusimisen."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "vaihda salasanaa"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Salasanasi on nyt vaihdettu."
@@ -679,10 +709,16 @@
msgstr "Vahvista sähköpostiosoitteesi"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Lähetimme sinulle sähköpostin vahvistusviestin. Klikkaa sähköpostissa olevaa "
"linkkiä viimeistelläksesi rekisteröitymisprosessin. Ota meihin yhteyttä, jos "
@@ -698,9 +734,16 @@
"vahvistaa omistavasi ilmoittamasi sähköpostiosoite."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Olemme lähettäneet sinulle sähköpostivahvistuksen. Klikkaa sähköpostissa "
@@ -751,27 +794,27 @@
msgid "Add a 3rd Party Account"
msgstr "Lisää kolmannen osapuolen tili"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -811,6 +854,13 @@
"Olet aikeissa käyttää %(provider_name)s-tiliäsi kirjautuaksesi palveluun\n"
"%(site_name)s. Täytä vielä seuraava lomake:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Olemme lähettäneet sinulle sähköpostia. Ota meihin yhteyttä, jos et saa "
+#~ "sitä muutaman minuutin sisällä."
+
#~ msgid "Account"
#~ msgstr "Tili"
diff -Nru django-allauth-0.47.0/allauth/locale/fr/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/fr/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/fr/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/fr/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2020-10-15 19:47+0200\n"
"Last-Translator: Gilou \n"
"Language-Team: français <>\n"
@@ -21,20 +21,20 @@
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
"X-Generator: Poedit 1.8.7.1\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Ce pseudonyme ne peut pas être utilisé. Veuillez en choisir un autre."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
"Trop de tentatives de connexion échouées. Veuillez réessayer ultérieurement."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Un autre utilisateur utilise déjà cette adresse e-mail."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Le mot de passe doit contenir au minimum {0} caractères."
@@ -43,11 +43,11 @@
msgid "Accounts"
msgstr "Comptes"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Vous devez saisir deux fois le même mot de passe."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Mot de passe"
@@ -67,13 +67,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Le pseudo ou le mot de passe sont incorrects."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Adresse e-mail"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -107,89 +107,89 @@
msgid "You must type the same email each time."
msgstr "Vous devez saisir deux fois le même email."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Mot de passe (confirmation)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Vous devez d'abord associer une adresse e-mail à votre compte."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Mot de passe actuel"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nouveau mot de passe"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nouveau mot de passe (confirmation)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Merci d'indiquer votre mot de passe actuel."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Le jeton de réinitialisation de mot de passe est invalide."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "utilisateur"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "adresse e-mail"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "vérifié"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "principale"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "adresse e-mail"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "adresses e-mail"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "créé"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "envoyé"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "clé"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "confirmation par e-mail"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "confirmations par e-mail"
@@ -214,91 +214,91 @@
msgid "Social Accounts"
msgstr "Comptes Sociaux"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "fournisseur"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "nom"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "id client"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "ID de l'app ou clé de l'utilisateur"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "clé secrète"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "Secret de l'API, secret du client, ou secret de l'utilisateur"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Clé"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "application sociale"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "applications sociales"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "dernière identification"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "date d'inscription"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "données supplémentaires"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "compte social"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "comptes sociaux"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "jeton"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) ou jeton d'accès (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "jeton secret"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) ou jeton d'actualisation (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "expire le"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "jeton de l'application sociale"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "jetons de l'application sociale"
@@ -307,11 +307,13 @@
msgstr "Données de profil incorrectes"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Réponse invalide lors de l'obtention du jeton de requête de \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Réponse invalide lors de l'obtention du jeton d'accès depuis \"%s\"."
@@ -449,9 +451,33 @@
"Au cas où vous l'auriez oublié, votre nom d'utilisateur est %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail de réinitialisation de mot de passe"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Vous recevez cet e-mail car vous ou quelqu'un d'autre a demandé le mot de "
+"passe pour votre compte utilisateur.\n"
+"Vous pouvez simplement ignorer ce message si vous n'êtes pas à l'origine de "
+"cette demande. Sinon, cliquez sur le lien ci-dessous pour réinitialiser "
+"votre mot de passe."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -481,7 +507,7 @@
"confirmation."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Connexion"
@@ -605,12 +631,18 @@
"passe."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Nous vous avons envoyé un e-mail. Merci de nous contacter si vous ne le "
-"recevez pas d'ici quelques minutes."
+"Nous vous avons envoyé un e-mail de vérification. Merci de cliquer sur le "
+"lien inclus dans ce courriel. Contactez-nous si vous ne l'avez pas reçu "
+"d'ici quelques minutes."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -627,11 +659,10 @@
"déjà été utilisé. Veuillez faire une nouvelle demande de réinitialisation de mot de passe."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "modifier le mot de passe"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Votre mot de passe a été modifié."
@@ -684,10 +715,16 @@
msgstr "Vérifiez votre adresse e-mail"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Nous vous avons envoyé un e-mail pour validation. Cliquez sur le lien fourni "
"dans l'e-mail pour terminer l'inscription. Merci de nous contacter si vous "
@@ -704,9 +741,16 @@
"indiquée."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Nous vous avons envoyé un e-mail de vérification. Merci de cliquer sur le "
@@ -759,27 +803,27 @@
msgid "Add a 3rd Party Account"
msgstr "Ajouter un compte de réseau social"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -821,6 +865,13 @@
"au site %(site_name)s. Merci de compléter le formulaire suivant pour "
"confirmer la connexion."
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Nous vous avons envoyé un e-mail. Merci de nous contacter si vous ne le "
+#~ "recevez pas d'ici quelques minutes."
+
#~ msgid "Account"
#~ msgstr "Compte"
diff -Nru django-allauth-0.47.0/allauth/locale/he/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/he/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/he/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/he/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2017-08-26 16:11+0300\n"
"Last-Translator: Udi Oron \n"
"Language-Team: Hebrew\n"
@@ -18,19 +18,19 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.3\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "לא ניתן להשתמש בשם משתמש זה. אנא בחר שם משתמש אחר."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "יותר מדי ניסיונות התחברות כושלים. אנא נסה שוב מאוחר יותר."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "משתמש אחר כבר רשום עם כתובת אימייל זו."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "הסיסמה חייבת להיות באורך של לפחות {0} תווים."
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "חשבונות"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "יש להזין את אותה הסיסמה פעמיים."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "סיסמה"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "שם המשתמש ו/או הסיסמה אינם נכונים."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "כתובת אימייל"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "אימייל"
@@ -103,89 +103,89 @@
msgid "You must type the same email each time."
msgstr "יש להזין את אותו האימייל פעמיים."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "סיסמה (שוב)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "כתובת אימייל זו כבר משויכת לחשבון זה."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "כתובת אימייל זו כבר משויכת לחשבון אחר."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "לא נמצאו כתובות אימייל מאומתות לחשבונך."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "סיסמה נוכחית"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "סיסמה חדשה"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "סיסמה חדשה (שוב)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "אנא הזן את הסיסמה הנוכחית."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "כתובת אימייל זו אינה משויכת לאף חשבון"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "אסימון איפוס הסיסמה אינו תקין."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "משתמש"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "כתובת אימייל"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "מאומת"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "ראשי"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "כתובת אימייל"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "כתובות אימייל"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "נוצר"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "נשלח"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "מפתח"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "אישור באימייל"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "אישורים בדואל"
@@ -210,91 +210,91 @@
msgid "Social Accounts"
msgstr "חשבונות חברתיים"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr ""
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "שם"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr ""
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "התחברות אחרונה"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "תאריך הצטרפות"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "חשבון חברתי"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "חשבונות חברתיים"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "פג תוקף בתאריך"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -303,11 +303,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr ""
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr ""
@@ -465,9 +467,36 @@
msgstr "במידת ושכחת, שם המשתמש שלך הוא %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "מייל איפוס סיסמה"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"שלום מ%(site_name)s!\n"
+"\n"
+"מייל זה נשלח אליך כיוון שאתה או מישהו אחר ביקש סיסמה עבור חשבונך ב "
+"%(site_name)s.\n"
+"במידה ולא ביקשת איפוס סיסמה ניתן להתעלם ממייל זה ללא חשש. לחץ על הקישור מטה "
+"לאיפוס סיסמתך."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -496,7 +525,7 @@
"\"%(email_url)s\">להנפיק בקשה חדשה לאימות כתובת אימייל."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "כניסה"
@@ -614,10 +643,18 @@
msgstr "אנא צור איתנו קשר אם אתה מתקשה לאפס את הסיסמה."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
-msgstr "המייל נשלח. אנא צור איתנו קשר אם הוא אינו מתקבל תוך מספר דקות."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
+msgstr ""
+"שלחנו אליך מייל למטרת אימות.\n"
+"אנא ללץ על הקישור בתוך אימייל זה.\n"
+"אנא צור עמנו קשר במידה והמייל לא התקבל תוך מספר דקות."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -633,11 +670,10 @@
"הקישור לאיפוס הסיסמה אינו תקין, כנראה מכיוון שכבר נעשה בו שימוש. לחץ כאן "
"לבקשת איפוס סיסמה מחדש."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "סיסמתך שונתה."
@@ -688,10 +724,16 @@
msgstr "אשר את כתובת הדואל שלך"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"שלחנו אליך מייל למטרת אימות. לחץ על הקישור במייל לסיום תהליך ההרשמה. אנא צור "
"עמנו קשר במידה והמייל לא התקבל תוך מספר דקות."
@@ -706,9 +748,16 @@
"למטרה זו, אנו מבקשים כי תאמת בעלות על כתובת האימייל שלך."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"שלחנו אליך מייל למטרת אימות.\n"
@@ -758,27 +807,27 @@
msgid "Add a 3rd Party Account"
msgstr "הוסף חשבון צד שלישי"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -818,6 +867,11 @@
"אתה עומד להשתמש בחשבון %(provider_name)s שלך כדי\n"
"להתחבר ל%(site_name)s. לסיום, אנא מלא את הטופס הבא:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr "המייל נשלח. אנא צור איתנו קשר אם הוא אינו מתקבל תוך מספר דקות."
+
#~ msgid "Account"
#~ msgstr "חשבון"
diff -Nru django-allauth-0.47.0/allauth/locale/hr/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/hr/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/hr/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/hr/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2014-08-12 00:31+0200\n"
"Last-Translator: \n"
"Language-Team: Bojan Mihelac \n"
@@ -23,19 +23,19 @@
"X-Generator: Poedit 1.5.4\n"
"X-Translated-Using: django-rosetta 0.7.2\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Nije moguće koristiti upisano korisničko ime. Molimo odaberite drugo."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Već postoji korisnik registriran s ovom e-mail adresom."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Lozinka treba imati najmanje {0} znakova."
@@ -44,11 +44,11 @@
msgid "Accounts"
msgstr "Korisnički računi"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Potrebno je upisati istu lozinku svaki put."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Lozinka"
@@ -68,13 +68,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Korisničko ime i/ili lozinka nisu ispravni."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-mail adresa"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -114,89 +114,89 @@
msgid "You must type the same email each time."
msgstr "Potrebno je upisati istu lozinku svaki put."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Lozinka (ponovno)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Vaš korisnički račun nema potvrđenu e-mail adresu."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Trenutna lozinka"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nova lozinka"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nova lozinka (ponovno)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Molimo unesite trenutnu lozinku."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr ""
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "korisnik"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "e-mail adresa"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "potvrđena"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primarna"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "E-mail adresa"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "E-mail adrese"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr ""
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr ""
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr ""
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "E-mail potvrda"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "E-mail potvrde"
@@ -221,91 +221,91 @@
msgid "Social Accounts"
msgstr "Korisnički računi"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr ""
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "naziv"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr ""
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr ""
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr ""
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -314,11 +314,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Neispravan odaziv pri dohvatu tokena zahtjeva od \\\"%s\\\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Neispravan odaziv pri dohvatu pristupnog tokena od \\\"%s\\\"."
@@ -470,9 +472,36 @@
msgstr "Za slučaj da ste zaboravili, vaše korisničko ime je %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail za resetiranje lozinke"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Pozdravi od %(site_name)s!\n"
+"\n"
+"Primili ste ovaj e-mail jer ste vi ili netko drugi zatražili lozinku za vaš "
+"korisnički račun na %(site_domain)s.\n"
+"Ako niste zatražili resetiranje lozinke, slobodno zanemarite ovaj e-mail. "
+"Kliknite na sljedeći link za resetiranje lozinke."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -501,7 +530,7 @@
"\"%(email_url)s\\\">novi e-mail za potvrdu."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Prijava"
@@ -622,12 +651,18 @@
msgstr "Molimo konktaktirajte nas ukoliko imate problema pri promjeni lozinke."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Poslali smo vam e-mail. Molimo kontaktirajte nas ako ga ne primite unutar "
-"nekoliko sljedećih minuta."
+"Poslali smo e-mail na vašu adresu u svrhu potvrde. Molimo kliknite na link "
+"unutar e-maila.\n"
+"Molimo kontaktirajte nas ako ga ne primite unutar nekoliko sljedećih minuta."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -644,11 +679,10 @@
"korišten. Molimo vas ponovite zahtjev za "
"resetiranje lozinke."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "promjena lozinke"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Lozinka je uspješno promjenjena."
@@ -700,10 +734,16 @@
msgstr "Potvrdite vašu e-mail adresu"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Poslali smo e-mail u svrhu potvrde. Sljedite dani link za završetak postupka "
"registracije. Molimo kontaktirajte nas ukoliko ga ne primite unutar "
@@ -719,9 +759,16 @@
"Zbog toga je nužno da potvrdite da ste vi vlasnik dane e-mail adrese."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Poslali smo e-mail na vašu adresu u svrhu potvrde. Molimo kliknite na link "
@@ -775,27 +822,27 @@
msgid "Add a 3rd Party Account"
msgstr "Dodaj račun društvenih mreža."
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -837,6 +884,13 @@
"stranicu %(site_name)s. Kao posljednji korak, molimo vas ispunite sljedeći "
"obrazac:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Poslali smo vam e-mail. Molimo kontaktirajte nas ako ga ne primite unutar "
+#~ "nekoliko sljedećih minuta."
+
#~ msgid "Account"
#~ msgstr "Korisnički račun"
diff -Nru django-allauth-0.47.0/allauth/locale/hu/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/hu/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/hu/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/hu/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2015-05-08 22:42+0100\n"
"Last-Translator: Tamás Makó \n"
"Language-Team: \n"
@@ -18,19 +18,19 @@
"X-Generator: Poedit 1.7.6\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Ez a felhasználói azonosító nem használható. Kérlek válassz másikat!"
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Egy felhasználó már regisztrált ezzel az email címmel."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "A jelszónak minimum {0} hosszúnak kell lennnie."
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "Felhasználók"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Ugyanazt a jelszót kell megadni mindannyiszor."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Jelszó"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "A megadott felhasználó vagy a jelszó hibás."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Email"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "Email"
@@ -109,89 +109,89 @@
msgid "You must type the same email each time."
msgstr "Ugyanazt a jelszót kell megadni mindannyiszor."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Jelszó (ismét)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "A felhasználódnak nincs ellenőrzött email címe."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Jelenlegi jelszó"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Új jelszó"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Új jelszó (ismét)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Kérlek add meg az aktuális jelszavadat!"
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr ""
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr ""
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr ""
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr ""
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr ""
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr ""
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr ""
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr ""
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr ""
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr ""
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr ""
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr ""
@@ -216,91 +216,91 @@
msgid "Social Accounts"
msgstr "Közösségi Felhasználók"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr ""
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr ""
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr ""
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr ""
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr ""
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -309,11 +309,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr ""
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr ""
@@ -459,9 +461,32 @@
msgstr "Ha esetleg nem emlékeznél pontosan, a felhasználód %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Jelszó csere email"
+#: templates/account/email/unknown_account_message.txt:4
+#, 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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Azért kaptad ezt a levelet, mert te vagy valaki más jelszócserét kért a(z) "
+"%(site_domain)s oldalon.\n"
+"Nyugodtan hagyd levelünket figyelmen kívül, ha nem te kérted. A jelszó "
+"cseréjéhez kövesd az alábbi linket."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -490,7 +515,7 @@
"\"\"%(email_url)s\">Itt kérhetsz újat.\""
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Belépés"
@@ -613,12 +638,18 @@
"beállításával."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Elküldtük az emailt. Kérlek vedd fel velünk a kapcsolatot, ha nem kapod meg "
-"perceken belül."
+"Elküldtük az ellenőrző emailt.\n"
+"Az ellenőrzéshez kövesd a benne található címet! Kérlek vedd fel \n"
+"velünk a kapcsolatot, ha az email nem érkezik meg perceken belül!"
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -634,11 +665,10 @@
"Az új jelszó kérő cím érvénytelen vagy már felhasználták. Itt tudsz újat kérni."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "A jelszavad megváltozott."
@@ -690,10 +720,16 @@
msgstr "Ellenőrizd az emailedet"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Elküldtük az ellenőrző emailt. A regisztráció befejezéséhez kövesd a benne "
"található linket! Kérlek vedd fel velünk a kapcsolatot, ha az email nem "
@@ -710,9 +746,16 @@
"hogy ellenőrizd a hozzáférésedet az email címedhez. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Elküldtük az ellenőrző emailt.\n"
@@ -764,27 +807,27 @@
msgid "Add a 3rd Party Account"
msgstr "Új közösségi felhasználó hozzáadása"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -825,6 +868,13 @@
"bejelentkezés\n"
"Utolsó lépésként kérlek töltsd ki az alábbi adatlapot:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Elküldtük az emailt. Kérlek vedd fel velünk a kapcsolatot, ha nem kapod "
+#~ "meg perceken belül."
+
#~ msgid "Account"
#~ msgstr "Felhasználó"
diff -Nru django-allauth-0.47.0/allauth/locale/id/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/id/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/id/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/id/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,20 +18,20 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"Name pengguna tidak dapat digunakan. Silahkan gunakan nama pengguna lain."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Terlalu banyak percobaan masuk yang gagal. Coba lagi nanti."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Seorang pengguna sudah terdaftar dengan alamat e-mail ini."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Kata sandi harus memiliki panjang minimal {0} karakter."
@@ -40,11 +40,11 @@
msgid "Accounts"
msgstr "Akun"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Anda harus mengetikkan kata sandi yang sama setiap kali."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Kata sandi"
@@ -64,13 +64,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Nama pengguna dan/atau kata sandi yang anda masukkan tidak benar."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Alamat e-mail"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -104,88 +104,88 @@
msgid "You must type the same email each time."
msgstr "Anda harus mengetikkan e-mail yang sama setiap kali."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Kata sandi (lagi)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Alamat e-mail ini sudah terhubung dengan akun ini."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Alamat e-mail ini sudah terhubung dengan akun lain."
-#: account/forms.py:453
+#: account/forms.py:456
#, python-format
msgid "You cannot add more than %d e-mail addresses."
msgstr "Anda tidak dapat menambahkan lebih dari %d alamat e-mail."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Kata sandi saat ini"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Kata sandi baru"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Kata sandi baru (lagi)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Silahkan ketik kata sandi Anda saat ini."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Alamat e-mail ini tidak terhubung dengan akun pengguna mana pun"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Token untuk mengatur ulang kata sandi tidak valid."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "pengguna"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "alamat e-mail"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "terverifikasi"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "utama"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "alamat e-mail"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "alamat e-mail"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "dibuat"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "dikirim"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "kunci"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "konfirmasi e-mail"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "konfirmasi e-mail"
@@ -210,91 +210,91 @@
msgid "Social Accounts"
msgstr "Akun Sosial"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "pemberi"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "nama"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "id klien"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "ID Aplikasi, atau kunci konsumen"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "kunci rahasia"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "Kunci API, kunci klien, atau kunci konsumen"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Kunci"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "aplikasi sosial"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "aplikasi sosial"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "masuk terakhir"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "tanggal bergabung"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "data tambahan"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "akun sosial"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "akun sosial"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "token"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) atau token akses (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "rahasia token"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) atau token refresh (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "kadaluarsa pada"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "token aplikasi sosial"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "token-token aplikasi sosial"
@@ -303,11 +303,13 @@
msgstr "Data profil tidak valid"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Respon tidak valid saat meminta token request dari \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Respon tidak valid saat meminta token akses dari \"%s\"."
@@ -441,9 +443,32 @@
msgstr "Jikalau Anda lupa, nama pengguna Anda adalah %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail Reset Kata Sandi"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Anda menerima e-mail ini karena Anda atau orang lain telah meminta kata "
+"sandi untuk akun Anda.\n"
+"Abaikan jika Anda tidak meminta reset kata sandi. Klik link di bawah untuk "
+"mereset kata sandi Anda."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -472,7 +497,7 @@
"\"%(email_url)s\">mengirimkan permintaan konfirmasi e-mail baru."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Masuk"
@@ -594,12 +619,18 @@
"Mohon hubungi kami jika Anda mengalami masalah saat mengubah kata sandi Anda."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Kami telah mengirimkan e-mail. Mohon hubungi kami jika Anda tidak "
-"menerimanya dalam beberapa menit."
+"Kami telah mengirimkan e-mail kepada Anda untuk\n"
+"verifikasi. Silakan klik tautan didalam e-mail ini. Silakan\n"
+"hubungi kami jika Anda tidak menerimanya dalam beberapa menit."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -615,11 +646,10 @@
"Link reset kata sandi tidak valid, mungkin karena telah digunakan. Silakan "
"minta reset kata sandi baru."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "ubah kata sandi"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Kata sandi Anda telah diubah."
@@ -670,10 +700,16 @@
msgstr "Verifikasi Alamat E-mail Anda"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Kami telah mengirimkan e-mail kepada Anda untuk verifikasi. Ikuti tautan "
"yang disediakan untuk menyelesaikan proses pendaftaran. Silahkan hubungi "
@@ -690,9 +726,16 @@
"memverifikasi kepemilikan alamat e-mail Anda. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Kami telah mengirimkan e-mail kepada Anda untuk\n"
@@ -747,27 +790,27 @@
msgid "Add a 3rd Party Account"
msgstr "Tambahkan Akun Pihak Ketiga"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -807,3 +850,10 @@
msgstr ""
"Anda akan menggunakan akun %(provider_name)s untuk masuk ke\n"
"%(site_name)s. Sebagai langkah akhir, silakan lengkapi formulir berikut:"
+
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Kami telah mengirimkan e-mail. Mohon hubungi kami jika Anda tidak "
+#~ "menerimanya dalam beberapa menit."
diff -Nru django-allauth-0.47.0/allauth/locale/it/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/it/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/it/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/it/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2020-10-15 19:55+0200\n"
"Last-Translator: Sandro \n"
"Language: it\n"
@@ -20,19 +20,19 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 1.8.7.1\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Questo username non può essere usato. Per favore scegline un altro."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Troppo tentativi di accesso. Riprova più tardi."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Un altro utente si è già registrato con questo indirizzo e-mail."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "La password deve essere lunga almeno {0} caratteri."
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "Account"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Devi digitare la stessa password."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Password"
@@ -65,13 +65,13 @@
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:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Indirizzo e-mail"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -105,89 +105,89 @@
msgid "You must type the same email each time."
msgstr "Devi digitare la stessa password ogni volta."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Password (nuovamente)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Questo indirizzo e-mail è già associato a questo account."
-#: account/forms.py:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Non hai ancora verificato il tuo indirizzo e-mail."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Password attuale"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nuova password"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nuova password (nuovamente)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Per favore digita la tua password attuale."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Il codice per il reset della password non è valido."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "utente"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "indirizzo e-mail"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "verificato"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primario"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "indirizzo email"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "indirizzi email"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "creato"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "inviato"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "chiave"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "email di conferma"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "email di conferma"
@@ -212,91 +212,91 @@
msgid "Social Accounts"
msgstr "Account"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "provider"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "nome"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "Id cliente"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App ID, o consumer key"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "secret key"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Chiave"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "Ultimo accesso"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "data iscrizione"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "dati aggiuntivi"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "scade il"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -305,11 +305,13 @@
msgstr "Dati profilo non validi"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Risposta non valida alla richiesta di un token da \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Risposta non valida alla richiesta di un token da \"%s\"."
@@ -442,9 +444,32 @@
msgstr "Nel caso tu lo abbia dimenticato, il tuo nome utente è %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-Mail per re-impostare la password "
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Hai ricevuto questa mail perché hai richiesto la password per il tuo account "
+"utente.\n"
+"Se non hai richiesto tu il reset della password, ignora questa mail, "
+"altrimenti clicca sul link qui sotto per fare il reset della password."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -473,7 +498,7 @@
"href=\"%(email_url)s\">ripetere la richiesta di conferma via e-mail."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Accedi"
@@ -594,12 +619,19 @@
msgstr "Se hai qualche problema a re-impostare la password, contattaci."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Ti abbiamo spedito una mail. Contattaci se non la ricevi entro qualche "
-"minuto."
+"Ti abbiamo inviato un messaggio e-mail di verifica.\n"
+"Clicca sul link contenuto nella mail.\n"
+"Se non dovessi ricevere il messaggio entro qualche minuto, contattaci.\n"
+"Grazie."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -616,11 +648,10 @@
"stato usato. Inoltra una nuova richiesta di "
"re-impostazione della password."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "cambia password"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Password cambiata."
@@ -671,10 +702,16 @@
msgstr "Verifica il tuo indirizzo E-Mail"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Ti abbiamo inviato una e-mail con un Link inserito all'interno. Per "
"completare il procedimento di verifica clicca sul Link. Contattaci se non "
@@ -691,9 +728,16 @@
"dimostrare che hai effettivamente accesso al tuo indirizzo e-mail. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Ti abbiamo inviato un messaggio e-mail di verifica.\n"
@@ -748,27 +792,27 @@
msgid "Add a 3rd Party Account"
msgstr "Aggiungi un account di un Social Network"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -810,6 +854,13 @@
"%(site_name)s. Come ultima operazione ti chiediamo di riempire il form qui "
"sotto:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Ti abbiamo spedito una mail. Contattaci se non la ricevi entro qualche "
+#~ "minuto."
+
#~ msgid "Account"
#~ msgstr "Account"
diff -Nru django-allauth-0.47.0/allauth/locale/ja/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/ja/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/ja/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/ja/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2014-08-12 00:32+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "このユーザー名は使用できません。他のユーザー名を選んでください。"
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "ログイン失敗が連続しています。時間が経ってからやり直してください。"
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "他のユーザーがこのメールアドレスを使用しています。"
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "パスワードは {0} 文字以上の長さが必要です。"
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "アカウント"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "同じパスワードを入力してください。"
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "パスワード"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "入力されたユーザー名もしくはパスワードが正しくありません。"
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "メールアドレス"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "メールアドレス"
@@ -107,89 +107,89 @@
msgid "You must type the same email each time."
msgstr "同じパスワードを入力してください。"
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "パスワード(再入力)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "このメールアドレスはすでに登録されています。"
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "このメールアドレスは別のアカウントで使用されています。"
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "確認済みのメールアドレスの登録が必要です。"
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "現在のパスワード"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "新しいパスワード"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "新しいパスワード(再入力)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "現在のパスワードを入力してください。"
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "このメールアドレスで登録されたユーザーアカウントがありません。"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr ""
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "ユーザー"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "メールアドレス"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "確認済み"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "メイン"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "メールアドレス"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "メールアドレス"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "作成日時"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "送信日時"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr ""
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "メールアドレスの確認"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "メールアドレスの確認"
@@ -212,91 +212,91 @@
msgid "Social Accounts"
msgstr "外部アカウント"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "プロバイダー"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "ユーザー名"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr ""
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr ""
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr ""
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -305,6 +305,7 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr ""
@@ -312,6 +313,7 @@
"んでした。"
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr ""
@@ -446,9 +448,32 @@
msgstr "あなたのアカウント(ユーザー名)は %(username)s です。"
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "パスワード再設定メール"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"このメールは、あなた(もしくは別の誰か)がパスワードの再設定を行おうとしたた"
+"めに送られました。\n"
+"パスワードの再設定を要求したのがあなたではない場合、このメールは無視してくだ"
+"さい。パスワードを再設定するためには、以下のリンクをクリックしてください。"
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -477,7 +502,7 @@
"\"%(email_url)s\">確認用のメールを再送してください。"
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "ログイン"
@@ -597,12 +622,18 @@
msgstr "パスワードの再設定に問題がある場合はご連絡ください。"
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"パスワード再設定用のメールを送信しました。数分たっても届かない場合はご連絡く"
-"ださい。"
+"確認のためのメールを送信しましたので、記載されたリンクをクリックしてくださ"
+"い。\n"
+"数分以内にメールが届かない場合はご連絡ください。"
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -619,11 +650,10 @@
"一度 パスワードの再設定をお試しくださ"
"い。"
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "パスワードが変更されました。"
@@ -676,10 +706,16 @@
msgstr "メールアドレスを確認してください"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"確認のメールを送信しました。メールに記載されたリンクをクリックして、ユーザー"
"登録を完了させてください。数分待っても確認のメールが届かない場合はご連絡くだ"
@@ -696,9 +732,16 @@
"ただきます。"
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"確認のためのメールを送信しましたので、記載されたリンクをクリックしてくださ"
@@ -749,27 +792,27 @@
msgid "Add a 3rd Party Account"
msgstr "外部アカウントを追加する"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -811,6 +854,13 @@
"す。\n"
"ユーザー登録のために、以下のフォームに記入してください。"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "パスワード再設定用のメールを送信しました。数分たっても届かない場合はご連絡"
+#~ "ください。"
+
#~ msgid "Account"
#~ msgstr "アカウント"
diff -Nru django-allauth-0.47.0/allauth/locale/ka/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/ka/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/ka/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/ka/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Nikoloz Naskidashvili \n"
"Language-Team: LANGUAGE \n"
@@ -18,20 +18,20 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"ამ მომხმარებლის სახელის გამოყენება შეუძლებელია. გთხოვთ გამოიყენოთ სხვა."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "შესვლის ძალიან ბევრი წარუმატებელი მცდელობა. მოგვიანებით სცადეთ."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "მომხმარებელი ამ ელ. ფოსტით უკვე დარეგისტრირებულია."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "პაროლი უნდა შეიცავდეს მინიმუმ {0} სიმბოლოს."
@@ -40,11 +40,11 @@
msgid "Accounts"
msgstr "მომხმარებლის ანგარიშები"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "თქვენ უნდა აკრიფოთ ერთი და იგივე პაროლი ყოველ ჯერზე."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "პაროლი"
@@ -64,13 +64,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "თქვენს მიერ მითითებული მომხმარებლის სახელი ან პაროლი არასწორია."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "ელ. ფოსტა"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "ელ. ფოსტა"
@@ -104,90 +104,90 @@
msgid "You must type the same email each time."
msgstr "თქვენ უნდა ჩაწეროთ ერთი და იგივე ელ. ფოსტა ყოველ ჯერზე."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "პაროლი (გაამეორეთ)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "ეს ელ.ფოსტის მისამართი უკვე დაკავშირებულია ამ ანგარიშთან."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "ეს ელ.ფოსტის მისამართი უკვე დაკავშირებულია სხვა ანგარიშთან."
-#: account/forms.py:453
+#: account/forms.py:456
#, python-format
msgid "You cannot add more than %d e-mail addresses."
msgstr "თქვენ არ შეგიძლიათ დაამატოთ %d- ზე მეტი ელექტრონული ფოსტის მისამართი."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "მიმდინარე პაროლი"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "ახალი პაროლი"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "ახალი პაროლი (გაამეორეთ)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "გთხოვთ აკრიფეთ მიმდინარე პაროლი."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr ""
"ეს ელექტრონული ფოსტის მისამართი არ არის მიბმული რომელიმე მომხმარებლის "
"ანგარიშზე"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "პაროლის აღდგენის კოდი არასწორია."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "მომხმარებელი"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "ელ. ფოსტა"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "დადასტურებული"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "პირველადი"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "ელ. ფოსტა"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "ელ. ფოსტის ანგარიშები"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "შექმნილი"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "გაგზავნილი"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "კოდი"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "ელ. ფოსტის დადასტურება"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "ელ. ფოსტის დადასტურებები"
@@ -212,92 +212,92 @@
msgid "Social Accounts"
msgstr "სოციალური ანგარიშები"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "პროვაიდერი"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "სახელი"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "კლიენტის id"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "აპლიკაციის ID ან მომხმარებლის კოდი"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "საიდუმლო კოდი"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
"API-ს საიდუმლო კოდი, კლიენტის საიდუმლო კოდი ან მომხმარებლის საიდუმლო კოდი"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "კოდი"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "სოციალური აპლიკაცია"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "სოციალური აპლიკაციები"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "ბოლო შესვლის თარიღი"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "ანგარიშის შექმნის თარიღი"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "სხვა მონაცემები"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "სოციალური ანგარიში"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "სოციალური ანგარიშები"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "კოდი"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) ან access token (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "საიდუმლო კოდი"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) ან refresh token (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "ვადა გაუსვლის თარიღი"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "სოციალური ანგარიშის კოდი"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "სოციალური ანგარიშების კოდი"
@@ -306,11 +306,13 @@
msgstr "პროფილის მონაცემები არასწორია"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "არასწორი პასუხი მოთხოვნის მიღებისას \"%s\"-დან."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "არასწორი პასუხი მოთხოვნის მიღებისას \"%s\"-დან."
@@ -446,9 +448,32 @@
msgstr "თუ თქვენ დაგავიწყდათ, თქვენი მომხმარებლის სახელია: %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "პაროლის აღდგენის ელ. წერილი"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"თქვენ იღებთ ამ ელ. წერილს რადგან თქვენ ან სხვა ვიღაცამ მოითხოვა პაროლის "
+"შეცვლა თქვენს ანგარიშზე.\n"
+"თქვენ შეგიძლიათ უბრალოდ დააიგნოროთ ეს ელ. წერილი თუ ეს თქვენი მოთხოვნა არ "
+"იყო. დააჭირეთ ქვემოთ მოცემულ ლინკს პაროლის აღსადგენად."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -477,7 +502,7 @@
"\"%(email_url)s\">გააკეთოთ ახალი მოთხოვნა."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "შესვლა"
@@ -598,12 +623,18 @@
msgstr "გთხოვთ დაგვიკავშირდით თუ გაქვთ პრობლემა პაროლის შეცვლასთან."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"ჩვენ გამოგიგზავნეთ ელ. წერილი. გთხოვთ დაგვიკავშირდით თი არ მიიღებთ რამდენიმე "
-"წუთში."
+"ჩვენ გამოგიგზავნეთ ელ. წერილი\n"
+"ვერიფიკაციისთვის. გთხოვთ მიჰყევით მასში მოცემულ ლინკს. გთხოვთ\n"
+"გთხოვთ დაგვიკავშირდით თუ არ მიიღებთ მას რამდენიმე წუთში."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -620,11 +651,10 @@
"იქნა. გთხოვთ მოითხოვეთ პაროლის შეცვლა "
"თავიდან."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "თქვენი პაროლი შეცვლილია"
@@ -675,10 +705,16 @@
msgstr "დაადასტურეთ თქვენი ელ. ფოსტა"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"ჩვენ გამოგიგზავნეთ ელ. წერილი ვერიფიკაციისთვის. მიჰყევით მასში მოცემულ "
"ლინკს, რომ დაასრულოთ რეგისტრაცია. გთხოვთ დაგვიკავშირდით თუ არ მიიღებთ მას "
@@ -695,14 +731,21 @@
"თქვენი ელ. ფოსტის მისამართის საკუთრების დადასტურებას. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"ჩვენ გამოგიგზავნეთ ელ. წერილი\n"
-"ვერიფიკაციისთვის. გთხოვთ მიჰყევით მასში მოცემულ ლინკს. გთხოვთ\n"
-"გთხოვთ დაგვიკავშირდით თუ არ მიიღებთ მას რამდენიმე წუთში."
+"ვერიფიკაციისთვის, მიჰყევით მასში მოცემულ ლინკს. გთხოვთ\n"
+"დაგვიკავშირდით თუ არ მიიღებთ მას რამდენიმე წუთში."
#: templates/account/verified_email_required.html:20
#, python-format
@@ -751,29 +794,29 @@
msgid "Add a 3rd Party Account"
msgstr "სოციალური ანგარიშის დამატება"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
-msgstr ""
+msgstr "%(provider)s ანგარიშის დაკავშირება"
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
-msgstr ""
+msgstr "თქვენ აპირებთ დააკავშიროთ %(provider)s ანგარიში."
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
-msgstr ""
+msgstr "შესვლა %(provider)s ანგარიშით"
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
-msgstr ""
+msgstr "თქვენ აპირებთ შესვლას %(provider)s ანგარიშით."
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
-msgstr ""
+msgstr "გაგრძელება"
#: templates/socialaccount/login_cancelled.html:5
#: templates/socialaccount/login_cancelled.html:9
@@ -811,3 +854,10 @@
msgstr ""
"თქვენ აპირებთ გამოიყენოთ თქვენი %(provider_name)s ანგარიში შესასვლელად\n"
"%(site_name)s-ზე. როგორც საბოლოო ნაბიჯი, გთხოვთ შეავსეთ ეს ფორმა:"
+
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "ჩვენ გამოგიგზავნეთ ელ. წერილი. გთხოვთ დაგვიკავშირდით თი არ მიიღებთ "
+#~ "რამდენიმე წუთში."
diff -Nru django-allauth-0.47.0/allauth/locale/ko/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/ko/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/ko/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/ko/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "해당 아이디는 이미 사용중입니다. 다른 사용자명을 이용해 주세요."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "너무 많은 로그인 실패가 감지되었습니다. 잠시 후에 다시 시도하세요."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "해당 이메일은 이미 사용되고 있습니다."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "비밀번호는 최소 {0}자 이상이어야 합니다."
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "계정"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "동일한 비밀번호를 입력해야 합니다."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "비밀번호"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "아이디 또는 비밀번호가 올바르지 않습니다."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "이메일 주소"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "이메일"
@@ -103,89 +103,89 @@
msgid "You must type the same email each time."
msgstr "동일한 이메일을 입력해야 합니다."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "비밀번호 (확인)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "해당 이메일은 이미 이 계정에 등록되어 있습니다."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "해당 이메일은 다른 계정에 등록되어 있습니다."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "당신의 계정에는 인증된 이메일이 없습니다."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "현재 비밀번호"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "새 비밀번호"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "새 비밀번호 (확인)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "현재 비밀번호를 입력하세요."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "해당 이메일을 가지고 있는 사용자가 없습니다."
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "비밀번호 초기화 토큰이 올바르지 않습니다."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "사용자"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "이메일 주소"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "인증완료"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "주"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "이메일 주소"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "이메일 주소"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "생성됨"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "전송됨"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "키"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "이메일 확인"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "이메일 확인"
@@ -210,104 +210,106 @@
msgid "Social Accounts"
msgstr "소셜 계정"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "제공자"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "이름"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "클라이언트 아이디"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "앱 아이디 또는 컨슈머 아이디"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "비밀 키"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API 비밀 키, 클라이언트 비밀 키, 또는 컨슈머 비밀 키"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "키"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "소셜 어플리케이션"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "소셜 어플리케이션"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "최종 로그인"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "가입 날짜"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "추가 정보"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "소셜 계정"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "소셜 계정"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "토큰"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) 또는 access token (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
-msgstr ""
+msgstr "시크릿 토큰"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) 또는 refresh token (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "만료일"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "소셜 어플리케이션 토큰"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "소셜 어플리케이션 토큰"
#: socialaccount/providers/douban/views.py:36
msgid "Invalid profile data"
-msgstr ""
+msgstr "올바르지 않은 프로필 데이터"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "\"%s\".로 부터 request 토큰을 받는 도중 잘못된 응답을 받았습니다."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "\"%s\".로 부터 access 토큰을 받는 도중 잘못된 응답을 받았습니다."
@@ -393,14 +395,9 @@
msgstr "정말로 선택하신 이메일을 제거하시겠습니까?"
#: templates/account/email/base_message.txt:1
-#, fuzzy, python-format
-#| msgid ""
-#| "Thank you from %(site_name)s!\n"
-#| "%(site_domain)s"
+#, python-format
msgid "Hello from %(site_name)s!"
-msgstr ""
-"감사합니다!\n"
-"%(site_name)s %(site_domain)s"
+msgstr "안녕하세요 %(site_name)s입니다!"
#: templates/account/email/base_message.txt:5
#, python-format
@@ -408,29 +405,21 @@
"Thank you for using %(site_name)s!\n"
"%(site_domain)s"
msgstr ""
+"%(site_name)s 서비스를 이용해 주셔서 감사합니다!\n"
+"%(site_domain)s"
#: templates/account/email/email_confirmation_message.txt:5
-#, fuzzy, python-format
-#| msgid ""
-#| "Hello from %(site_name)s!\n"
-#| "\n"
-#| "You're receiving this e-mail because user %(user_display)s at "
-#| "%(site_domain)s has given yours as an e-mail address to connect their "
-#| "account.\n"
-#| "\n"
-#| "To confirm this is correct, go to %(activate_url)s\n"
+#, python-format
msgid ""
"You're receiving this e-mail because user %(user_display)s has given your e-"
"mail address to register an account on %(site_domain)s.\n"
"\n"
"To confirm this is correct, go to %(activate_url)s"
msgstr ""
-"안녕하세요. %(site_name)s 입니다!\n"
-"\n"
"%(user_display)s 에 대해 %(site_domain)s 으로부터 이메일을 인증이 전송되었습"
"니다.\n"
"\n"
-"%(activate_url)s 에서 인증을 완료하세요.\n"
+"%(activate_url)s 에서 인증을 완료하세요."
#: templates/account/email/email_confirmation_subject.txt:3
msgid "Please Confirm Your E-mail Address"
@@ -443,16 +432,41 @@
"It can be safely ignored if you did not request a password reset. Click the "
"link below to reset your password."
msgstr ""
+"회원님의 계정에 대한 암호 변경 요청이 접수되었습니다.\n"
+"패스워드 초기화를 원치 않는 경우 본 메일을 무시해 주십시요. 변경을 요청할 경"
+"우 아래 링크를 클릭하세요."
#: templates/account/email/password_reset_key_message.txt:9
#, python-format
msgid "In case you forgot, your username is %(username)s."
-msgstr ""
+msgstr "잊어버린 경우를 대비하여, 회원님의 사용자 이름은 %(username)s 입니다."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "비밀번호 초기화 이메일"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"회원님의 계정에 대한 암호 변경 요청이 접수되었습니다.\n"
+"패스워드 초기화를 원치 않는 경우 본 메일을 무시해 주십시요. 변경을 요청할 경"
+"우 아래 링크를 클릭하세요."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -464,10 +478,12 @@
"Please confirm that %(email)s is an e-mail "
"address for user %(user_display)s."
msgstr ""
+"%(email)s이 사용자 %(user_display)s의 이메일"
+"이 맞는지 확인해 주세요."
#: templates/account/email_confirm.html:20
msgid "Confirm"
-msgstr ""
+msgstr "확인"
#: templates/account/email_confirm.html:27
#, python-format
@@ -475,9 +491,11 @@
"This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request."
msgstr ""
+"이 이메일 확인 링크는 만료되었거나 유효하지 않습니다. 새로운 이메일 확인 요청을 해주세요."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "로그인"
@@ -489,6 +507,9 @@
"up\n"
"for a %(site_name)s account and sign in below:"
msgstr ""
+"사용중인 서드파티 계정을 이용해 로그인을 해주세요. 또는, %(site_name)s의 회원 가입 진행 후 아래 링크에서 로그인을 해주세"
+"요."
#: templates/account/login.html:25
msgid "or"
@@ -595,12 +616,18 @@
msgstr "비밀번호 초기화에 문제가 있으시면 저희에게 연락주세요."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"이메일이 전송되었습니다. 몇 분 후에도 이메일이 오지 않으면 저희에게 연락주세"
-"요."
+"인증메일을 전송하였습니다.\n"
+"이메일의 링크를 클릭하시고,\n"
+"몇 분 후에도 메일이 전송되지 않으면 저희에게 연락주세요."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -616,11 +643,10 @@
"비밀번호 초기화 링크가 올바르지 않습니다. 다시 비밀번호 초기화 하세요."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "비밀번호가 변경되었습니다."
@@ -672,10 +698,16 @@
msgstr "이메일을 인증하세요"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"이메일 인증 메일이 전송되었습니다.회원가입 완료를 위해 전송된 메일의 링크를 "
"클릭하세요.몇 분 후에도 메일이 전송되지 않으면 저희에게 연락주세요."
@@ -690,9 +722,16 @@
"이메일을 인증하세요."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"인증메일을 전송하였습니다.\n"
@@ -742,29 +781,29 @@
msgid "Add a 3rd Party Account"
msgstr "서드파티 계정을 추가하세요."
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
-msgstr ""
+msgstr "%(provider)s 계정 연결"
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
-msgstr ""
+msgstr "%(provider)s에서 제공하는 서드파티 계정을 연결하려 합니다."
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
-msgstr ""
+msgstr "%(provider)s을 통한 로그인"
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
-msgstr ""
+msgstr "서드파티 %(provider)s의 계정을 사용해 로그인을 진행하려 합니다."
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
-msgstr ""
+msgstr "계속"
#: templates/socialaccount/login_cancelled.html:5
#: templates/socialaccount/login_cancelled.html:9
@@ -778,6 +817,8 @@
"accounts. If this was a mistake, please proceed to sign in."
msgstr ""
+"기존 계정중 하나를 사용한 로그인을 취소하였습니다. 실수로 인한 경우, 로그인을 진행해 주세요."
#: templates/socialaccount/messages/account_connected.txt:2
msgid "The social account has been connected."
@@ -800,6 +841,13 @@
"%(provider_name)s 의 계정을 이용하여 %(site_name)s 으로 로그인하려 합니다.\n"
"마지막으로 다음 폼을 작성해주세요:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "이메일이 전송되었습니다. 몇 분 후에도 이메일이 오지 않으면 저희에게 연락주"
+#~ "세요."
+
#~ msgid "Account"
#~ msgstr "계정"
diff -Nru django-allauth-0.47.0/allauth/locale/ky/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/ky/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/ky/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/ky/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2016-07-20 22:24+0600\n"
"Last-Translator: Murat Jumashev \n"
"Language-Team: LANGUAGE \n"
@@ -18,19 +18,19 @@
"X-Generator: Poedit 1.5.4\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Бул атты колдонуу мүмкүн эмес. Башкасын тандаңыз."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Өтө көп жолу кирүү аракеттери жасалды. Кайрадан аракеттениңиз."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Мындай эмейл менен катталган колдонуучу бар."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Купуя жок дегенде {0} белгиден турушу керек."
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "Эсептер"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Сиз ошол эле купуяны кайрадан териңиз."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Купуя"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Сиз берген колдонуучу аты жана/же купуя туура эмес."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Эмейл дарек"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "Эмейл"
@@ -109,89 +109,89 @@
msgid "You must type the same email each time."
msgstr "Сиз ошол эле купуяны кайрадан териңиз."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Купуя (дагы бир жолу)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Бул эмейл дарек ушул эсеп менен буга чейин туташтырылган."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Бул эмейл дарек башка бир эсеп менен буга чейин туташтырылган."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Сиздин эсебиңизде дурусталган эмейл даректер жок."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Азыркы купуя"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Жаңы купуя"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Жаңы купуя (кайрадан)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Учурдагы купуяңызды жазыңыз."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Эмейл дарек эч бир колдонуучу эсебине байланган эмес"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Купуяны жаңыртуу токени туура эмес."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "колдонуучу"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "эмейл дарек"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "дурусталган"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "негизги"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "эмейл дарек"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "эмейл даректер"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "түзүлгөн"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "жөнөтүлгөн"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "ачкыч"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "эмейл ырастоо"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "эмейл ырастоолор"
@@ -216,91 +216,91 @@
msgid "Social Accounts"
msgstr "Социалдык эсептер"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "провайдер"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "аты"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "кардар id'си"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "Колдонмо ID'си, же керектөөчү ачкычы"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "жашыруун ачкыч"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API, кардар же керектөөчүнүн жашыруун ачкычы"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Ачкыч"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "социалдык колдонмо"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "социалдык колдонмолор"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "акыркы кириши"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "кошулган күнү"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "кошумча маалымат"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "социалдык эсеп"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "социалдык эсептер"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "токен"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) же жетки токени (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "токендин жашыруун ачкычы"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) же жаңыртуу токени (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "мөөнөтү аяктайт"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "социалдык колдонмо токени"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "социалдык колдонмо токендери"
@@ -309,11 +309,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "\"%s\" тарабынан сурам токенин алууда туура эмес жооп келди."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "\"%s\" тарабынан жетки токенин алууда туура эмес жооп келди."
@@ -473,9 +475,36 @@
msgstr "Эстей албай жатсаңыз, сиздин колдонуучу атыңыз %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Купуяны жаңыртуу эмейли"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"%(site_name)s сайтынан салам!\n"
+"\n"
+"Сиз бул катты %(site_domain)s сайтынан кимдир бирөө эсебиңиздин купуясын "
+"жаңыртуу сурамын жөнөткөндүктөн алып жататсыз.\n"
+"Эгерде сурамды сиз жөнөтпөгөн болсоңуз, бул катка көңүл бурбай эле коюңуз. "
+"Купуяны жаңыртуу үчүн төмөндөгү шилтемени басыңыз."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -504,7 +533,7 @@
"href=\"%(email_url)s\">эмейлди ырастоо сурамын кайрадан жөнөтүңүз."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Кирүү"
@@ -626,12 +655,18 @@
msgstr "Купуяны жаңыртууда суроолор пайда болсо, бизге кайрылыңыз."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Биз сизге кат жөнөттүк. Бир нече мүнөттүн ичинде келбей калса бизге "
-"кайрылыңыз."
+"Биз сизге кат жөнөттүк, дурустоо үчүн.\n"
+"Ичинде берилген шилтемени басыңыз. Эгерде\n"
+"кат бир нече мүнөттө келбей калса, бизге кайрылыңыз."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -647,11 +682,10 @@
"Купуя жаңыртуу шилтемеси туура эмес экен, ал мурун колдонулса керек. Купуяны жаңыртуу сурамын кайрадан жөнөтүңүз."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "Купуяңыз эми өзгөртүлдү."
@@ -702,10 +736,16 @@
msgstr "Эмейл дарегиңизди дурустап бериңиз"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Биз эмейлиңизди дурустоо үчүн кат жөнөттүк. Ошондо берилген шилтеме аркылуу "
"өтүп, каттоодон өтүңүз. Кат бир нече мүнөттө келбесе, бизге кайрылыңыз."
@@ -721,9 +761,16 @@
"дарек сизге таандык экенин дурусташыңыз керек."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Биз сизге кат жөнөттүк, дурустоо үчүн.\n"
@@ -774,27 +821,27 @@
msgid "Add a 3rd Party Account"
msgstr "3-тарап эсеп кошуу"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -836,6 +883,13 @@
"сайтына кирейин деп турасыз. Акыркы кадам катары кийинки калыпты\n"
"толтуруп коюңузду суранабыз :"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Биз сизге кат жөнөттүк. Бир нече мүнөттүн ичинде келбей калса бизге "
+#~ "кайрылыңыз."
+
#~ msgid "Account"
#~ msgstr "Эсеп"
diff -Nru django-allauth-0.47.0/allauth/locale/lt/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/lt/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/lt/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/lt/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -20,20 +20,20 @@
"11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? "
"1 : n % 1 != 0 ? 2: 3);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"Šis naudotojo vardas negalimas. Prašome pasirinkti kitą naudotojo vardą."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Šiuo el. pašto adresu jau yra užsiregistravęs kitas naudotojas."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Slaptažodis turi būti sudarytas mažiausiai iš {0} simbolių."
@@ -42,11 +42,11 @@
msgid "Accounts"
msgstr "Paskyros"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Turite įvesti tą patį slaptažodį kiekvieną kartą."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Slaptažodis"
@@ -66,13 +66,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Pateiktas naudotojo vardas ir/arba slaptažodis yra neteisingi."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "El. pašto adresas"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "El. paštas"
@@ -112,89 +112,89 @@
msgid "You must type the same email each time."
msgstr "Turite įvesti tą patį slaptažodį kiekvieną kartą."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Slaptažodis (pakartoti)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Jūsų paskyra neturi patvirtinto el. pašto adreso."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Esamas slaptažodis"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Naujas slaptažodis"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Naujas slaptažodis (pakartoti)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Prašome įvesti esamą jūsų slaptažodį."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Neteisingas slaptažodžio atstatymo atpažinimo ženklas."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "naudotojas"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "el. pašto adresas"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "patvirtintas"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "pirminis"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "el. pašto adresas"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "el. pašto adresai"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "sukurtas"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "išsiųstas"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "raktas"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "el. pašto patvirtinimas"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "el. pašto patvirtinimai"
@@ -219,92 +219,92 @@
msgid "Social Accounts"
msgstr "Socialinės paskyros"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "tiekėjas"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "pavadinimas"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "kliento id"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App ID arba consumer key"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "secret key"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API secret, client secret, arba consumer secret"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Raktas"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "socialinė programėlė"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "socialinės programėlės"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "paskutinis prisijungimas"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "registracijos data"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "papildomi duomenys"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "socialinė paskyra"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "socialinės paskyros"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "atpažinimo ženklas"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) arba prieigos atpažinimo ženklas (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "token secret"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
"\"oauth_token_secret\" (OAuth1) arba atnaujintas atpažinimo ženklas (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "galiojimas"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "socialinės programėlės atpažinimo ženklas"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "socialinės programėlės atpažinimo ženklai"
@@ -313,11 +313,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Klaidingas atsakymas gaunant užklausos atpažinimo ženklą iš \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Klaidingas atsakymas gaunant prieigos atpažinimo ženklą iš \"%s\"."
@@ -478,9 +480,37 @@
msgstr "Primename, kad jūsų naudotojo vardas yra %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Slaptažodžio keitimo el. paštas"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Su jumis sveikinasi %(site_name)s\n"
+"\n"
+"Jūs gavote šį laišką, kadangi jūs arba kažkas kitas pateikė slaptažodžio "
+"keitimo užklausą paskyrai susietai su šiuo el. pašto adresu iš "
+"%(site_domain)s.\n"
+"Jei jūs neteikėte slaptažodžio keitimo užklausos, galite ignoruoti šį "
+"laišką. Kad pakeistumėte savo slaptažodį sekite žemiau esančia nuoroda."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -510,7 +540,7 @@
"patvirtinimo užklausimą."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Prisijungti"
@@ -632,12 +662,18 @@
msgstr "Prašome susisiekti su mumis jei negalite atstatyti slaptažodžio."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Išsiuntėme jums laišką. Prašome susisiekti su mums jei per kelias minutes "
-"negausite laiško."
+"Išsiuntėme jums patvirtinimo laišką.\n"
+"Prašome sekite nuoroda pateiktą laiške. Susisiekite su mumis\n"
+"jei negausite laiško per kelias minutes."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -654,11 +690,10 @@
"jau buvo kartą panaudota. Prašome pakartoti slaptažodžio atstatymą."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "keisti slaptažodį"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Jūsų slaptažodis pakeistas."
@@ -709,10 +744,16 @@
msgstr "Patvirtinkite savo el. pašto adresą"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Išsiuntėme jums laišką patvirtinimui. Sekite laiške pateikta nuoroda, kad "
"užbaigtumėte registraciją. Prašome susisiekti su mumis, jei laiško negavote "
@@ -729,9 +770,16 @@
"prašome patvirtinti el. pašto adreso nuosavybę. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Išsiuntėme jums patvirtinimo laišką.\n"
@@ -785,27 +833,27 @@
msgid "Add a 3rd Party Account"
msgstr "Pridėti trečios šalies paskyrą"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -845,6 +893,13 @@
"Jūs beveik prisijungėte prie %(site_name)s naudodami %(provider_name)s\n"
"paskyrą. Liko paskutinis žingsnis, užpildyti sekančią formą:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Išsiuntėme jums laišką. Prašome susisiekti su mums jei per kelias minutes "
+#~ "negausite laiško."
+
#~ msgid "Account"
#~ msgstr "Paskyra"
diff -Nru django-allauth-0.47.0/allauth/locale/lv/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/lv/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/lv/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/lv/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -19,21 +19,21 @@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
"2);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"Lietotājvārds nevar tikt izmantots. Lūdzu izvēlietis citu lietotājvārdu."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
"Pārāk daudz neveiksmīgi pieslēgšanās mēģinājumi. Mēģiniet vēlreiz vēlāk."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Lietotājs ar šādu e-pasta adresi jau ir reģistrēts."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Parolei jābūt vismaz {0} simbolus garai."
@@ -42,11 +42,11 @@
msgid "Accounts"
msgstr "Konti"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Katru reizi jums ir jāievada tā pati parole."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Parole"
@@ -66,13 +66,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Nepareizs lietotāja vārds un/vai parole."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-pasta adrese"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-pasts"
@@ -112,89 +112,89 @@
msgid "You must type the same email each time."
msgstr "Katru reizi jums ir jāievada tā pati parole."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Parole (vēlreiz)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Šī e-pasta adrese jau ir piesaistīta šim kontam."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Šī e-pasta adrese jau ir piesaistīta citam kontam."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Jūsu kontam nav apstiprinātas e-pasta adreses."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Šobrīdējā parole"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Jaunā parole"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Jaunā parole (vēlreiz)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Lūdzu ievadiet jūsu šobrīdējo paroli."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Paroles atjaunošanas marķieris bija nederīgs."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "lietotājs"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "e-pasta adrese"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "apstiprināts"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primārā"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "e-pasta adrese"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "e-pasta adreses"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "izveidots"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "nosūtīts"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "atslēga"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "e-pasta apstiprinājums"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "e-pasta apstiprinājumi"
@@ -219,91 +219,91 @@
msgid "Social Accounts"
msgstr "Sociālie konti"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "sniedzējs"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "vārds"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "klienta id"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App ID, vai consumer key"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "secret key"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API secret, client secret, vai consumer secret"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Key"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "sociālā aplikācija"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "sociālās aplikācijas"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "pēdējā pieslēgšanās"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "reģistrācijas datums"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "papildus informācija"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "sociālais konts"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "sociālie konti"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "token"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) vai piekļūt marķierim (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "token secret"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) vai atjaunot marķieri (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "beidzas"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "sociālās aplikācijas marķieris"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "sociālās aplikācijas marķieri"
@@ -312,11 +312,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Nederīga atbilde iegūstot pieprasījuma marķieri no \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Nederīga atbilde iegūstot pieejas marķieri no \"%s\"."
@@ -477,9 +479,36 @@
msgstr "Gadījumā ja jūs aizmirsāt, tad jūsu lietotājvārds ir %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Paroles atjaunošanas e-pasts"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Sveiciens no %(site_name)s!\n"
+"\n"
+"Jūs saņemat šo e-pasta vēstuli tāpēc, ka jūs vai kāds cits ir pieprasījis "
+"paroles atjaunošanu jūsu kontam lapā %(site_domain)s.\n"
+"Jūs varat droši ignorēt šo e-pasta vēstuli, ja jūs nepieprasījat paroles "
+"atjaunošanu. Spiedied uz linka zemāk, lai atjaunotu jūsu paroli."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -509,7 +538,7 @@
"apstiprināšanas linku."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Ieiet"
@@ -631,12 +660,18 @@
msgstr "Lūdzu sazinieties ar mums, ja jums ir kādas problēmas atjaunojot to."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Mēs jums nosūtījām e-pasta vēstuli. Lūdzu sazinieties ar mums, ja dažu "
-"minūšu laikā nesaņemat vēstuli."
+"Mēs esam jums nosūtījuši e-pastu\n"
+"apstiprināšanai. Lūdzu klikšķiniet uz saites šajā e-pastā. Lūdzu\n"
+"sazinieties ar mums, ja dažu minūšu laikā nesaņemat vēstuli."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -653,11 +688,10 @@
"izmantots. Lūdzu pieprasiet jaunu paroles "
"atjaunošanu."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "Nomainīt paroli"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Jūsu parole ir nomainīta."
@@ -708,10 +742,16 @@
msgstr "Apstipriniet savu e-pasta adresi"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Jums ir nosūtīts apstiprinājuma e-pasts. Sekojiet saitei, lai pabeigu "
"reģistrācijas procesu. Lūdzu sazinieties ar mums, ja dažu minūšu laikā "
@@ -728,9 +768,16 @@
"apstipriniet, jūsu e-pasta adreses piederību. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Mēs esam jums nosūtījuši e-pastu\n"
@@ -782,27 +829,27 @@
msgid "Add a 3rd Party Account"
msgstr "Pievienot trešās puses kontu"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -842,6 +889,13 @@
"Jūs izmantosiet savu %(provider_name)s kontu, lai ieietu\n"
"%(site_name)s. Kā pēdējo soli, lūdzu aizpildiet sekojošo formu:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Mēs jums nosūtījām e-pasta vēstuli. Lūdzu sazinieties ar mums, ja dažu "
+#~ "minūšu laikā nesaņemat vēstuli."
+
#~ msgid "Account"
#~ msgstr "Konts"
diff -Nru django-allauth-0.47.0/allauth/locale/mn/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/mn/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/mn/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/mn/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: 0.1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2021-11-12 09:54+0800\n"
"Last-Translator: Bilgutei Erdenebayar \n"
"Language-Team: Mongolian \n"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Хэрэглэгчийн нэрийг ашиглах боломжгүй. Өөр нэр сонгоно уу."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Хэт олон амжилтгүй нэвтрэх оролдлого. Дараа дахин оролдоорой."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Өөр хэрэглэгч энэ имэйл хаягаар бүртгүүлсэн байна."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Нууц үг хамгийн багадаа {0} тэмдэгттэй байх ёстой."
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "Бүртгэлүүд"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Та өмнө оруулсантай ижил нууц үг оруулах ёстой."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Нууц үг"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Таны оруулсан имэйл хаяг болон/эсвэл нууц үг буруу байна."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr ""
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "Имэйл хаяг"
@@ -103,88 +103,88 @@
msgid "You must type the same email each time."
msgstr "Та өмнө оруулсантай ижил имэйл бичих ёстой."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Нууц үг (дахин)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Энэ имэйл хаяг энэ бүртгэлтэй холбогдсон байна."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Энэ имэйл хаяг өөр бүртгэлтэй холбогдсон байна."
-#: account/forms.py:453
+#: account/forms.py:456
#, python-format
msgid "You cannot add more than %d e-mail addresses."
msgstr "Та %d-с илүү имэйл хаяг нэмэх боломжгүй."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Одоогын Нууц Үг"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Шинэ Нууц Үг"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Шинэ Нууц Үг (дахин)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Одоогийн нууц үгээ оруулна уу."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Имэйл хаяг ямар ч хэрэглэгчийн бүртгэлтэй холбогдоогүй"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Нууц үг шинэчлэх токен буруу байна."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "хэрэглэгч"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "имэйл хаяг"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "баталгаажуулсан"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "үндсэн"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "имэйл хаяг"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "имэйл хаягууд"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "үүсгэсэн"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "илгээсэн"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "түлхүүр"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "имэйл баталгаажуулалт"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "имэйл баталгаажуулалт"
@@ -209,91 +209,91 @@
msgid "Social Accounts"
msgstr "Сошиал Бүртгэлүүд"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "үйлчилгээ үзүүлэгч"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "нэр"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "клиент ID"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "Апп ID эсвэл хэрэглэгчийн түлхүүр"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "нууц түлхүүр"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API нууц, клиент нууц эсвэл хэрэглэгчийн нууц"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Түлхүүр"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "сошиал апп"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "сошиал апп-ууд"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "сүүлд нэвтэрсэн"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "бүртгүүлсэн огноо"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "нэмэлт өгөгдөл"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "сошиал хаяг"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "сошиал хаягууд"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "токен"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) эсвэл нэвтрэх токен (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "токен нууц"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) эсвэл шинэчлэх токен (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "дуусах хугацаа"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "сошиал апп токен"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "сошиал апп токенууд"
@@ -302,11 +302,13 @@
msgstr "Буруу профайлын өгөгдөл"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "\"%s\"-с request токен авах үед буруу хариу."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "\"%s\"-с access токен авах үед буруу хариу."
@@ -439,9 +441,32 @@
msgstr "Хэрэв та мартсан бол таны хэрэглэгчийн нэр %(username)s байна."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Нууц Үг Шинэчлэх Имэйл"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Та эсвэл өөр хэн нэгэн таны бүртгэлтэй нууц үгийг хүссэн тул нэ "
+"имэйлийгхүлээн авч байна.\n"
+"Хэрэв та нууц үг шинэчлэх хүсэлт гаргаагүй бол энэ имэйлийг устгаж болно."
+"Нууц үгээ шинэчлэх бол доорх холбоос дээр дарна уу."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -470,7 +495,7 @@
"href=\"%(email_url)s\">шинэ имэйлээр баталгаажуулах хүсэлт гаргана уу."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Нэвтрэх"
@@ -591,12 +616,18 @@
msgstr "Нууц үгээ шинэчлэхэд асуудал гарвал бидэнтэй холбогдоно уу."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Бид танд имэйл илгээсэн. Хэдхэн минутын дотор хүлээж авахгүй бол бидэнтэй "
-"холбоо барина уу."
+"Бид танд баталгаажуулах и-мэйл илгээсэн.\n"
+"Энэ цахим шуудангийн доторх холбоос дээр дарна уу. Хэдэн минутын\n"
+"дотор хүлээж авахгүй бол бидэнтэй холбоо барина уу."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -613,11 +644,10 @@
"магадгүй. шинэ нууц үг шинэчлэх хүсэлт "
"гаргана уу."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "Таны нууц үг одоо өөрчлөгдсөн байна."
@@ -670,10 +700,16 @@
msgstr "Имэйл хаягаа баталгаажуулна уу"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Бид танд баталгаажуулах и-мэйл илгээсэн. Бүртгүүлэх үйл явцыг дуусгахын тулд "
"өгөгдсөн холбоосыг дагана уу. Хэдэн минутын дотор хүлээж авахгүй бол "
@@ -690,9 +726,16 @@
"шуудангийн хаягаа эзэмшиж буй эсэхийг баталгаажуулахыг шаардаж байна."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Бид танд баталгаажуулах и-мэйл илгээсэн.\n"
@@ -744,27 +787,27 @@
msgid "Add a 3rd Party Account"
msgstr "Гуравдагч этгээдийн бүртгэл нэмэх"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -804,3 +847,10 @@
msgstr ""
"Та %(site_name)s руу нэвтрэхийн тулд %(provider_name)s бүртгэлээ\n"
"ашиглах гэж байна. Эцсийн алхам болгон дараах маягтыг бөглөнө үү:"
+
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Бид танд имэйл илгээсэн. Хэдхэн минутын дотор хүлээж авахгүй бол бидэнтэй "
+#~ "холбоо барина уу."
diff -Nru django-allauth-0.47.0/allauth/locale/nb/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/nb/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/nb/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/nb/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2019-12-18 18:56+0100\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Brukernavnet kan ikke benyttes. Vennligst velg et annet brukernavn."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "For mange innloggingsforsøk. Vennligst prøv igjen senere."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "En bruker med denne e-postadressen er allerede registrert."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Passordet må være minst {0} tegn."
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "Kontoer"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Du må skrive det samme passordet hver gang."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Passord"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Brukernavnet og/eller passordet du oppgav er feil."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-postadresse"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-post"
@@ -103,89 +103,89 @@
msgid "You must type the same email each time."
msgstr "Du må skrive inn samme e-post hver gang."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Passord (igjen)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Denne e-postadressen er allerede tilknyttet denne kontoen."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Denne e-postadressen er tilknyttet en annen konto."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Din konto har ingen verifisert e-postadresse."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Nåværende passord"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nytt passord"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nytt passord (igjen)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Vennligst skriv inn ditt passord."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "E-postadressen er ikke tilknyttet noen brukerkonto"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Nøkkelen for passordgjenopprettelse var ugyldig."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "bruker"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "epostadresse"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "verifisert"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primær"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "e-postadresse"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "e-postadresser"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "opprettet"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "sendt"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "nøkkel"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "e-postbekreftelse"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "e-postbekreftelser"
@@ -210,91 +210,91 @@
msgid "Social Accounts"
msgstr "Sosiale kontoer"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "tilbyder"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "navn"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "klient-ID"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App-ID eller konsumentnøkkel"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "hemmelig nøkkel"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API-nøkkel, klient-nøkkel eller konsumentnøkkel"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Nøkkel"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "sosial applikasjon"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "sosiale applikasjoner"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "siste innlogging"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "ble med dato"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "ekstra data"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "sosialkonto"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "sosialkontoer"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "nøkkel"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) eller aksess token (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "hemmelig nøkkel"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) eller oppdateringsnøkkel (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "utgår den"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "sosial applikasjonsnøkkel"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "sosial applikasjonsnøkler"
@@ -303,11 +303,13 @@
msgstr "Ugyldig profildata"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Ugyldig respons ved henting av forespørselsnøkkel fra \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Ugyldig respons ved henting av tilgangsnøkkel fra \"%s\"."
@@ -465,9 +467,36 @@
msgstr "I tilfelle du har glemt det: Brukernavnet ditt er %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-post for gjenopprettelse av passord"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Hei fra %(site_name)s!\n"
+"\n"
+"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 nedenfor for å gjennopprette ditt passord."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -496,7 +525,7 @@
"\"%(email_url)s\">etterspør en ny e-postbekreftelseslink."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Logg inn"
@@ -618,12 +647,18 @@
msgstr "Vennligst kontakt oss om du har problemer med passordgjenopprettelsen."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Vi har sendt deg en e-post. Vennligst kontakt oss om du ikke mottar den "
-"innen et par minutter."
+"Vi har send en e-post til deg for\n"
+"verifikasjon. Vennligst klikk på linken i e-posten. Vennligst kontakt oss om "
+"du ikke mottar den innen et par minutter."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -640,11 +675,10 @@
"brukt. Vennligst etterspør en ny "
"passordgjennopprettelse."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "Endre passord"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Ditt passord er endret."
@@ -696,10 +730,16 @@
msgstr "Bekreft din e-postadresse"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Vi har sendt deg en e-post for verifisering. Følg linken for å fullføre "
"registreringen. Vennligst kontakt oss om du ikke har mottatt den innen et "
@@ -715,9 +755,16 @@
"av dette, må du verifisere ditt eierskap av din e-postadresse. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Vi har send en e-post til deg for\n"
@@ -769,27 +816,27 @@
msgid "Add a 3rd Party Account"
msgstr "Legg til en tredjepartskonto"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -830,5 +877,12 @@
"Du er på vei til å bruke din %(provider_name)s konto for å logge inn på\n"
"%(site_name)s. Som et siste steg, vennligst fullfør følgende skjema:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Vi har sendt deg en e-post. Vennligst kontakt oss om du ikke mottar den "
+#~ "innen et par minutter."
+
#~ msgid "Account"
#~ msgstr "Konto"
diff -Nru django-allauth-0.47.0/allauth/locale/nl/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/nl/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/nl/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/nl/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2021-12-09 16:29+0100\n"
"Last-Translator: pennersr \n"
"Language-Team: Dutch (http://www.transifex.com/projects/p/django-allauth/"
@@ -19,19 +19,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Deze gebruikersnaam mag je niet gebruiken, kies een andere."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Te veel inlogpogingen. Probeer het later nogmaals."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Er is al een gebruiker geregistreerd met dit e-mailadres."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Het wachtwoord moet minimaal {0} tekens bevatten."
@@ -40,11 +40,11 @@
msgid "Accounts"
msgstr "Accounts"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Je moet hetzelfde wachtwoord twee keer intoetsen."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Wachtwoord"
@@ -64,13 +64,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Je gebruikersnaam en wachtwoord komen niet overeen."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-mailadres"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -104,88 +104,88 @@
msgid "You must type the same email each time."
msgstr "Je moet hetzelfde e-mailadres twee keer intoetsen."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Wachtwoord (bevestigen)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Dit e-mailadres is al geassocieerd met dit account."
-#: account/forms.py:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, python-format
msgid "You cannot add more than %d e-mail addresses."
msgstr "Je kunt niet meer dan %d e-mailadressen toevoegen."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Huidig wachtwoord"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nieuw wachtwoord"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nieuw wachtwoord (bevestigen)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Geef je huidige wachtwoord op."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Dit e-mailadres is niet bij ons bekend"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "De wachtwoordherstel-sleutel is niet geldig."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "gebruiker"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "e-mailadres"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "geverifieerd"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "Primair"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "e-mailadres"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "e-mailadressen"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "aangemaakt"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "verstuurd"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "sleutel"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "e-mailadres bevestiging"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "e-mailadres bevestigingen"
@@ -210,91 +210,91 @@
msgid "Social Accounts"
msgstr "Sociale accounts"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr ""
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "naam"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr ""
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr ""
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr ""
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -303,6 +303,7 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr ""
@@ -310,6 +311,7 @@
"\"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr ""
@@ -447,9 +449,33 @@
msgstr "Deze link hoort bij je account met gebruikersnaam %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Nieuw wachtwoord"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Je ontvangt deze mail omdat er een verzoek is ingelegd om het\n"
+"wachtwoord behorende bij je %(site_domain)s account opnieuw in te\n"
+"stellen. Je kunt deze gerust mail negeren als je dit niet zelf gedaan\n"
+"hebt. Anders, klik op de volgende link om je wachtwoord opnieuw in te\n"
+"stellen."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -478,7 +504,7 @@
"nieuw e-mail verificatie verzoek in."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Aanmelden"
@@ -601,12 +627,17 @@
"stellen."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"We hebben je een e-mail verstuurd. Neem a.u.b. contact met ons op als je "
-"deze niet binnen enkele minuten ontvangen hebt."
+"Volg de link in de verificatie e-mail om de controle af te ronden. Neem a.u."
+"b. contact met ons op als je de e-mail niet binnen enkele minuten ontvangt."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -623,11 +654,10 @@
"deze al een keer gebruikt. Herstel je "
"wachtwoord opnieuw."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "Wachtwoord wijzigen"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Je wachtwoord is gewijzigd."
@@ -678,10 +708,16 @@
msgstr "Verifieer je e-mailadres"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"We hebben een e-mail verstuurd ter verificatie. Volg de link in deze mail om "
"je registratie af te ronden. Neem a.u.b. contact met ons op als je deze e-"
@@ -698,9 +734,16 @@
"daadwerkelijk toegang hebt tot het opgegeven e-mailadres."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Volg de link in de verificatie e-mail om de controle af te ronden. Neem a.u."
@@ -750,27 +793,29 @@
msgid "Add a 3rd Party Account"
msgstr "Voeg een extern account toe"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr "Koppel %(provider)s"
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
-msgstr "Je staat op het punt om een nieuw account van %(provider)s aan je account te koppelen."
+msgstr ""
+"Je staat op het punt om een nieuw account van %(provider)s aan je account te "
+"koppelen."
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr "Aanmelden via %(provider)s"
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr "Je staat op het punt om jezelf aan te melden via %(provider)s."
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr "Ga verder"
@@ -810,6 +855,13 @@
"Om bij %(site_name)s in te kunnen loggen via %(provider_name)s hebben we de "
"volgende gegevens nodig:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "We hebben je een e-mail verstuurd. Neem a.u.b. contact met ons op als je "
+#~ "deze niet binnen enkele minuten ontvangen hebt."
+
#~ msgid "Account"
#~ msgstr "Account"
diff -Nru django-allauth-0.47.0/allauth/locale/pl/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/pl/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/pl/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/pl/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2020-10-12 12:34+0200\n"
"Last-Translator: Radek Czajka \n"
"Language-Team: \n"
@@ -19,19 +19,19 @@
"%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
"%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Nie możesz użyć tej nazwy użytkownika. Proszę wybierz inną."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Zbyt wiele nieudanych prób logowania. Spróbuj ponownie później."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "W systemie jest już zarejestrowany użytkownik o tym adresie e-mail."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Hasło musi składać się z co najmniej {0} znaków."
@@ -40,11 +40,11 @@
msgid "Accounts"
msgstr "Konta"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Musisz wpisać za każdym razem to samo hasło."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Hasło"
@@ -64,13 +64,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Podana nazwa użytkownika i/lub hasło są niepoprawne."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Adres e-mail"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -104,88 +104,88 @@
msgid "You must type the same email each time."
msgstr "Musisz wpisać za każdym razem ten sam e-mail."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Hasło (ponownie)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, python-format
msgid "You cannot add more than %d e-mail addresses."
msgstr "Nie możesz dodać więcej niż %d adresów e-mail."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Obecne hasło"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nowe hasło"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nowe hasło (ponownie)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Proszę wpisz swoje obecne hasło."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Token resetowania hasła był nieprawidłowy."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "użytkownik"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "adres e-mail"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "zweryfikowany"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "podstawowy"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "adres e-mail"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "adresy e-mail"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "utworzono"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "wysłano"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "klucz"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "potwierdzenie adresu e-mail"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "potwierdzenia adresów e-mail"
@@ -210,91 +210,91 @@
msgid "Social Accounts"
msgstr "Konta społecznościowe"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "dostawca usług"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "nazwa"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "id klienta"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "ID aplikacji lub klucz odbiorcy"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "klucz prywatny"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "Klucz prywatny API, klienta lub odbiorcy"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Klucz"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "aplikacja społecznościowa"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "aplikacje społecznościowe"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "data ostatniego logowania"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "data przyłączenia"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "dodatkowe dane"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "konto społecznościowe"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "konta społecznościowe"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "token"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) lub access token (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "token secret"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) lub refresh token (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "wygasa"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "token aplikacji społecznościowej"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "tokeny aplikacji społecznościowych"
@@ -303,11 +303,13 @@
msgstr "Nieprawidłowe dane profilu"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Błędna odpowiedź podczas pobierania tokena z \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Błędna odpowiedź podczas pobierania tokena autoryzacji z \"%s\"."
@@ -443,9 +445,32 @@
"Na wszelki wypadek przypominamy, że Twoja nazwa użytkownika to %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail z łączem do zmiany hasła"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Otrzymujesz tę wiadomość, ponieważ Ty lub ktoś inny poprosił o zresetowanie "
+"hasła do Twojego konta.\n"
+"Niniejszą wiadomość możesz spokojnie zignorować, jeżeli prośba nie "
+"pochodziła od Ciebie. Kliknij w link poniżej, aby zresetować hasło."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -474,7 +499,7 @@
"\"%(email_url)s\">wygenerować nowe łącze dla Twojego adresu. ."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Zaloguj"
@@ -597,12 +622,18 @@
"Skontaktuj się z nami, jeśli masz problem ze zresetowaniem swojego hasła."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Wysłaliśmy Ci e-mail. Proszę skontaktuj się z nami, jeśli go nie otrzymasz w "
-"ciągu paru minut."
+"Wysłaliśmy Ci wiadomość e-mail.\n"
+"W celu weryfikacji musisz kliknąć w łącze zawarte w wiadomości. Proszę "
+"skontaktuj się z nami, jeśli nie dotarła do Ciebie w ciągu kilku minut."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -618,11 +649,10 @@
"Łącze resetujące hasło jest niepoprawne, prawdopodobnie zostało już użyte. "
"Zresetuj hasło jeszcze raz."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "zmień hasło"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Twoje hasło zostało zmienione."
@@ -674,10 +704,16 @@
msgstr "Zweryfikuj swój adres e-mail"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Przesłaliśmy weryfikacyjny e-mail na twój adres. Kliknij w łącze w "
"wiadomości, aby zakończyć proces rejestracji. Skontaktuj się z nami, jeśli "
@@ -693,9 +729,16 @@
"weryfikacji Twojego adresu e-mail. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Wysłaliśmy Ci wiadomość e-mail.\n"
@@ -749,27 +792,27 @@
msgid "Add a 3rd Party Account"
msgstr "Dodaj konto zewnętrzne"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -809,6 +852,13 @@
"Masz zamiar użyć konta %(provider_name)s do zalogowania się w \n"
"%(site_name)s. Jako ostatni krok, proszę wypełnij formularz:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Wysłaliśmy Ci e-mail. Proszę skontaktuj się z nami, jeśli go nie "
+#~ "otrzymasz w ciągu paru minut."
+
#~ msgid "Account"
#~ msgstr "Konto"
diff -Nru django-allauth-0.47.0/allauth/locale/pt_BR/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/pt_BR/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/pt_BR/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/pt_BR/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\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/"
@@ -22,19 +22,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "O nome de usuário não pode ser usado. Escolha outro."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Muitas tentativas de acesso sem sucesso. Tente novamente mais tarde."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Um usuário já foi registrado com este endereço de e-mail."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "A senha deve ter no mínimo {0} caracteres."
@@ -43,11 +43,11 @@
msgid "Accounts"
msgstr "Contas"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "A mesma senha deve ser escrita em ambos os campos."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Senha"
@@ -67,13 +67,13 @@
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:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Endereço de e-mail"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -113,89 +113,89 @@
msgid "You must type the same email each time."
msgstr "A mesma senha deve ser escrita em ambos os campos."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Senha (novamente)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "A sua conta não tem um endereço de e-mail verificado."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Senha Atual"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nova Senha"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nova Senha (novamente)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Por favor insira a sua senha atual."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "O token de redefinição de senha era inválido"
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "usuário"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "endereço de e-mail"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "verificado"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primário"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "endereço de e-mail"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "endereços de e-mail"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "criado"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "enviado"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "chave"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "confirmação de e-mail"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "confirmações de e-mail"
@@ -220,91 +220,91 @@
msgid "Social Accounts"
msgstr "Contas Sociais"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "provedor"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "nome"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "id do cliente"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App ID ou chave de consumidor"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "Chave secreta"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "Segredo de API, segredo de cliente ou segredo de consumidor"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Chave"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "aplicativo social"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "aplicativos sociais"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "último acesso"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "data de adesão"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "dados extras"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "conta social"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "contas sociais"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) ou token de acesso (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "token secreto"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) ou token de atualização (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "expira em"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "token de aplicativo social"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "tokens de aplicativo social"
@@ -313,11 +313,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Resposta inválida ao obter token de permissão de \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Resposta inválida ao obter token de acesso de \"%s\"."
@@ -463,9 +465,32 @@
msgstr "Caso tenha esquecido, seu nome de usuário é %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail de Redefinição de Senha"
+#: templates/account/email/unknown_account_message.txt:4
+#, 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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Você está recebendo esse e-mail porque você ou alguém tentou requisitar uma "
+"senha para sua conta de usuário em %(site_domain)s.\n"
+"Essa mensagem pode ser ignorada sem preocupações se você mesmo fez a "
+"requisição. Clique no link abaixo para redefinir sua senha. "
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -494,7 +519,7 @@
"\"%(email_url)s\">peça uma nova verificação de e-mail.."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Entrar"
@@ -617,12 +642,18 @@
"senha."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Um e-mail foi enviado. Por favor contacte-nos se não o receber nos próximos "
-"minutos."
+"Nós enviamos um um e-mail de verificação\n"
+"para você. Por favor clique no link dentro deste e-mail. Contacte-nos\n"
+"se não recebê-lo dentro dos próximos minutos."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -639,11 +670,10 @@
"usado. Por favor peça uma nova redefinição "
"da senha."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "alterar a senha"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "A sua senha foi alterada."
@@ -694,10 +724,16 @@
msgstr "Verifique o seu endereço de e-mail"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Enviamos um e-mail para você para verificação. Clique no link fornecido para "
"finalizar o processo de inscrição. Entre em contato conosco se você não "
@@ -714,9 +750,16 @@
"é dono do seu endereço de e-mail. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Nós enviamos um um e-mail de verificação\n"
@@ -768,27 +811,27 @@
msgid "Add a 3rd Party Account"
msgstr "Adicionar uma Conta Externa"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -829,6 +872,13 @@
"Você está prestes a usar sua conta do %(provider_name)s para acessar o\n"
"%(site_name)s. Como etapa final, por favor preencha o seguinte formulário:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Um e-mail foi enviado. Por favor contacte-nos se não o receber nos "
+#~ "próximos minutos."
+
#~ msgid "Account"
#~ msgstr "Conta"
diff -Nru django-allauth-0.47.0/allauth/locale/pt_PT/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/pt_PT/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/pt_PT/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/pt_PT/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\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/"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Nome de utilizador não pode ser utilizado. Por favor, use outro nome."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Demasiadas tentativas para entrar. Tente novamente mais tarde."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Um utilizador já foi registado com este endereço de e-mail."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "A palavra-passe deve ter no mínimo {0} caracteres."
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "Contas"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Deve escrever a mesma palavra-passe em ambos os campos."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Palavra-passe"
@@ -65,13 +65,13 @@
msgstr ""
"O nome de utilizador e/ou palavra-passe que especificou não estão corretos."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Endereço de e-mail"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -105,89 +105,89 @@
msgid "You must type the same email each time."
msgstr "Deve escrever o mesmo e-mail em ambos os campos."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Palavra-passe (novamente)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "A sua conta não tem um endereço de e-mail verificado."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Palavra-passe atual"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nova Palavra-passe"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nova Palavra-passe (novamente)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Por favor insira a sua palavra-passe atual."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "O token para redefinir a palavra-passe está inválido."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "utilizador"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "endereço de e-mail"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "verificado"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primário"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "endereço de e-mail"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "endereços de e-mail"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "criado"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "enviado"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "chave"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "confirmação de e-mail"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "confirmações de e-mail"
@@ -212,91 +212,91 @@
msgid "Social Accounts"
msgstr "Contas de redes sociais"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "fornecedor"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "nome"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Chave"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "aplicação social"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "aplicações sociais"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "último login"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "data de registo"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "dados extra"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "conta social"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "contas sociais"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "expira a"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "token da aplicação social"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "tokens das aplicações sociais"
@@ -305,11 +305,13 @@
msgstr "Dados de perfil inválidos"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Resposta inválida ao obter token de permissão de \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Resposta inválida ao obter token de acesso de \"%s\"."
@@ -468,9 +470,36 @@
msgstr "Caso se tenha esquecido, o seu nome de utilizador é %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail de Redefinição de Password"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Olá de %(site_name)s!\n"
+"\n"
+"Está a receber este e-mail porque você ou outra pessoa pediu uma nova "
+"palavra-passe para a sua conta.\n"
+"Pode ignorar este e-mail caso não tenha pedido uma redefinição de palavra-"
+"passe. Clique no link abaixo para redefinir a sua password."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -499,7 +528,7 @@
"\"%(email_url)s\">peça uma nova verificação de e-mail.."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Entrar"
@@ -620,11 +649,17 @@
"palavra-passe."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Enviámos-lhe um e-mail. Por favor contacte-nos se não o receber nos próximos "
+"Enviámos-lhe um e-mail para verificação. Por favor clique no link dentro "
+"deste e-mail. Por favor contacte-nos se não o receber dentro dos próximos "
"minutos."
#: templates/account/password_reset_from_key.html:7
@@ -642,11 +677,10 @@
"ter sido usado. Por favor peça uma nova "
"redefinição da palavra-passe."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "alterar a palavra-passe"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "A sua palavra-passe foi alterada."
@@ -697,10 +731,16 @@
msgstr "Verifique o seu endereço de e-mail"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Enviámos-lhe um e-mail para para verificação. Siga o link no mesmo para "
"finalizar o registo. Por favor contacte-nos se não o receber nos próximos "
@@ -716,9 +756,16 @@
"fim, pedimos que verifique que é dono do seu endereço de e-mail. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Enviámos-lhe um e-mail para verificação. Por favor clique no link dentro "
@@ -769,27 +816,27 @@
msgid "Add a 3rd Party Account"
msgstr "Adicionar uma Conta Externa"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -829,6 +876,13 @@
"Está prestes a usar a sua conta no %(provider_name)s para entrar no "
"%(site_name)s. Como um passo final, por favor complete o seguinte formulário:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Enviámos-lhe um e-mail. Por favor contacte-nos se não o receber nos "
+#~ "próximos minutos."
+
#~ msgid "Account"
#~ msgstr "Conta"
diff -Nru django-allauth-0.47.0/allauth/locale/ro/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/ro/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/ro/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/ro/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,901 @@
+# DJANGO-ALLAUTH.
+# Copyright (C) 2016
+# This file is distributed under the same license as the django-allauth package.
+#
+# Translators:
+# Steve Kossouho , 2016.
+# Gilou , 2019
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: django-allauthrr\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
+"PO-Revision-Date: 2021-11-08 19:23+0200\n"
+"Last-Translator: Gilou \n"
+"Language-Team: \n"
+"Language: ro_RO\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n==0 || (n!=1 && n%100>=1 && n"
+"%100<=19) ? 1 : 2);\n"
+"X-Generator: Poedit 3.0\n"
+
+#: account/adapter.py:47
+msgid "Username can not be used. Please use other username."
+msgstr ""
+"Numele de utilizator nu este disponibil. Te rugam alege alt nume de "
+"utilizator."
+
+#: account/adapter.py:53
+msgid "Too many failed login attempts. Try again later."
+msgstr "Prea multe incercări de conectare esuate. Incearca mai tarziu."
+
+#: account/adapter.py:55
+msgid "A user is already registered with this e-mail address."
+msgstr "Un utilizator este deja inregistrat cu aceasta adresa de e-mail."
+
+#: account/adapter.py:304
+#, python-brace-format
+msgid "Password must be a minimum of {0} characters."
+msgstr "Parola trebuie să aibă minimum {0} caractere."
+
+#: account/apps.py:7
+msgid "Accounts"
+msgstr "Conturi"
+
+#: account/forms.py:59 account/forms.py:416
+msgid "You must type the same password each time."
+msgstr "Trebuie sa tastezi aceeași parolă de fiecare data."
+
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
+msgid "Password"
+msgstr "Parola"
+
+#: account/forms.py:93
+msgid "Remember Me"
+msgstr "Tine-ma minte"
+
+#: account/forms.py:97
+msgid "This account is currently inactive."
+msgstr "Acest cont este in prezent inactiv."
+
+#: account/forms.py:99
+msgid "The e-mail address and/or password you specified are not correct."
+msgstr "Adresa de e-mail si / sau parola sunt incorecte."
+
+#: account/forms.py:102
+msgid "The username and/or password you specified are not correct."
+msgstr "Numele de utilizator si / sau parola sunt incorecte."
+
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
+msgid "E-mail address"
+msgstr "Adresa de e-mail"
+
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
+msgid "E-mail"
+msgstr "E-mail"
+
+#: account/forms.py:120 account/forms.py:123 account/forms.py:269
+#: account/forms.py:272
+msgid "Username"
+msgstr "Nume de utilizator"
+
+#: account/forms.py:133
+msgid "Username or e-mail"
+msgstr "Nume de utilizator sau e-mail"
+
+#: account/forms.py:136
+msgctxt "field label"
+msgid "Login"
+msgstr "Nume de utilizator sau e-mail"
+
+#: account/forms.py:307
+msgid "E-mail (again)"
+msgstr "E-mail (confirma)"
+
+#: account/forms.py:311
+msgid "E-mail address confirmation"
+msgstr "Confirmarea adresei de e-mail"
+
+#: account/forms.py:319
+msgid "E-mail (optional)"
+msgstr "E-mail (optional)"
+
+#: account/forms.py:359
+msgid "You must type the same email each time."
+msgstr "Trebuie sa tastezi aceeasi adresa de e-mail de fiecare data."
+
+#: account/forms.py:385 account/forms.py:502
+msgid "Password (again)"
+msgstr "Parola (confirma)"
+
+#: account/forms.py:451
+msgid "This e-mail address is already associated with this account."
+msgstr "Aceasta adresa de e-mail este deja asociata acestui cont."
+
+#: account/forms.py:454
+msgid "This e-mail address is already associated with another account."
+msgstr "Aceasta adresa de e-mail este deja asociata altui cont."
+
+#: account/forms.py:456
+#, python-format
+msgid "You cannot add more than %d e-mail addresses."
+msgstr "Nu poti adauga mai mult de %d adrese de e-mail."
+
+#: account/forms.py:481
+msgid "Current Password"
+msgstr "Parola actuala"
+
+#: account/forms.py:483 account/forms.py:588
+msgid "New Password"
+msgstr "Parola noua"
+
+#: account/forms.py:484 account/forms.py:589
+msgid "New Password (again)"
+msgstr "Parola noua (confirma)"
+
+#: account/forms.py:492
+msgid "Please type your current password."
+msgstr "Te rugam tasteaza parola actuala."
+
+#: account/forms.py:532
+msgid "The e-mail address is not assigned to any user account"
+msgstr "Adresa de e-mail nu este atribuita niciunui cont de utilizator"
+
+#: account/forms.py:610
+msgid "The password reset token was invalid."
+msgstr "Link-ul de resetare a parolei nu era valid."
+
+#: account/models.py:19
+msgid "user"
+msgstr "utilizator"
+
+#: account/models.py:25 account/models.py:80
+msgid "e-mail address"
+msgstr "adresa de e-mail"
+
+#: account/models.py:27
+msgid "verified"
+msgstr "verificata"
+
+#: account/models.py:28
+msgid "primary"
+msgstr "principala"
+
+#: account/models.py:33
+msgid "email address"
+msgstr "adresa de e-mail"
+
+#: account/models.py:34
+msgid "email addresses"
+msgstr "adrese de e-mail"
+
+#: account/models.py:83
+msgid "created"
+msgstr "creata"
+
+#: account/models.py:84
+msgid "sent"
+msgstr "trimis"
+
+#: account/models.py:85 socialaccount/models.py:59
+msgid "key"
+msgstr "cheie"
+
+#: account/models.py:90
+msgid "email confirmation"
+msgstr "confirmare e-mail"
+
+#: account/models.py:91
+msgid "email confirmations"
+msgstr "confirmari 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 ""
+"Exista deja un cont cu această adresa de e-mail. Te rugam sa vt conectați "
+"mai intai la acel cont, apoi sa conecteazi contul %s."
+
+#: socialaccount/adapter.py:131
+msgid "Your account has no password set up."
+msgstr "Contul tau nu are o parola setata."
+
+#: socialaccount/adapter.py:138
+msgid "Your account has no verified e-mail address."
+msgstr "Contul tau nu are o adresa de e-mail confirmata."
+
+#: socialaccount/apps.py:7
+msgid "Social Accounts"
+msgstr "Retele de socializare"
+
+#: socialaccount/models.py:42 socialaccount/models.py:86
+msgid "provider"
+msgstr "furnizor"
+
+#: socialaccount/models.py:46
+msgid "name"
+msgstr "nume"
+
+#: socialaccount/models.py:48
+msgid "client id"
+msgstr "id client"
+
+#: socialaccount/models.py:50
+msgid "App ID, or consumer key"
+msgstr "ID-ul aplicatiei sau cheia consumatorului"
+
+#: socialaccount/models.py:53
+msgid "secret key"
+msgstr "cheie secreta"
+
+#: socialaccount/models.py:56
+msgid "API secret, client secret, or consumer secret"
+msgstr "API secret, client secret sau consumator secret"
+
+#: socialaccount/models.py:59
+msgid "Key"
+msgstr "Cheie"
+
+#: socialaccount/models.py:76
+msgid "social application"
+msgstr "aplicatie sociala"
+
+#: socialaccount/models.py:77
+msgid "social applications"
+msgstr "aplicatii sociale"
+
+#: socialaccount/models.py:107
+msgid "uid"
+msgstr "uid"
+
+#: socialaccount/models.py:109
+msgid "last login"
+msgstr "ultima logare"
+
+#: socialaccount/models.py:110
+msgid "date joined"
+msgstr "data inscrierii"
+
+#: socialaccount/models.py:111
+msgid "extra data"
+msgstr "date suplimentare"
+
+#: socialaccount/models.py:115
+msgid "social account"
+msgstr "retea de socializare"
+
+#: socialaccount/models.py:116
+msgid "social accounts"
+msgstr "retele de socializare"
+
+#: socialaccount/models.py:143
+msgid "token"
+msgstr "token"
+
+#: socialaccount/models.py:144
+msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
+msgstr "\"oauth_token\" (OAuth1) sau token de acces (OAuth2)"
+
+#: socialaccount/models.py:148
+msgid "token secret"
+msgstr "token secret"
+
+#: socialaccount/models.py:149
+msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
+msgstr "\"oauth_token_secret\" (OAuth1) token de reimprospatare (OAuth2)"
+
+#: socialaccount/models.py:152
+msgid "expires at"
+msgstr "expira la"
+
+#: socialaccount/models.py:157
+msgid "social application token"
+msgstr "token pentru aplicatia de socializare"
+
+#: socialaccount/models.py:158
+msgid "social application tokens"
+msgstr "token-uri pentru aplicatiile de socializare"
+
+#: socialaccount/providers/douban/views.py:36
+msgid "Invalid profile data"
+msgstr "Date de profil invalide"
+
+#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
+#, python-format
+msgid "Invalid response while obtaining request token from \"%s\"."
+msgstr "Raspuns invalid la obtinerea token-ului de solicitare de la \"% s\"."
+
+#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
+#, python-format
+msgid "Invalid response while obtaining access token from \"%s\"."
+msgstr "Raspuns invalid la obtinerea token-ului de acces de la \"% s\"."
+
+#: socialaccount/providers/oauth/client.py:138
+#, python-format
+msgid "No request token saved for \"%s\"."
+msgstr "Nu s-a salvat niciun token de solicitare pentru \"% s\"."
+
+#: socialaccount/providers/oauth/client.py:189
+#, python-format
+msgid "No access token saved for \"%s\"."
+msgstr "Nu s-a salvat niciun token de acces pentru \"% s\"."
+
+#: socialaccount/providers/oauth/client.py:210
+#, python-format
+msgid "No access to private resources at \"%s\"."
+msgstr "Nu exista acces la resurse private la \"% s\"."
+
+#: templates/account/account_inactive.html:5
+#: templates/account/account_inactive.html:8
+msgid "Account Inactive"
+msgstr "Cont inactiv"
+
+#: templates/account/account_inactive.html:10
+msgid "This account is inactive."
+msgstr "Acest cont este inactiv."
+
+#: templates/account/email.html:5 templates/account/email.html:8
+msgid "E-mail Addresses"
+msgstr "Adrese de e-mail"
+
+#: templates/account/email.html:10
+msgid "The following e-mail addresses are associated with your account:"
+msgstr "Urmatoarele adrese de e-mail sunt asociate contului tau:"
+
+#: templates/account/email.html:24
+msgid "Verified"
+msgstr "Verificata"
+
+#: templates/account/email.html:26
+msgid "Unverified"
+msgstr "Neverificata"
+
+#: templates/account/email.html:28
+msgid "Primary"
+msgstr "Principala"
+
+#: templates/account/email.html:34
+msgid "Make Primary"
+msgstr "Seteaza ca principala"
+
+#: templates/account/email.html:35
+msgid "Re-send Verification"
+msgstr "Retrimite e-mail verificare"
+
+#: templates/account/email.html:36 templates/socialaccount/connections.html:35
+msgid "Remove"
+msgstr "Elimina adresa"
+
+#: templates/account/email.html:43
+msgid "Warning:"
+msgstr "Avertizare:"
+
+#: 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 ""
+"În prezent nu ai configurata nicio adresa de e-mail. Adauga o adresa de e-"
+"mail pentru a primi notificari, a putea reseta parola, etc."
+
+#: templates/account/email.html:48
+msgid "Add E-mail Address"
+msgstr "Adauga adresa de e-mail"
+
+#: templates/account/email.html:53
+msgid "Add E-mail"
+msgstr "Adauga e-mail"
+
+#: templates/account/email.html:63
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr "Sigur doresti sa elimini aceasta adresa de e-mail?"
+
+#: templates/account/email/base_message.txt:1
+#, python-format
+msgid "Hello from %(site_name)s!"
+msgstr "Salutari de la %(site_name)s!"
+
+#: templates/account/email/base_message.txt:5
+#, python-format
+msgid ""
+"Thank you for using %(site_name)s!\n"
+"%(site_domain)s"
+msgstr ""
+"Iti multumim ca folosesti %(site_name)s!\n"
+"%(site_domain)s"
+
+#: templates/account/email/email_confirmation_message.txt:5
+#, python-format
+msgid ""
+"You're receiving this e-mail because user %(user_display)s has given your e-"
+"mail address to register an account on %(site_domain)s.\n"
+"\n"
+"To confirm this is correct, go to %(activate_url)s"
+msgstr ""
+"Ai primit acest e-mail pentru ca utilizatorul %(user_display)s a folosit "
+"aceasta adresa de e-mail pentru a inregistra un cont pe %(site_domain)s.\n"
+"\n"
+"Pentru a confirma, click pe link-ul urmator: %(activate_url)s"
+
+#: templates/account/email/email_confirmation_subject.txt:3
+msgid "Please Confirm Your E-mail Address"
+msgstr "Te rugam confirma adresa de e-mail"
+
+#: templates/account/email/password_reset_key_message.txt:4
+msgid ""
+"You're receiving this e-mail because you or someone else has requested a "
+"password for your user account.\n"
+"It can be safely ignored if you did not request a password reset. Click the "
+"link below to reset your password."
+msgstr ""
+"Ai primit acest e-mail pentru ca tu sau altcineva a solicitat o resetare de "
+"parola.\n"
+"Daca nu ai fost tu cel care a solicitat resetarea parolei, te rugam sa "
+"ignori acest e-mail.\n"
+"Pentru resetarea parolei acceseaza linkul de mai jos."
+
+#: templates/account/email/password_reset_key_message.txt:9
+#, python-format
+msgid "In case you forgot, your username is %(username)s."
+msgstr "In cazul in care ai uitat, numele tau de utilizator este %(username)s."
+
+#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
+msgid "Password Reset E-mail"
+msgstr "E-mail pentru resetarea parolei"
+
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Ai primit acest e-mail pentru ca tu sau altcineva a solicitat o resetare de "
+"parola.\n"
+"Daca nu ai fost tu cel care a solicitat resetarea parolei, te rugam sa "
+"ignori acest e-mail.\n"
+"Pentru resetarea parolei acceseaza linkul de mai jos."
+
+#: templates/account/email_confirm.html:6
+#: templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr "Confirma adresa de e-mail"
+
+#: templates/account/email_confirm.html:16
+#, python-format
+msgid ""
+"Please confirm that %(email)s is an e-mail "
+"address for user %(user_display)s."
+msgstr ""
+"Te rugam confirma faptul ca %(email)s este "
+"o adresa de e-mail a utilizatorului %(user_display)s."
+
+#: templates/account/email_confirm.html:20
+msgid "Confirm"
+msgstr "Confirma"
+
+#: templates/account/email_confirm.html:27
+#, python-format
+msgid ""
+"This e-mail confirmation link expired or is invalid. Please issue a new e-mail confirmation request."
+msgstr ""
+"Link-ul de confirmare a adresei de email a expirat sau este invalid. Te "
+"rugam solicita un nou link de confirmare."
+
+#: templates/account/login.html:6 templates/account/login.html:10
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
+msgid "Sign In"
+msgstr "Conecteaza-te"
+
+#: templates/account/login.html:15
+#, python-format
+msgid ""
+"Please sign in with one\n"
+"of your existing third party accounts. Or, sign "
+"up\n"
+"for a %(site_name)s account and sign in below:"
+msgstr ""
+"Te rugam conecteaza-te cu unul\n"
+"din conturile de mai jos. Sau creeaza un cont"
+"a>\n"
+"%(site_name)s si apoi conecteaza-te folosind formularul de mai jos:"
+
+#: templates/account/login.html:25
+msgid "or"
+msgstr "sau"
+
+#: templates/account/login.html:32
+#, python-format
+msgid ""
+"If you have not created an account yet, then please\n"
+"sign up first."
+msgstr ""
+"Daca nu ai un cont inca, te rugam\n"
+"inregistreaza-te."
+
+#: templates/account/login.html:42 templates/account/password_change.html:14
+msgid "Forgot Password?"
+msgstr "Ai uitat parola?"
+
+#: templates/account/logout.html:5 templates/account/logout.html:8
+#: templates/account/logout.html:17
+msgid "Sign Out"
+msgstr "Deconecteaza-te"
+
+#: templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr "Esti sigur(a) ca vrei sa te deconectezi?"
+
+#: templates/account/messages/cannot_delete_primary_email.txt:2
+#, python-format
+msgid "You cannot remove your primary e-mail address (%(email)s)."
+msgstr ""
+"Nu poti elimina adresa de e-mail (%(email)s). \n"
+"Aceasta este setata ca adresa principala de e-mail."
+
+#: templates/account/messages/email_confirmation_sent.txt:2
+#, python-format
+msgid "Confirmation e-mail sent to %(email)s."
+msgstr "Confirma e-mailul trimis catre %(email)s."
+
+#: templates/account/messages/email_confirmed.txt:2
+#, python-format
+msgid "You have confirmed %(email)s."
+msgstr "Ai confirmat %(email)s."
+
+#: templates/account/messages/email_deleted.txt:2
+#, python-format
+msgid "Removed e-mail address %(email)s."
+msgstr "Adresa de e-mail eliminata %(email)s."
+
+#: templates/account/messages/logged_in.txt:4
+#, python-format
+msgid "Successfully signed in as %(name)s."
+msgstr "Esti conectat(a) ca %(name)s."
+
+#: templates/account/messages/logged_out.txt:2
+msgid "You have signed out."
+msgstr "Te-ai deconectat."
+
+#: templates/account/messages/password_changed.txt:2
+msgid "Password successfully changed."
+msgstr "Parola a fost schimbata cu success."
+
+#: templates/account/messages/password_set.txt:2
+msgid "Password successfully set."
+msgstr "Parola a fost setata cu success."
+
+#: templates/account/messages/primary_email_set.txt:2
+msgid "Primary e-mail address set."
+msgstr "Adresa principala de e-mail a fost setata."
+
+#: templates/account/messages/unverified_primary_email.txt:2
+msgid "Your primary e-mail address must be verified."
+msgstr ""
+"Adresa de e-mail trebuie mai intai confirmata inainte de a o seta ca adresa "
+"principala. Acceseaza link-ul din e-mailul de verificare."
+
+#: templates/account/password_change.html:5
+#: templates/account/password_change.html:8
+#: templates/account/password_change.html:13
+#: templates/account/password_reset_from_key.html:4
+#: templates/account/password_reset_from_key.html:7
+#: templates/account/password_reset_from_key_done.html:4
+#: templates/account/password_reset_from_key_done.html:7
+msgid "Change Password"
+msgstr "Schimba parola"
+
+#: 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 "Reseteaza parola"
+
+#: 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 ""
+"Ti-ai uitat parola? Introdu adresa de e-mail mai jos si-ti vom trimite un e-"
+"mail ce-ti va permite sa resetezi parola."
+
+#: templates/account/password_reset.html:20
+msgid "Reset My Password"
+msgstr "Reseteaza parola"
+
+#: templates/account/password_reset.html:23
+msgid "Please contact us if you have any trouble resetting your password."
+msgstr ""
+"Te rugam contacteaza-ne daca intampini dificultati in resetarea parolei."
+
+#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
+msgid ""
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
+msgstr ""
+"Ti-am trimis un e-mail pentru verificare (confirmare). \n"
+"Acceseaza link-ul din e-mail pentru confirmare. \n"
+"Te rugam contacteaza-ne daca nu primesti e-mailul in cateva minute."
+
+#: templates/account/password_reset_from_key.html:7
+msgid "Bad Token"
+msgstr "Token invalid"
+
+#: templates/account/password_reset_from_key.html:11
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used. Please request a new password reset"
+"a>."
+msgstr ""
+"Link-ul de resetare a parolei este invalid, posibil din cauza ca a fost deja "
+"folosit. Te rugam solicita un nou link de "
+"resetare a parolei."
+
+#: templates/account/password_reset_from_key.html:16
+msgid "change password"
+msgstr "schimba parola"
+
+#: templates/account/password_reset_from_key_done.html:8
+msgid "Your password is now changed."
+msgstr "Parola ta a fost schimbata cu succes."
+
+#: templates/account/password_set.html:5 templates/account/password_set.html:8
+#: templates/account/password_set.html:13
+msgid "Set Password"
+msgstr "Seteaza parola"
+
+#: templates/account/signup.html:5 templates/socialaccount/signup.html:5
+msgid "Signup"
+msgstr "Inregistrare"
+
+#: templates/account/signup.html:8 templates/account/signup.html:18
+#: templates/socialaccount/signup.html:8 templates/socialaccount/signup.html:19
+msgid "Sign Up"
+msgstr "Inregistreaza-te"
+
+#: templates/account/signup.html:10
+#, python-format
+msgid ""
+"Already have an account? Then please sign in."
+msgstr "Ai deja un cont? Te rugam conecteaza-te."
+
+#: templates/account/signup_closed.html:5
+#: templates/account/signup_closed.html:8
+msgid "Sign Up Closed"
+msgstr "Inregistrare blocata"
+
+#: templates/account/signup_closed.html:10
+msgid "We are sorry, but the sign up is currently closed."
+msgstr "Ne pare rau, posibilitatea inregistrarii este momentan blocata."
+
+#: templates/account/snippets/already_logged_in.html:5
+msgid "Note"
+msgstr "Nota"
+
+#: templates/account/snippets/already_logged_in.html:5
+#, python-format
+msgid "you are already logged in as %(user_display)s."
+msgstr "esti deja conectat ca %(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 "Verifica-ti adresa de e-mail"
+
+#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
+msgid ""
+"We have sent an e-mail to you for verification. Follow the link provided to "
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
+msgstr ""
+"Ti-am trimis un e-mail pentru verificare (confirmare). Acceseaza link-ul din "
+"e-mail pentru a finaliza procesul de inregistrare. Te rugam contacteaza-ne "
+"daca nu primesti e-mailul in cateva minute."
+
+#: templates/account/verified_email_required.html:12
+msgid ""
+"This part of the site requires us to verify that\n"
+"you are who you claim to be. For this purpose, we require that you\n"
+"verify ownership of your e-mail address. "
+msgstr ""
+"Pentru a accesa aceasta sectiune a site-ului \n"
+"te rugam sa confirmi ca aceasta adresa de e-mail iti apartine. "
+
+#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
+msgid ""
+"We have sent an e-mail to you for\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
+"contact us if you do not receive it within a few minutes."
+msgstr ""
+"Ti-am trimis un e-mail pentru verificare (confirmare). \n"
+"Acceseaza link-ul din e-mail pentru confirmare. \n"
+"Te rugam contacteaza-ne daca nu primesti e-mailul in cateva minute."
+
+#: templates/account/verified_email_required.html:20
+#, python-format
+msgid ""
+"Note: you can still change your e-"
+"mail address."
+msgstr ""
+"Nota: poti in continuarea sa-ti "
+"schimbi adresa de e-mail."
+
+#: templates/openid/login.html:9
+msgid "OpenID Sign In"
+msgstr "Conectare OpenID"
+
+#: templates/socialaccount/authentication_error.html:5
+#: templates/socialaccount/authentication_error.html:8
+msgid "Social Network Login Failure"
+msgstr "Conectarea la reteaua sociala a esuat"
+
+#: templates/socialaccount/authentication_error.html:10
+msgid ""
+"An error occurred while attempting to login via your social network account."
+msgstr ""
+"A aparut o eroare in incercarea de a te autentifica folosind aceasta cont de "
+"retea sociala."
+
+#: templates/socialaccount/connections.html:5
+#: templates/socialaccount/connections.html:8
+msgid "Account Connections"
+msgstr "Conexiuni"
+
+#: templates/socialaccount/connections.html:11
+msgid ""
+"You can sign in to your account using any of the following third party "
+"accounts:"
+msgstr ""
+"Te poti conecta la contul tau folosind oricare dintre urmatoarele conturi de "
+"socializare (conturi terte):"
+
+#: templates/socialaccount/connections.html:43
+msgid ""
+"You currently have no social network accounts connected to this account."
+msgstr "In present nu ai niciun cont de retea sociala asociat cu acest cont."
+
+#: templates/socialaccount/connections.html:46
+msgid "Add a 3rd Party Account"
+msgstr "Adauga un cont de retea sociala"
+
+#: templates/socialaccount/login.html:8
+#, python-format
+msgid "Connect %(provider)s"
+msgstr ""
+
+#: templates/socialaccount/login.html:10
+#, python-format
+msgid "You are about to connect a new third party account from %(provider)s."
+msgstr ""
+
+#: templates/socialaccount/login.html:12
+#, python-format
+msgid "Sign In Via %(provider)s"
+msgstr ""
+
+#: templates/socialaccount/login.html:14
+#, python-format
+msgid "You are about to sign in using a third party account from %(provider)s."
+msgstr ""
+
+#: templates/socialaccount/login.html:19
+msgid "Continue"
+msgstr ""
+
+#: templates/socialaccount/login_cancelled.html:5
+#: templates/socialaccount/login_cancelled.html:9
+msgid "Login Cancelled"
+msgstr "Conectare anulata"
+
+#: templates/socialaccount/login_cancelled.html:13
+#, python-format
+msgid ""
+"You decided to cancel logging in to our site using one of your existing "
+"accounts. If this was a mistake, please proceed to sign in."
+msgstr ""
+"Ai decis sa anulezi procesul de conectare la contul tau. Daca ai anulat din "
+"greseala, te rugam acceseaza link-ul conecteaza-te "
+"la contul tau."
+
+#: templates/socialaccount/messages/account_connected.txt:2
+msgid "The social account has been connected."
+msgstr "Contul a fost conectat cu success."
+
+#: templates/socialaccount/messages/account_connected_other.txt:2
+msgid "The social account is already connected to a different account."
+msgstr ""
+"Acest cont de socializare este deja asociat unui alt profil pe site-ul "
+"nostru."
+
+#: templates/socialaccount/messages/account_disconnected.txt:2
+msgid "The social account has been disconnected."
+msgstr "Contul de socializare a fost deconectat."
+
+#: templates/socialaccount/signup.html:10
+#, python-format
+msgid ""
+"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 ""
+"Esti pe cale de a folosi contul %(provider_name)s pentru a te conecta la\n"
+"%(site_name)s. Pentru finalizarea procesului, te rugam completeaza urmatorul "
+"formular:"
+
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Ti-am trimis un e-mail. Daca nu-l gasesti in \"inbox\", te rugam verifica "
+#~ "si folderul \"spam\".\n"
+#~ "Te rugam contacteaza-ne daca nu-l primesti in cateva minute."
+
+#~ msgid "Account"
+#~ msgstr "Compte"
+
+#~ msgid "The login and/or password you specified are not correct."
+#~ msgstr "L'identifiant ou le mot de passe sont incorrects."
+
+#~ msgid "Usernames can only contain letters, digits and @/./+/-/_."
+#~ msgstr ""
+#~ "Un pseudonyme ne peut contenir que des lettres, des chiffres, ainsi que "
+#~ "@/./+/-/_."
+
+#~ msgid "This username is already taken. Please choose another."
+#~ msgstr "Ce pseudonyme est déjà utilisé, merci d'en choisir un autre."
+
+#~ msgid "Shopify Sign In"
+#~ msgstr "Connexion Shopify"
+
+#~ msgid ""
+#~ "You have confirmed that %(email)s is an "
+#~ "e-mail address for user %(user_display)s."
+#~ msgstr ""
+#~ "Vous avez confirmé que l'adresse e-mail de l'utilsateur %(user_display)s "
+#~ "est %(email)s."
+
+#~ msgid "Thanks for using our site!"
+#~ msgstr "Merci d'utiliser notre site !"
diff -Nru django-allauth-0.47.0/allauth/locale/ru/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/ru/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/ru/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/ru/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2017-04-05 22:48+0300\n"
"Last-Translator: \n"
"Language-Team: \n"
@@ -20,19 +20,19 @@
"%100>=11 && n%100<=14)? 2 : 3);\n"
"X-Generator: Poedit 1.8.7.1\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Такое имя пользователя не может быть использовано, выберите другое."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Слишком много попыток входа в систему, попробуйте позже."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Пользователь с таким e-mail адресом уже зарегистрирован."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Минимальное количество символов в пароле: {0}."
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "Аккаунты"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Вы должны ввести одинаковый пароль дважды."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Пароль"
@@ -65,13 +65,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Имя пользователя и/или пароль не верны."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-mail адрес"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -105,89 +105,89 @@
msgid "You must type the same email each time."
msgstr "Вы должны ввести одинаковый e-mail дважды."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Пароль (ещё раз)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Указанный e-mail уже прикреплен к этому аккаунту."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Указанный e-mail прикреплен к другому пользователю."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Нет подтвержденных e-mail адресов для вашего аккаунта."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Текущий пароль"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Новый пароль"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Новый пароль (ещё раз)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Пожалуйста, введите свой текущий пароль."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Нет пользователя с таким e-mail"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Неправильный код для сброса пароля."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "пользователь"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "e-mail адрес"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "подтвержден"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "основной"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "email адрес"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "email адреса"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "создано"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "отправлено"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "ключ"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "подтверждение email адреса"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "подтверждения email адресов"
@@ -212,91 +212,91 @@
msgid "Social Accounts"
msgstr "Социальные аккаунты"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "провайдер"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "имя"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "id клиента"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "ID приложения или ключ потребителя"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "секретный ключ"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "Секретный ключ API, клиента или потребителя"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Ключ"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "социальное приложение"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "социальные приложения"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "UID пользователя"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "дата последнего входа в систему"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "дата регистрации"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "дополнительные данные"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "аккаунт социальной сети"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "аккаунты социальных сетей"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "токен"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) или access token (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "секретный токен"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) или refresh token (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "истекает"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "токен социального приложения"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "токены социальных приложений"
@@ -305,11 +305,13 @@
msgstr "Неверные данные профиля"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Неверный ответ во время получения запроса от \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Неверный ответ при получении токена доступа от \"%s\"."
@@ -467,9 +469,36 @@
msgstr "Если вы вдруг забыли, ваше имя пользователя: %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Письмо для сброса пароля"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Вас приветствует %(site_name)s!\n"
+"\n"
+"Вы получили это письмо потому, что вы или кто-то иной запросили смену пароля "
+"для своего аккаунта.\n"
+"Если это были не вы, просто проигнорируйте это письмо. Иначе перейдите по "
+"ссылке для смены пароля."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -498,7 +527,7 @@
"\"%(email_url)s\">запросите подтверждение e-mail заново."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Войти"
@@ -620,12 +649,18 @@
msgstr "Свяжитесь с нами, если у вас возникли сложности со сменой пароля."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Мы отправили вам письмо. Пожалуйста, свяжитесь с нами, если не получили его "
-"в течение нескольких минут."
+"Мы отправили вам письмо\n"
+"с подтверждением. Пожалуйста, перейдите по ссылке.\n"
+"Свяжитесь с нами, если вы не получили письмо в течение нескольких минут."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -642,11 +677,10 @@
"нового сброса пароля перейдите по ссылке"
"a>."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "Ваш пароль изменён."
@@ -697,10 +731,16 @@
msgstr "Подтвердите ваш e-mail"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Мы отправили вам e-mail с подтверждением. Для завершения процесса "
"регистрации перейдите по указанной ссылке. Если вы не получили наше "
@@ -714,9 +754,16 @@
msgstr "Эта часть сайта требует подтверждения e-mail адреса."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Мы отправили вам письмо\n"
@@ -766,27 +813,27 @@
msgid "Add a 3rd Party Account"
msgstr "Добавить внешний аккаунт"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -826,6 +873,13 @@
"Вы используете %(provider_name)s для авторизации на \n"
"%(site_name)s. Чтобы завершить, заполните следующую форму:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Мы отправили вам письмо. Пожалуйста, свяжитесь с нами, если не получили "
+#~ "его в течение нескольких минут."
+
#~ msgid "Account"
#~ msgstr "Аккаунт"
diff -Nru django-allauth-0.47.0/allauth/locale/sk/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/sk/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/sk/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/sk/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2021-05-26 16:13+0058\n"
"Last-Translator: b'Erik Telepovsky '\n"
"Language-Team: \n"
@@ -19,19 +19,19 @@
">= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
"X-Translated-Using: django-rosetta 0.9.4\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Užívateľské meno nemôže byť použité. Prosím, použite iné meno."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Príliš veľa neúspešných pokusov o prihlásenie. Skúste neskôr."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Používateľ s touto e-mailovou adresou už existuje."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Heslo musí mať aspoň {0} znakov."
@@ -40,11 +40,11 @@
msgid "Accounts"
msgstr "Účty"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Heslá sa nezhodujú."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Heslo"
@@ -64,13 +64,13 @@
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:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-mailová adresa"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -104,89 +104,89 @@
msgid "You must type the same email each time."
msgstr "E-maily sa nezhodujú."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Heslo (znovu)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, python-format
msgid "You cannot add more than %d e-mail addresses."
msgstr "Nemôžte pridať viac než %d e-mailových adries."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Súčasné heslo"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nové heslo"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nové heslo (znovu)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Prosím, napíšte svoje súčasné heslo."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Token na obnovu hesla bol nesprávny."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "používateľ"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "e-mailová adresa"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "overený"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primárny"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "e-mailová adresa"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "e-mailové adresy"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "vytvorený"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "odoslané"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "kľúč"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "potvrdenie e-mailu"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "potvrdenia e-mailu"
@@ -211,94 +211,94 @@
msgid "Social Accounts"
msgstr "Účty na sociálnych sieťach"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "poskytovateľ"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "meno"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "identifikátor klienta"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "ID aplikácie alebo zákaznícky kľúč"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "tajný kľúč"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "Kľúč API, klienta alebo zákazníka"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Kľúč"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "sociálna aplikácia"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "sociálne aplikácie"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "posledné prihlásenie"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "dáum pripojenia"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "ďalšie údaje"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "sociálny účet"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "sociálne účty"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "token"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
"\"Oauth_token\" (Podpora protokolu OAuth1) alebo prístup tokenu (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "heslo prístupového tokenu"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
"\"Oauth_token_secret\" (Podpora protokolu OAuth1) alebo token obnovenie "
"(OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "vyexpiruje"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "token sociálnej aplikácie"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "tokeny sociálnej aplikácie"
@@ -307,11 +307,13 @@
msgstr "Nesprávne profilové údaje"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Neplatná odozva pri získavaní požiadavky tokenu z \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Neplatná odozva pri získavaní prístupu tokenu z \"%s\"."
@@ -444,9 +446,31 @@
msgstr "Ak ste náhodou zabudli, vaše používateľské meno je %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail pre obnovu hesla"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Tento e-mail ste dostali, pretože niekto požiadal o heslo k Vášmu "
+"používateľskému účtu. Ak ste to neboli Vy, správu môžete pokojne ignorovať. "
+"Odkaz nižšie obnoví heslo."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -475,7 +499,7 @@
"\"%(email_url)s\">Zaslať novú žiadosť o overovací e-mail."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Prihlásiť sa"
@@ -598,12 +622,17 @@
"Prosím, kontaktujte nás, ak máte nejaký problém s obnovením svojho hesla."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Odoslali sme vám e-mail. Prosím kontaktujte nás ak ste ho nedostali do pár "
-"minút."
+"Bol vám zaslaný e-mail s overovacím odkazom. Ak ste v priebehu pár minút "
+"žiaden neobdržali, kontaktujte nás."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -619,11 +648,10 @@
"Odkaz na obnovu heslo je neplatný, pravdepodobne už bol použitý. Nové obnovenie hesla."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "zmeniť heslo"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Tvoje heslo bolo zmenené."
@@ -675,10 +703,16 @@
msgstr "Potvrďte e-mailovú adresu"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Bol vám zaslaný overovací e-mail. Pre dokončenie registrácie použite "
"overovací odkaz. Ak ste v priebehu pár minút žiaden neobdržali, kontaktujte "
@@ -694,9 +728,16 @@
"adresy. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Bol vám zaslaný e-mail s overovacím odkazom. Ak ste v priebehu pár minút "
@@ -745,27 +786,27 @@
msgid "Add a 3rd Party Account"
msgstr "Pridaj účet"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -805,3 +846,10 @@
msgstr ""
"Chystáte sa použiť váš %(provider_name)s účet na prihlásenie do "
"%(site_name)s. Ako posledný krok vyplňte nasledujúci formulár:"
+
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Odoslali sme vám e-mail. Prosím kontaktujte nás ak ste ho nedostali do "
+#~ "pár minút."
diff -Nru django-allauth-0.47.0/allauth/locale/sl/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/sl/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/sl/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/sl/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2020-06-27 12:21+0122\n"
"Last-Translator: Lev Predan Kowarski \n"
"Language-Team: Bojan Mihelac , Lev Predan Kowarski "
@@ -21,20 +21,20 @@
"%100==4 ? 2 : 3);\n"
"X-Translated-Using: django-rosetta 0.7.4\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"Uporabniško ime je neveljavno. Prosimo uporabite drugo uporabniško ime."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Preveliko število neuspelih prijav. Poskusite znova kasneje."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Za ta e-naslov že obstaja registriran uporabnik."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Geslo mora vsebovati najmanj {0} znakov. "
@@ -43,11 +43,11 @@
msgid "Accounts"
msgstr "Računi"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Vnesti je potrebno isto geslo."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Geslo"
@@ -67,13 +67,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Uporabniško ime in/ali geslo nista pravilna."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-poštni naslov"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-poštni naslov"
@@ -107,91 +107,91 @@
msgid "You must type the same email each time."
msgstr "Vnesti je potrebno isti e-poštni naslov."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Geslo (ponovno)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "E-poštni naslov že pripada vašemu uporabniškemu računu."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "E-poštni naslov že pripada drugemu uporabniškemu računu."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Vaš uporabniški račun nima preverjenega e-poštnega naslova."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Trenutno geslo"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Novo geslo"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Novo geslo (ponovno)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Prosimo vpišite trenutno geslo."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "E-poštni naslov ne pripada nobenemu uporabniškemu računu."
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Žeton za ponastavitev gesla je bil neveljaven."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "uporabnik"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
#, fuzzy
#| msgid "E-mail address"
msgid "e-mail address"
msgstr "E-poštni naslov"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "preverjeno"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "Primarni"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "E-poštni naslov"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "E-poštni naslovi"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "ustvarjeno"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "poslano"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "ključ"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "E-poštna potrditev"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "E-poštne potrditve"
@@ -216,91 +216,91 @@
msgid "Social Accounts"
msgstr "Računi družbenih omrežij."
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "ponudnik"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "ime"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "id številka"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "ID aplikacije ali uporoabniški ključ"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "skrivni ključ"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API skrivnost, skrivnost klienta ali uporabniška skrivnost"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Ključ"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "družbena aplikacija"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "družbene aplikacije"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "zadnja prijava"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "datum pridružitve"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "dodatni podatki"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "uporabniški račun družbenih omerižij"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "uporabniški računi družbenih omerižij"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "žeton"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) ali žeton za dostop (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "žeton skrivnost"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) ali žeton za osvežitev (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "veljavnost poteče"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "žeton družebnih omrežij"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "žetoni družbenih omrežij"
@@ -309,11 +309,13 @@
msgstr "Nevelljavni podatki profila"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Neveljaven odgovor ob pridobivanju žetona za zahtevo od \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Neveljaven odgovor ob pridobivanju žetona za dostop od \"%s\"."
@@ -467,9 +469,35 @@
msgstr "V primeru, da ste pozabili, vaše uporabniško ime je: %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-poštni naslov za ponastavitev gesla"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Pozdravljeni od %(site_name)s!\n"
+"To sporočilo ste prejeli, ker ste zahtevali ponastavitev gesla na "
+"%(site_name)s!\n"
+"To sporočilo lahko zavržete, če niste poslali zahtevka za spremembo gesla. "
+"Za ponastavitev gelsa, sledie spodnji pvezavi:"
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -498,7 +526,7 @@
"\"%(email_url)s\">pošljite nov zahtevek za potrditev.."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Prijava"
@@ -620,12 +648,18 @@
msgstr "V primeru težav pri ponastavljanju gesla, nas kontaktirajte."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Povezava za ponastavitev gesla je bila poslana. Če je ne boste prejeli v "
-"nekaj minutah, nas kontaktirajte."
+"Poslali smo vam e-poštno sporočilo s povezavo za \n"
+"potrditev. Če sporočila ne boste prejeli \n"
+"v nekaj minutah, nas kontaktirajte."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -642,11 +676,10 @@
"Prosimo, zahtevajte novo povezavo za "
"ponastavitev."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "Sprememba gesla"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Geslo je spremenjeno."
@@ -698,10 +731,16 @@
msgstr "Potrdite e-poštni naslov."
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Na vaš e-poštni naslov je bil poslano sporočilo za potrditev. Skledite "
"povezavi za zaključek registracije. Če sporočila ne boste prejeli v nekaj "
@@ -717,9 +756,16 @@
"Prosimo, da potrdite navedeni e-poštni naslov."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Poslali smo vam e-poštno sporočilo s povezavo za \n"
@@ -772,27 +818,27 @@
msgid "Add a 3rd Party Account"
msgstr "Dodaj obstoječi račun drugega ponudnika"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -832,3 +878,10 @@
msgstr ""
"Uporabili boste svoj obstoječi %(provider_name)s račun, za vpis v\n"
"%(site_name)s. Prosimo izpolnite spodnji obrazec:"
+
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Povezava za ponastavitev gesla je bila poslana. Če je ne boste prejeli v "
+#~ "nekaj minutah, nas kontaktirajte."
diff -Nru django-allauth-0.47.0/allauth/locale/sr/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/sr/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/sr/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/sr/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Nikola Vulovic \n"
"Language-Team: NONE\n"
@@ -19,20 +19,20 @@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"Корисничко име се не може користити. Молимо користите друго корисничко име."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Превише неуспелих покушаја пријављивања. Покушајте поново касније."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Корисник је већ регистрован на овој адреси е-поште."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Лозинка мора бити најмање {0} знакова."
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "Рачуни"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Морате унијети исту лозинку сваки пут"
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Лозинка"
@@ -65,13 +65,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Корисничко име и/или лозинка коју сте навели нису тачни."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Адреса е-поште"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "Е-пошта"
@@ -105,89 +105,89 @@
msgid "You must type the same email each time."
msgstr "Морате унијети исту адресу е-поште сваки пут."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Лозинка (поново)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Ова адреса е-поште је већ повезана са овим налогом."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Ова адреса е-поште је већ повезана са другим налогом."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Ваш налог нема потврђену е-маил адресу."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Тренутна лозинка"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Нова лозинка"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Нова лозинка (поново)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Молимо унесите тренутну лозинку."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Адреса е-поште није додељена било ком корисничком налогу"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Токен ресетовања лозинке је неважећи."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "корисник"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "адреса е-поште"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "проверено"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "примарна"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "адреса е-поште"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "адресе е-поште"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "створено"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "послат"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "кључ"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "потврда е-поште"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "потврде е-поште"
@@ -212,91 +212,91 @@
msgid "Social Accounts"
msgstr "Друштвени рачуни"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "провидер"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "име"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "ИД клијента"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "ИД апликације или потрошачки кључ"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "тајни кључ"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "Тајна АПИ-ја, тајна клијента или тајна потрошача"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Кључ"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "друштвена апликација"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "друштвена апликације"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "уид"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "Последње пријављивање"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "Датум придружио"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "додатни подаци"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "друштвени рачун"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "друштвени рачуни"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "токен"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) или токен приступа (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "токен тајна"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) или освежени токен (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "истиче у"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "Токен друштвених апликација"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "токени друштвених апликација"
@@ -305,11 +305,13 @@
msgstr "Невељавни подаци о профилу"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Неважећи одговор при добијању токена за захтев од \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Неважећи одговор при добијању токена за приступ од \"%s\"."
@@ -467,9 +469,36 @@
msgstr "У случају да сте заборавили, ваше корисничко име је %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Поништавање лозинке е-поштом"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Здраво од %(site_name)s!\n"
+"\n"
+"Примате ову е-маил поруку јер сте ви или неко други тражилилозинку за ваш "
+"кориснички налог.\n"
+"Ова порука се може игнорисати ако нисте затражили ресет лозинке. Кликните на "
+"линк испод да бисте поништили своју лозинку."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -498,7 +527,7 @@
"href=\"%(email_url)s\">затражите нови захтев за потврду е-поште а>."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Пријавите се"
@@ -622,12 +651,18 @@
"лозинке."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Послали смо вам е-пошту. Молимо Вас да нас контактирате ако га не примитеза "
-"неколико минута."
+"Послали смо вам поруку е-поштом за\n"
+"верификацију. Кликните на везу унутар ове е-поруке.\n"
+"Контактирајте нас ако не примите е-поруку у року од неколико минута."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -644,11 +679,10 @@
"билаискоришћена. Молимо Вас да затражите ново поништаванје лозинкеа>."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "Ваша лозинка је сада промењена."
@@ -701,10 +735,16 @@
msgstr "Потврдите Вашу адресу е-поште"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Послали смо вам поруку е-поштом за верификацију. Пратите дату везу који сте "
"могли да завршите процес регистрације. Молимо вас да нас контактирате ако га "
@@ -721,9 +761,16 @@
"потврдите власништво над вашом адресом е-поште."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Послали смо вам поруку е-поштом за\n"
@@ -778,27 +825,27 @@
msgid "Add a 3rd Party Account"
msgstr "Додајте рачун треће стране"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -839,5 +886,12 @@
"Управо користите свој рачун код %(provider_name)s да бисте се пријавили на\n"
"%(site_name)s. Као последњи корак, молимо попуните следећи образац:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Послали смо вам е-пошту. Молимо Вас да нас контактирате ако га не "
+#~ "примитеза неколико минута."
+
#~ msgid "Account"
#~ msgstr "Рачун"
diff -Nru django-allauth-0.47.0/allauth/locale/sr_Latn/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/sr_Latn/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/sr_Latn/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/sr_Latn/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Nikola Vulovic \n"
"Language-Team: NONE\n"
@@ -19,20 +19,20 @@
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"Korisničko ime se ne može koristiti. Molimo koristite drugo korisničko ime."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Previše neuspelih pokušaja prijavljivanja. Pokušajte ponovo kasnije."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Korisnik je već registrovan na ovoj adresi e-pošte."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Lozinka mora biti najmanje {0} znakova."
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "Računi"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Morate unijeti istu lozinku svaki put"
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Lozinka"
@@ -65,13 +65,13 @@
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:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Adresa e-pošte"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-pošta"
@@ -105,89 +105,89 @@
msgid "You must type the same email each time."
msgstr "Morate unijeti istu adresu e-pošte svaki put."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Lozinka (ponovo)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Vaš nalog nema potvrđenu e-mail adresu."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Trenutna lozinka"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nova lozinka"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nova lozinka (ponovo)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Molimo unesite trenutnu lozinku."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Token resetovanja lozinke je nevažeći."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "korisnik"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "adresa e-pošte"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "provereno"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "primarna"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "adresa e-pošte"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "adrese e-pošte"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "stvoreno"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "poslat"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "ključ"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "potvrda e-pošte"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "potvrde e-pošte"
@@ -212,91 +212,91 @@
msgid "Social Accounts"
msgstr "Društveni računi"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "provider"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "ime"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "ID klijenta"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "ID aplikacije ili potrošački ključ"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "tajni ključ"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "Tajna API-ja, tajna klijenta ili tajna potrošača"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Ključ"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "društvena aplikacija"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "društvena aplikacije"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "Poslednje prijavljivanje"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "Datum pridružio"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "dodatni podaci"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "društveni račun"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "društveni računi"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "token"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) ili token pristupa (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "token tajna"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) ili osveženi token (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "ističe u"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "Token društvenih aplikacija"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "tokeni društvenih aplikacija"
@@ -305,11 +305,13 @@
msgstr "Neveljavni podaci o profilu"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Nevažeći odgovor pri dobijanju tokena za zahtev od \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Nevažeći odgovor pri dobijanju tokena za pristup od \"%s\"."
@@ -467,9 +469,36 @@
msgstr "U slučaju da ste zaboravili, vaše korisničko ime je %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Poništavanje lozinke e-poštom"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Zdravo od %(site_name)s!\n"
+"\n"
+"Primate ovu e-mail poruku jer ste vi ili neko drugi tražililozinku za vaš "
+"korisnički nalog.\n"
+"Ova poruka se može ignorisati ako niste zatražili reset lozinke. Kliknite na "
+"link ispod da biste poništili svoju lozinku."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -498,7 +527,7 @@
"href=\"%(email_url)s\">zatražite novi zahtev za potvrdu e-pošte ."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Prijavite se"
@@ -622,12 +651,18 @@
"lozinke."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Poslali smo vam e-poštu. Molimo Vas da nas kontaktirate ako ga ne primiteza "
-"nekoliko minuta."
+"Poslali smo vam poruku e-poštom za\n"
+"verifikaciju. Kliknite na vezu unutar ove e-poruke.\n"
+"Kontaktirajte nas ako ne primite e-poruku u roku od nekoliko minuta."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -644,11 +679,10 @@
"bilaiskorišćena. Molimo Vas da zatražite novo poništavanje lozinke."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "promeni lozinku"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Vaša lozinka je sada promenjena."
@@ -701,10 +735,16 @@
msgstr "Potvrdite Vašu adresu e-pošte"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Poslali smo vam poruku e-poštom za verifikaciju. Pratite datu vezu koji ste "
"mogli da završite proces registracije. Molimo vas da nas kontaktirate ako ga "
@@ -721,9 +761,16 @@
"potvrdite vlasništvo nad vašom adresom e-pošte."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Poslali smo vam poruku e-poštom za\n"
@@ -778,27 +825,27 @@
msgid "Add a 3rd Party Account"
msgstr "Dodajte račun treće strane"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -839,5 +886,12 @@
"Upravo koristite svoj račun kod %(provider_name)s da biste se prijavili na\n"
"%(site_name)s. Kao poslednji korak, molimo popunite sledeći obrazac:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Poslali smo vam e-poštu. Molimo Vas da nas kontaktirate ako ga ne "
+#~ "primiteza nekoliko minuta."
+
#~ msgid "Account"
#~ msgstr "Račun"
diff -Nru django-allauth-0.47.0/allauth/locale/sv/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/sv/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/sv/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/sv/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\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/"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Användarnamnet kan ej användas. Välj ett annat användarnamn."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "En användare är redan registrerad med den här epost-adressen"
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Lösenordet måste vara minst {0} tecken långt"
@@ -40,11 +40,11 @@
msgid "Accounts"
msgstr "Konto"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Du måste ange samma lösenord"
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Lösenord"
@@ -64,13 +64,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Användarnamnet och/eller lösenordet är felaktigt."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "Epost-adress"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "Epost"
@@ -110,92 +110,92 @@
msgid "You must type the same email each time."
msgstr "Du måste ange samma lösenord"
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Lösenord (igen)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Denna epost-adress är redan knuten till detta konto"
-#: account/forms.py:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Ditt konto har ingen verifierad epost-adress."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Nuvarande lösenord"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Nytt lösenord"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Nytt lösenord (igen)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Skriv in ditt nuvarande lösenord."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr ""
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr ""
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
#, fuzzy
msgid "e-mail address"
msgstr "epost-adress"
-#: account/models.py:30
+#: account/models.py:27
#, fuzzy
msgid "verified"
msgstr "Ej verifierad"
-#: account/models.py:31
+#: account/models.py:28
#, fuzzy
msgid "primary"
msgstr "Primär"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "epost-adress"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "epost-adresser"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr ""
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr ""
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr ""
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "epost-bekräftelse"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "epost-bekräftelser"
@@ -219,92 +219,92 @@
msgid "Social Accounts"
msgstr "Konto"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr ""
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
#, fuzzy
msgid "name"
msgstr "Användarnamn"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr ""
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr ""
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr ""
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -313,11 +313,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Felaktigt svar vid hämtning av fråge-nyckel från \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Felaktigt svar vid hämtning av access-nyckel från \"%s\"."
@@ -463,9 +465,32 @@
msgstr "Ditt användarnamn är %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Återställning av lösenord"
+#: templates/account/email/unknown_account_message.txt:4
+#, 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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Du har fått detta mail för att du eller någon annan har begärt en "
+"återställning av ditt lösenord på %(site_domain)s.\n"
+"Du kan bortse från detta mail om du inte begärt en återställning. Klicka på "
+"länken nedan för att återställa ditt lösenord."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -494,7 +519,7 @@
"href=\"%(email_url)s\">Skapa en ny epost-verification."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Logga in"
@@ -616,12 +641,18 @@
"Vänligen kontakta oss om du har problem med att återställa ditt lösenord."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Ett mail har nu skickats. Kontakta oss om det inte dyker upp inom ett par "
-"minuter."
+"Vi har skickat ett mail till dig för\n"
+"verifiering. Klicka på länken inne i detta mail. Kontakta\n"
+"oss om det inte dyker upp inom ett par minuter."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -638,11 +669,10 @@
"redan har använts. Begär en ny lösenords-"
"återställning."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "ändra lösenord"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Ditt lösenord är nu ändrat."
@@ -697,8 +727,9 @@
#, fuzzy
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Ett mail för verifiering har skickats till "
"%(email)s. Klicka på länken i mailet för att slutföra anmälan. Kontakta "
@@ -715,9 +746,16 @@
"angett rätt epost-adress. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Vi har skickat ett mail till dig för\n"
@@ -768,27 +806,27 @@
msgid "Add a 3rd Party Account"
msgstr "Lägg till tredjeparts-konto"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -828,6 +866,13 @@
"Du håller på att logga in via ditt konto på %(provider_name)s på \n"
"%(site_name)s. Fyll i följande formulär för att slutföra inloggningen:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Ett mail har nu skickats. Kontakta oss om det inte dyker upp inom ett par "
+#~ "minuter."
+
#~ msgid "Account"
#~ msgstr "Konto"
diff -Nru django-allauth-0.47.0/allauth/locale/th/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/th/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/th/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/th/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2015-06-26 13:09+0700\n"
"Last-Translator: Nattaphoom Chaipreecha \n"
"Language-Team: Thai \n"
@@ -20,19 +20,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "ไม่สามารถใช้ชื่อผู้ใช้นี้ได้ กรุณาใช้ชื่อผู้ใช้อื่น"
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "ชื่อผู้ใช้ได้ถูกลงทะเบียนด้วยอีเมลนี้แล้ว"
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "รหัสผ่านต้องมีอย่างน้อย {0} ตัวอักษร"
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "บัญชี"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "ต้องพิมพ์รหัสผ่านเดิมซ้ำอีกครั้ง"
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "รหัสผ่าน"
@@ -65,13 +65,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "ชื่อผู้ใช้และ/หรือรหัสผ่านที่ระบุมาไม่ถูกต้อง"
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "อีเมล"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "อีเมล"
@@ -111,89 +111,89 @@
msgid "You must type the same email each time."
msgstr "ต้องพิมพ์รหัสผ่านเดิมซ้ำอีกครั้ง"
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "รหัสผ่าน (อีกครั้ง)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "อีเมลนี้ได้ถูกเชื่อมกับบัญชีนี้แล้ว"
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "อีเมลนี้ได้ถูกเชื่อมกับบัญชีอื่นแล้ว"
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "บัญชีของคุณไม่มีอีเมลที่ยืนยันแล้ว"
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "รหัสผ่านปัจจุบัน"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "รหัสผ่านใหม่"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "รหัสผ่านใหม่ (อีกครั้ง)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "โปรดใส่รหัสผ่านปัจจุบัน"
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "อีเมลนี้ไม่ได้เชื่อมกับบัญชีใดเลย"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "token ที่ใช้รีเซ็ทรหัสผ่านไม่ถูกต้อง"
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "ผู้ใช้"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "อีเมล"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "ยืนยันแล้ว"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "หลัก"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "อีเมล"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "อีเมล"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "สร้างแล้ว"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "ส่งแล้ว"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "คีย์"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "การยืนยันอีเมล"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "การยืนยันอีเมล"
@@ -216,91 +216,91 @@
msgid "Social Accounts"
msgstr "บัญชีโซเชียล"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "ผู้ให้บริการ"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "ชื่อ"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "คีย์"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr ""
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr ""
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "token"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -309,11 +309,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "การตอบสนองผิดพลาดขณะที่กำลังได้รับ request token จาก \"%s\""
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "การตอบสนองผิดพลาดขณะที่กำลังได้รับ access token จาก \"%s\""
@@ -471,9 +473,36 @@
msgstr "ในกรณีเผื่อคุณลืม ชื่อผู้ใช้ของคุณคือ %(username)s"
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "อีเมลในการรีเซ็ทรหัสผ่าน"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "Hello from %(site_name)s!\n"
+#| "\n"
+#| "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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"สวัสดีจาก %(site_name)s!\n"
+"\n"
+"You're receiving this e-mail because you or someone else has requested a "
+"คุณได้รับอีเมลนี้เพราะว่า คุณหรือใครบางคนได้ทำการร้องขอรหัสผ่านของบัญชีนี้ที่ %(site_domain)s.\n"
+"It can be safely ignored if you did not request a password reset. Click the "
+"คุณสามารถมองข้ามและลบอีเมลนี้ทิ้งได้เลยหากคุณไม่ได้ทำการร้องขอการรีเซ็ทรหัสผ่านคลิกที่ลิงค์ข้างล่างนี้เพื่อรีเซ็ทรหัสผ่านของคุณ"
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -502,7 +531,7 @@
"\"> ติดต่อการร้องขอการยืนยันอีเมล."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "ลงชื่อเข้าใช้"
@@ -622,10 +651,18 @@
msgstr "กรุณาติดต่อเราหากคุณพบปัญหาในการรีเซ็ทรหัสผ่าน"
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
-msgstr "เราได้ส่งอีเมลให้คุณแล้ว. กรุณาติดต่อเราหากคุณไม่ได้รับอีเมลภายในเวลาไม่กี่นาทีนี้"
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
+msgstr ""
+"เราได้ส่งอีเมลให้คุณเพื่อ\n"
+"ทำการยืนยัน กรุณาคลิกลิงค์ที่อยู่ข้างในอีเมล\n"
+"กรุณาติดต่อเราหากคุณไม่ได้รับอีเมลภายในเวลาไม่กี่นาทีนี้"
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -641,11 +678,10 @@
"ลิงค์ที่ใช้ในการรีเซ็ทรหัสผ่านไม่ถูกต้อง อาจเป็นไปได้ว่ามันได้ถูกใช้ไปแล้วกรุณาร้องขอ การรีเซ็ทรหัสผ่านใหม่"
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "รหัสผ่านของคุณได้เปลี่ยนแล้ว"
@@ -696,10 +732,16 @@
msgstr "ยืนยันอีเมลของคุณ"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"เราได้ส่งอีเมลถึงคุณเพื่อให้คุณได้ทำการยืนยัน "
"ใช้ลิงค์ที่อยู่ในอีเมลเพื่อทำการสิ้นสุดการลงทะเบียนกรุณาติดต่อเราหากคุณไม่ได้รับอีเมลภายในเวลาไม่กี่นาทีนี้"
@@ -714,9 +756,16 @@
"ด้วยการนี้ เราขอให้คุณทำการยืนยันการเป็นเจ้าของของอีเมลของคุณก่อน"
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"เราได้ส่งอีเมลให้คุณเพื่อ\n"
@@ -766,27 +815,27 @@
msgid "Add a 3rd Party Account"
msgstr "เพิ่ม บัญชีภายนอก"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -826,6 +875,11 @@
"คุณกำลังจะทำการใช้บัญชี %(provider_name)s ของคุณ ในการเข้าสู่ระบบของ\n"
"%(site_name)s. ในขั้นตอนสุดท้าย กรุณากรอกฟอร์มข้างล่าง:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr "เราได้ส่งอีเมลให้คุณแล้ว. กรุณาติดต่อเราหากคุณไม่ได้รับอีเมลภายในเวลาไม่กี่นาทีนี้"
+
#~ msgid "Account"
#~ msgstr "บัญชี"
diff -Nru django-allauth-0.47.0/allauth/locale/tr/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/tr/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/tr/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/tr/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\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/"
@@ -19,19 +19,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "Bu kullanıcı adı kullanılamaz. Lütfen başka bir kullanıcı adı deneyin."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Çok fazla hatalı giriş yapıldı. Lütfen daha sonra tekrar deneyin."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Bu e-posta adresiyle bir kullanıcı zaten kayıtlı."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Parola en az {0} karakter olmalıdır."
@@ -41,11 +41,11 @@
msgid "Accounts"
msgstr "Hesap"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Her seferinde aynı parolayı girmelisiniz."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Parola"
@@ -65,13 +65,13 @@
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:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-posta adresi"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-posta"
@@ -111,92 +111,92 @@
msgid "You must type the same email each time."
msgstr "Her seferinde aynı parolayı girmelisiniz."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Parola (tekrar)"
-#: account/forms.py:448
+#: account/forms.py:451
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:451
+#: account/forms.py:454
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:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Hesabınızın doğrulanmış e-posta adresi yok."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Mevcut Parola"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Yeni Parola"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Yeni Parola (tekrar)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Mevcut parolanızı tekrar yazın."
-#: account/forms.py:529
+#: account/forms.py:532
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:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Şifre sıfırlama kodu hatalı."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "kullanıcı"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
#, fuzzy
msgid "e-mail address"
msgstr "e-posta adresi"
-#: account/models.py:30
+#: account/models.py:27
#, fuzzy
msgid "verified"
msgstr "Doğrulanmamış"
-#: account/models.py:31
+#: account/models.py:28
#, fuzzy
msgid "primary"
msgstr "Birincil"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "e-posta adresi"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "e-posta adresleri"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "oluşturuldu"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "gönderildi"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr ""
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "e-posta onayı"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "e-posta onayları"
@@ -222,92 +222,92 @@
msgid "Social Accounts"
msgstr "Hesap"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "sağlayıcı"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
#, fuzzy
msgid "name"
msgstr "Kullanıcı adı"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr ""
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "son giriş"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "katıldığı tarih"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -316,11 +316,13 @@
msgstr "Geçersiz profil bilgisi"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "\"%s\"'dan talep kodu alınırken geçersiz cevap alındı."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "\"%s\"'dan erişim kodu alınırken geçersiz cevap alındı."
@@ -469,9 +471,32 @@
msgstr "Kullanıcı adınızı unuttuysanız, kullanıcı adınız: %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "Parola Sıfırlama E-postası"
+#: templates/account/email/unknown_account_message.txt:4
+#, 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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Bu e-postayı alıyorsunuz çünkü siz veya bir başkası %(site_domain)s "
+"sitesindeki hesabınız için parola sıfırlama talebinde bulundu.\n"
+"Eğer böyle bir talepte bulunmadıysanız bu e-postayı gözardı edebilirsiniz. "
+"Bulunduysanız aşağıdaki bağlantıya tıklayarak parolanızı sıfırlayabilirsiniz."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -500,7 +525,7 @@
"href=\"%(email_url)s\">yeni bir e-posta doğrulama talebinde bulunun.."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Giriş Yap"
@@ -620,12 +645,18 @@
"ulaşın."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Size bir e-posta gönderdik. Birkaç dakika içerisinde size ulaşmazsa lütfen "
-"bize ulaşın."
+"Doğrulama için size bir e-posta gönderdik.\n"
+"Lütfen e-postadaki bağlantıya tıklayın. Eğer birkaç dakika içinde\n"
+"bu e-postayı almazsanız bize ulaşın."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -642,11 +673,10 @@
"için. Lütfen yeni parola sıfırlama "
"talebinde bulunun."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
msgstr "parola değiştir"
-#: templates/account/password_reset_from_key.html:20
#: templates/account/password_reset_from_key_done.html:8
msgid "Your password is now changed."
msgstr "Parolanız değişti."
@@ -702,8 +732,9 @@
#, fuzzy
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"%(email)s adresinize doğrulama amaçlı e-"
"posta gönderdik. Üyelik sürecini tamamlamak için sunulan bağlantıyı takip "
@@ -720,9 +751,16 @@
"olduğunuzu doğrulamanızı rica ediyoruz. "
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Doğrulama için size bir e-posta gönderdik.\n"
@@ -773,27 +811,27 @@
msgid "Add a 3rd Party Account"
msgstr "3. Parti Hesap ekle"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -834,6 +872,13 @@
"%(site_name)s sitesine giriş yapmak için %(provider_name)s hesabınızı "
"kullanmak üzeresiniz. Son bir adım olarak, lütfen şu formu doldurun:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Size bir e-posta gönderdik. Birkaç dakika içerisinde size ulaşmazsa "
+#~ "lütfen bize ulaşın."
+
#~ msgid "Account"
#~ msgstr "Hesap"
diff -Nru django-allauth-0.47.0/allauth/locale/uk/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/uk/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/uk/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/uk/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2020-10-15 19:53+0200\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -20,21 +20,21 @@
"100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || "
"(n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr ""
"Ім'я користувача не може бути використаним. Будь ласка, оберіть інше ім'я "
"користувача."
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "Занадто багато спроб входу в систему, спробуйте пізніше."
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "Користувач з такою e-mail адресою уже зареєстрований."
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "Пароль повинен містити мінімум {0} символів."
@@ -43,11 +43,11 @@
msgid "Accounts"
msgstr "Акаунти"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "Ви повинні вводити однаковий пароль кожного разу."
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "Пароль"
@@ -67,13 +67,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "Введене ім'я користувача і/або пароль є некоректними."
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-mail адреса"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -107,89 +107,89 @@
msgid "You must type the same email each time."
msgstr "Ви повинні вводити однакову e-mail адресу кожного разу."
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "Пароль (ще раз)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "Вказаний e-mail уже прикріплений до цього акаунту."
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "Вказаний e-mail уже прикріплений до іншого користувача."
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "Немає підтвердження по e-mail для Вашого акаунту."
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "Поточний пароль"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "Новий пароль"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "Новий пароль (ще раз)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "Будь ласка, вкажіть Ваш поточний пароль."
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "Немає користувача з такою e-mail адресою."
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "Токен відновлення паролю був невірним."
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "користувач"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
msgid "e-mail address"
msgstr "e-mail адреса"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "підтверджено"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "основний"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "e-mail адреса"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "e-mail адреса"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "створено"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "відправлено"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "ключ"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "e-mail підтвердження"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "e-mail підтвердження"
@@ -214,92 +214,92 @@
msgid "Social Accounts"
msgstr "Соціальні акаунти"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "постачальник"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "Ім'я"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "ідентифікатор клієнта"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "ідентифікатор додатку або ключ користувача"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "секретний ключ"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
"секретний ключ додатку, секретний ключ клієнта або секретний ключ користувача"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Ключ"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "соціальний додаток"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "соціальні додатки"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "ID користувача"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "дата останнього входу"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "дата реєстрації"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "додаткові дані"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "аккаунт соціальної мережі"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "акаунти соціальних мереж"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr "токен"
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr "\"oauth_token\" (OAuth1) або access token (OAuth2)"
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr "секретний токен"
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr "\"oauth_token_secret\" (OAuth1) або refresh token (OAuth2)"
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "закінчується"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "токен соціального додатку"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "токени соціальних додатків"
@@ -308,11 +308,13 @@
msgstr "Невірні дані профілю"
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Невірна відповідь під час отримання запиту від \"%s\""
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Невірна відповідь під час отримання токену доступу від \"%s\"."
@@ -447,9 +449,32 @@
msgstr "На випадок, якщо Ви забули Ваше ім'я користувача %(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "E-mail для відновлення паролю"
+#: templates/account/email/unknown_account_message.txt:4
+#, fuzzy, python-format
+#| msgid ""
+#| "You're receiving this e-mail because you or someone else has requested a "
+#| "password for your user account.\n"
+#| "It can be safely ignored if you did not request a password reset. Click "
+#| "the link below to reset your password."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"Ви отримали дане повідомлення, тому що Ви або хтось інший зробили запит на "
+"пароль для Вашого акаунту користувача на сайті %(site_domain)s.\n"
+"Дане повідомлення можна проігнорувати, якщо Ви не робили такого запиту. "
+"Перейдіть за посиланням для відновлення паролю."
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -479,7 +504,7 @@
"mail адреси."
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "Увійти"
@@ -603,12 +628,20 @@
"паролю."
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
msgstr ""
-"Ми надіслали Вам e-mail повідомлення. Будь ласка, зв'яжіться з нами, якщо Ви "
-"не отримаєте повідомлення протягом декількох хвилин."
+"Ми надіслали Вам e-mail для підтвердження.\n"
+"Будь ласка, перейдіть за посилання вказаним у e-mail повідомленні. Будь "
+"ласка,\n"
+"зв'яжіться з нами, якщо Ви не отримаєте повідомлення впродовж декількох "
+"хвилин."
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -625,11 +658,10 @@
"уже використане. Будь ласка, зробіть запит на нове відновлення паролю."
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "Ваш пароль змінено."
@@ -681,10 +713,16 @@
msgstr "Підтвердіть Вашу e-mail адресу"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"Ми надіслали Вам e-mail для підтвердження. Перейдіть за посиланням для "
"звершення процесу реєстрації. Будь ласка, зв'яжіться з нами, якщо Ви не "
@@ -698,9 +736,16 @@
msgstr "Дана частина сайту вимає підтвердження e-mail адреси."
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"Ми надіслали Вам e-mail для підтвердження.\n"
@@ -755,27 +800,27 @@
msgid "Add a 3rd Party Account"
msgstr "Додати зовнішній акаунт"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -816,6 +861,13 @@
"Ви використовуєте Ваш %(provider_name)s акаунт для авторизації на\n"
"%(site_name)s. Для завершення, будь ласка, заповніть наступну форму:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "Ми надіслали Вам e-mail повідомлення. Будь ласка, зв'яжіться з нами, якщо "
+#~ "Ви не отримаєте повідомлення протягом декількох хвилин."
+
#~ msgid "Account"
#~ msgstr "Акаунт"
diff -Nru django-allauth-0.47.0/allauth/locale/zh_CN/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/zh_CN/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/zh_CN/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/zh_CN/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2014-08-12 00:36+0200\n"
"Last-Translator: jresins \n"
"Language-Team: LANGUAGE \n"
@@ -16,19 +16,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "此用户名不能使用,请改用其他用户名。"
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "登录失败次数过多,请稍后重试。"
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "此e-mail地址已被其他用户注册。"
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "密码长度不得少于 {0} 个字符。"
@@ -38,11 +38,11 @@
msgid "Accounts"
msgstr "账号"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "每次输入的密码必须相同"
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "密码"
@@ -62,13 +62,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "您提供的用户名或密码不正确。"
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-mail地址"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -108,91 +108,91 @@
msgid "You must type the same email each time."
msgstr "每次输入的密码必须相同"
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "密码(重复)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "此e-mail地址已关联到这个账号。"
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "此e-mail地址已关联到其他账号。"
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "您的账号下无任何验证过的e-mail地址。"
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "当前密码"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "新密码"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "新密码(重复)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "请输入您的当前密码"
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "此e-mail地址未分配给任何用户账号"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr "重设密码的token不合法。"
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "用户"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
#, fuzzy
msgid "e-mail address"
msgstr "e-mail地址"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "已验证"
-#: account/models.py:31
+#: account/models.py:28
#, fuzzy
msgid "primary"
msgstr "首选e-mail"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "e-mail地址"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "e-mail地址"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "已建立"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "已发送"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "key"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "e-mail确认"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "e-mail确认"
@@ -216,93 +216,93 @@
msgid "Social Accounts"
msgstr "账号"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "提供商"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
#, fuzzy
msgid "name"
msgstr "用户名"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "客户端 id"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
#, fuzzy
msgid "Key"
msgstr "key"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "最后登录"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "注册日期"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "社交账号"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "社交账号"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -311,11 +311,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Invalid response while obtaining request token from \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Invalid response while obtaining access token from \"%s\"."
@@ -457,9 +459,31 @@
msgstr "作为提示,您的用户名是%(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "密码重置邮件"
+#: templates/account/email/unknown_account_message.txt:4
+#, 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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"您收到此邮件表示您或者他人在网站 %(site_domain)s上为您的账号请求了密码重"
+"置。\n"
+"若您未请求密码重置,可以直接忽略此邮件。如要重置密码,请点击下面的链接。"
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -488,7 +512,7 @@
"请求。"
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "登录"
@@ -608,10 +632,17 @@
msgstr "如在重置密码时遇到问题,请与我们联系。"
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
-msgstr "我们已给您发了一封e-mail,如您在几分钟后仍没收到,请与我们联系。"
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
+msgstr ""
+"我们已经给您发送了一封e-mail验证邮件。\n"
+"请点击e-mail中的链接。若您在几分钟后仍未收到邮件,请联系我们。"
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -627,11 +658,10 @@
"密码重置链接无效,可能该链接已被使用。请重新申请链接重置。"
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "您的密码现已被修改。"
@@ -682,10 +712,16 @@
msgstr "验证您的E-mail地址。"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"我们已向您发了一封验证e-mail。点击e-mail中的链接完成注册流程。如果您在几分钟"
"后仍未收到邮件,请与我们联系。"
@@ -700,9 +736,16 @@
"为此,我们需要您确认您是此账号e-mail地址的所有者。"
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"我们已经给您发送了一封e-mail验证邮件。\n"
@@ -751,27 +794,27 @@
msgid "Add a 3rd Party Account"
msgstr "添加一个第三方账号"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -813,6 +856,11 @@
"您将使用您的%(provider_name)s账号登录\n"
"%(site_name)s。作为最后一步,请完成以下表单:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr "我们已给您发了一封e-mail,如您在几分钟后仍没收到,请与我们联系。"
+
#~ msgid "Account"
#~ msgstr "账号"
diff -Nru django-allauth-0.47.0/allauth/locale/zh_Hans/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/zh_Hans/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/zh_Hans/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/zh_Hans/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "此用户名不能使用,请改用其他用户名。"
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "登录失败次数过多,请稍后重试。"
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "此e-mail地址已被其他用户注册。"
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "密码长度不得少于 {0} 个字符。"
@@ -40,11 +40,11 @@
msgid "Accounts"
msgstr "账号"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "每次输入的密码必须相同"
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "密码"
@@ -64,13 +64,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "您提供的用户名或密码不正确。"
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "E-mail地址"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -110,91 +110,91 @@
msgid "You must type the same email each time."
msgstr "每次输入的密码必须相同"
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "密码(重复)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "此e-mail地址已关联到这个账号。"
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "此e-mail地址已关联到其他账号。"
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "您的账号下无任何验证过的e-mail地址。"
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "当前密码"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "新密码"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "新密码(重复)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "请输入您的当前密码"
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "此e-mail地址未分配给任何用户账号"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr ""
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "用户"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
#, fuzzy
msgid "e-mail address"
msgstr "e-mail地址"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "已验证"
-#: account/models.py:31
+#: account/models.py:28
#, fuzzy
msgid "primary"
msgstr "首选e-mail"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "e-mail地址"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "e-mail地址"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "已建立"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "已发送"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "key"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "e-mail确认"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "e-mail确认"
@@ -218,93 +218,93 @@
msgid "Social Accounts"
msgstr "账号"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr ""
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
#, fuzzy
msgid "name"
msgstr "用户名"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr ""
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr ""
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr ""
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr ""
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
#, fuzzy
msgid "Key"
msgstr "key"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr ""
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr ""
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr ""
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr ""
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr ""
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr ""
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr ""
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr ""
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr ""
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr ""
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr ""
@@ -313,11 +313,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Invalid response while obtaining request token from \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Invalid response while obtaining access token from \"%s\"."
@@ -458,9 +460,30 @@
msgstr "作为提示,您的用户名是%(username)s."
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "密码重置邮件"
+#: templates/account/email/unknown_account_message.txt:4
+#, 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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"您收到此邮件表示您或者他人在网站 %(site_name)s上为您的账号请求了密码重置。\n"
+"若您未请求密码重置,可以直接忽略此邮件。如要重置密码,请点击下面的链接。"
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -489,7 +512,7 @@
"请求。"
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "登录"
@@ -609,10 +632,17 @@
msgstr "如在重置密码时遇到问题,请与我们联系。"
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
-msgstr "我们已给您发了一封e-mail,如您在几分钟后仍没收到,请与我们联系。"
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
+msgstr ""
+"我们已经给您发送了一封e-mail验证邮件。\n"
+"请点击e-mail中的链接。若您在几分钟后仍未收到邮件,请联系我们。"
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -628,11 +658,10 @@
"密码重置链接无效,可能该链接已被使用。请重新申请链接重置。"
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "您的密码现已被修改。"
@@ -683,10 +712,16 @@
msgstr "验证您的E-mail地址。"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"我们已向您发了一封验证e-mail。点击e-mail中的链接完成注册流程。如果您在几分钟"
"后仍未收到邮件,请与我们联系。"
@@ -701,9 +736,16 @@
"为此,我们需要您确认您是此账号e-mail地址的所有者。"
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"我们已经给您发送了一封e-mail验证邮件。\n"
@@ -752,27 +794,27 @@
msgid "Add a 3rd Party Account"
msgstr "添加一个第三方账号"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -814,6 +856,11 @@
"您将使用您的%(provider_name)s账号登录\n"
"%(site_name)s。作为最后一步,请完成以下表单:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr "我们已给您发了一封e-mail,如您在几分钟后仍没收到,请与我们联系。"
+
#~ msgid "Account"
#~ msgstr "账号"
diff -Nru django-allauth-0.47.0/allauth/locale/zh_Hant/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/zh_Hant/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/zh_Hant/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/zh_Hant/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -18,19 +18,19 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "無法使用此使用者名稱,請使用其他名稱。"
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr "登錄失敗次數過多,請稍後再試。"
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "已經有人使用這一個電子郵件註冊了。"
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "密碼長度至少要有 {0} 個字元。"
@@ -39,11 +39,11 @@
msgid "Accounts"
msgstr "帳號"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "每次輸入的密碼必須相同"
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "密碼"
@@ -63,13 +63,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "您提供的使用者名稱或密碼不正確。"
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "電子郵件地址"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -109,90 +109,90 @@
msgid "You must type the same email each time."
msgstr "每次輸入的密碼必須相同"
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "密碼 (再一次)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "此電子郵件已與這個帳號連結了。"
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "此電子郵件已經與別的帳號連結了。"
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "您的帳號下沒有驗證過的電子郵件地址。"
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "目前密碼"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "新密碼"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "新密碼 (再一次)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "請輸入您目前的密碼"
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "還沒有其他帳號使用這個電子郵件地址"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr ""
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "使用者"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
#, fuzzy
msgid "e-mail address"
msgstr "電子郵件地址"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "已驗證"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "主要的"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "電子郵件地址"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "電子郵件地址"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "以建立"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "已送出"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "key"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "電子郵件確認"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "電子郵件確認"
@@ -216,91 +216,91 @@
msgid "Social Accounts"
msgstr "社群帳號"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "提供者"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "名稱"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "client id"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App ID, or consumer key"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "secret key"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API secret, client secret, or consumer secret"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Key"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "社群應用程式"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "社群應用程式"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "最後一次登入"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "加入日期"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "額外資料"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "社群帳號"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "社群帳號"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "過期日"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "社群應用程式 Token"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "社群應用程式 Token"
@@ -309,11 +309,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Invalid response while obtaining request token from \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Invalid response while obtaining access token from \"%s\"."
@@ -457,9 +459,32 @@
msgstr "提醒您,您的使用者名稱是 %(username)s 。"
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "密碼重設電子郵件"
+#: templates/account/email/unknown_account_message.txt:4
+#, 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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"您會收到這封信是因為您或是某人在 %(site_domain)s 這個網站上要求重設您帳號的密"
+"碼。\n"
+"若您沒有要求我們重設密碼,請您直接忽略這封信。若要重設您的密碼,請點擊下面的"
+"連結。"
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -488,7 +513,7 @@
"送新的電子郵件確認信。"
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "登入"
@@ -609,10 +634,17 @@
msgstr "如果在重設密碼時碰到問題,請與我們聯絡。"
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
-msgstr "我們已經寄了一封電子郵件給您,如果數分鐘內您沒有收到,請與我們聯絡。"
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
+msgstr ""
+"我們剛剛寄了一封電子郵件確認信給您,\n"
+"請點擊郵件中的連結。您在數分鐘內尚無法收到郵件,請與我們聯絡。"
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -628,11 +660,10 @@
"密碼重設連結已失效,可能是因為該連結已經被人用過了,請重新申請重設密碼。"
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "您的密碼已變更。"
@@ -683,10 +714,16 @@
msgstr "驗證您的電子郵件地址"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"我們剛剛寄了一封電子郵件確認信給您,請點擊郵件中的連結以完成註冊流程。若您在"
"數分鐘內尚無法收到郵件,請與我們聯絡。"
@@ -701,9 +738,16 @@
"因此我們需要確認您的電子郵件地址。"
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"我們剛剛寄了一封電子郵件確認信給您,\n"
@@ -752,27 +796,27 @@
msgid "Add a 3rd Party Account"
msgstr "增加一個第三方帳號"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -814,6 +858,12 @@
"您將使用 %(provider_name)s 這個帳號登入\n"
" %(site_name)s 這個網站。最後一步,請填完下列表單:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "我們已經寄了一封電子郵件給您,如果數分鐘內您沒有收到,請與我們聯絡。"
+
#~ msgid "Account"
#~ msgstr "帳號"
diff -Nru django-allauth-0.47.0/allauth/locale/zh_TW/LC_MESSAGES/django.po django-allauth-0.51.0/allauth/locale/zh_TW/LC_MESSAGES/django.po
--- django-allauth-0.47.0/allauth/locale/zh_TW/LC_MESSAGES/django.po 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/locale/zh_TW/LC_MESSAGES/django.po 2022-06-07 09:42:31.000000000 +0000
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: django-allauth\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-12-09 08:41-0600\n"
+"POT-Creation-Date: 2022-06-07 04:23-0500\n"
"PO-Revision-Date: 2014-08-12 00:36+0200\n"
"Last-Translator: jresins \n"
"Language-Team: Chinese (Traditional)\n"
@@ -15,19 +15,19 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: account/adapter.py:45
+#: account/adapter.py:47
msgid "Username can not be used. Please use other username."
msgstr "無法使用此使用者名稱,請使用其他名稱。"
-#: account/adapter.py:51
+#: account/adapter.py:53
msgid "Too many failed login attempts. Try again later."
msgstr ""
-#: account/adapter.py:53
+#: account/adapter.py:55
msgid "A user is already registered with this e-mail address."
msgstr "已經有人使用這一個電子郵件註冊了。"
-#: account/adapter.py:300
+#: account/adapter.py:304
#, python-brace-format
msgid "Password must be a minimum of {0} characters."
msgstr "密碼長度至少要有 {0} 個字元。"
@@ -36,11 +36,11 @@
msgid "Accounts"
msgstr "帳號"
-#: account/forms.py:59 account/forms.py:413
+#: account/forms.py:59 account/forms.py:416
msgid "You must type the same password each time."
msgstr "每次輸入的密碼必須相同"
-#: account/forms.py:92 account/forms.py:381 account/forms.py:498
+#: account/forms.py:92 account/forms.py:381 account/forms.py:501
msgid "Password"
msgstr "密碼"
@@ -60,13 +60,13 @@
msgid "The username and/or password you specified are not correct."
msgstr "您提供的使用者名稱或密碼不正確。"
-#: account/forms.py:113 account/forms.py:279 account/forms.py:439
-#: account/forms.py:517
+#: account/forms.py:113 account/forms.py:279 account/forms.py:442
+#: account/forms.py:520
msgid "E-mail address"
msgstr "電子郵件地址"
-#: account/forms.py:117 account/forms.py:316 account/forms.py:436
-#: account/forms.py:512
+#: account/forms.py:117 account/forms.py:316 account/forms.py:439
+#: account/forms.py:515
msgid "E-mail"
msgstr "E-mail"
@@ -106,90 +106,90 @@
msgid "You must type the same email each time."
msgstr "每次輸入的密碼必須相同"
-#: account/forms.py:384 account/forms.py:499
+#: account/forms.py:385 account/forms.py:502
msgid "Password (again)"
msgstr "密碼 (再一次)"
-#: account/forms.py:448
+#: account/forms.py:451
msgid "This e-mail address is already associated with this account."
msgstr "此電子郵件已與這個帳號連結了。"
-#: account/forms.py:451
+#: account/forms.py:454
msgid "This e-mail address is already associated with another account."
msgstr "此電子郵件已經與別的帳號連結了。"
-#: account/forms.py:453
+#: account/forms.py:456
#, fuzzy, python-format
#| msgid "Your account has no verified e-mail address."
msgid "You cannot add more than %d e-mail addresses."
msgstr "您的帳號下沒有驗證過的電子郵件地址。"
-#: account/forms.py:478
+#: account/forms.py:481
msgid "Current Password"
msgstr "目前密碼"
-#: account/forms.py:480 account/forms.py:570
+#: account/forms.py:483 account/forms.py:588
msgid "New Password"
msgstr "新密碼"
-#: account/forms.py:481 account/forms.py:571
+#: account/forms.py:484 account/forms.py:589
msgid "New Password (again)"
msgstr "新密碼 (再一次)"
-#: account/forms.py:489
+#: account/forms.py:492
msgid "Please type your current password."
msgstr "請輸入您目前的密碼"
-#: account/forms.py:529
+#: account/forms.py:532
msgid "The e-mail address is not assigned to any user account"
msgstr "還沒有其他帳號使用這個電子郵件地址"
-#: account/forms.py:592
+#: account/forms.py:610
msgid "The password reset token was invalid."
msgstr ""
-#: account/models.py:22
+#: account/models.py:19
msgid "user"
msgstr "使用者"
-#: account/models.py:28 account/models.py:83
+#: account/models.py:25 account/models.py:80
#, fuzzy
msgid "e-mail address"
msgstr "電子郵件地址"
-#: account/models.py:30
+#: account/models.py:27
msgid "verified"
msgstr "已驗證"
-#: account/models.py:31
+#: account/models.py:28
msgid "primary"
msgstr "主要的"
-#: account/models.py:36
+#: account/models.py:33
msgid "email address"
msgstr "電子郵件地址"
-#: account/models.py:37
+#: account/models.py:34
msgid "email addresses"
msgstr "電子郵件地址"
-#: account/models.py:86
+#: account/models.py:83
msgid "created"
msgstr "以建立"
-#: account/models.py:87
+#: account/models.py:84
msgid "sent"
msgstr "已送出"
-#: account/models.py:88 socialaccount/models.py:58
+#: account/models.py:85 socialaccount/models.py:59
msgid "key"
msgstr "key"
-#: account/models.py:93
+#: account/models.py:90
msgid "email confirmation"
msgstr "電子郵件確認"
-#: account/models.py:94
+#: account/models.py:91
msgid "email confirmations"
msgstr "電子郵件確認"
@@ -213,91 +213,91 @@
msgid "Social Accounts"
msgstr "社群帳號"
-#: socialaccount/models.py:41 socialaccount/models.py:84
+#: socialaccount/models.py:42 socialaccount/models.py:86
msgid "provider"
msgstr "提供者"
-#: socialaccount/models.py:45
+#: socialaccount/models.py:46
msgid "name"
msgstr "名稱"
-#: socialaccount/models.py:47
+#: socialaccount/models.py:48
msgid "client id"
msgstr "client id"
-#: socialaccount/models.py:49
+#: socialaccount/models.py:50
msgid "App ID, or consumer key"
msgstr "App ID, or consumer key"
-#: socialaccount/models.py:52
+#: socialaccount/models.py:53
msgid "secret key"
msgstr "secret key"
-#: socialaccount/models.py:55
+#: socialaccount/models.py:56
msgid "API secret, client secret, or consumer secret"
msgstr "API secret, client secret, or consumer secret"
-#: socialaccount/models.py:58
+#: socialaccount/models.py:59
msgid "Key"
msgstr "Key"
-#: socialaccount/models.py:74
+#: socialaccount/models.py:76
msgid "social application"
msgstr "社群應用程式"
-#: socialaccount/models.py:75
+#: socialaccount/models.py:77
msgid "social applications"
msgstr "社群應用程式"
-#: socialaccount/models.py:105
+#: socialaccount/models.py:107
msgid "uid"
msgstr "uid"
-#: socialaccount/models.py:107
+#: socialaccount/models.py:109
msgid "last login"
msgstr "最後一次登入"
-#: socialaccount/models.py:108
+#: socialaccount/models.py:110
msgid "date joined"
msgstr "加入日期"
-#: socialaccount/models.py:109
+#: socialaccount/models.py:111
msgid "extra data"
msgstr "額外資料"
-#: socialaccount/models.py:113
+#: socialaccount/models.py:115
msgid "social account"
msgstr "社群帳號"
-#: socialaccount/models.py:114
+#: socialaccount/models.py:116
msgid "social accounts"
msgstr "社群帳號"
-#: socialaccount/models.py:139
+#: socialaccount/models.py:143
msgid "token"
msgstr ""
-#: socialaccount/models.py:140
+#: socialaccount/models.py:144
msgid "\"oauth_token\" (OAuth1) or access token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:144
+#: socialaccount/models.py:148
msgid "token secret"
msgstr ""
-#: socialaccount/models.py:145
+#: socialaccount/models.py:149
msgid "\"oauth_token_secret\" (OAuth1) or refresh token (OAuth2)"
msgstr ""
-#: socialaccount/models.py:148
+#: socialaccount/models.py:152
msgid "expires at"
msgstr "過期日"
-#: socialaccount/models.py:153
+#: socialaccount/models.py:157
msgid "social application token"
msgstr "社群應用程式 Token"
-#: socialaccount/models.py:154
+#: socialaccount/models.py:158
msgid "social application tokens"
msgstr "社群應用程式 Token"
@@ -306,11 +306,13 @@
msgstr ""
#: socialaccount/providers/oauth/client.py:85
+#: socialaccount/providers/pocket/client.py:37
#, python-format
msgid "Invalid response while obtaining request token from \"%s\"."
msgstr "Invalid response while obtaining request token from \"%s\"."
#: socialaccount/providers/oauth/client.py:117
+#: socialaccount/providers/pocket/client.py:78
#, python-format
msgid "Invalid response while obtaining access token from \"%s\"."
msgstr "Invalid response while obtaining access token from \"%s\"."
@@ -454,9 +456,32 @@
msgstr "提醒您,您的使用者名稱是 %(username)s 。"
#: templates/account/email/password_reset_key_subject.txt:3
+#: templates/account/email/unknown_account_subject.txt:3
msgid "Password Reset E-mail"
msgstr "密碼重設電子郵件"
+#: templates/account/email/unknown_account_message.txt:4
+#, 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."
+msgid ""
+"You are receiving this e-mail because you or someone else has requested a\n"
+"password for your user account. However, we do not have any record of a "
+"user\n"
+"with email %(email)s in our database.\n"
+"\n"
+"This mail can be safely ignored if you did not request a password reset.\n"
+"\n"
+"If it was you, you can sign up for an account using the link below."
+msgstr ""
+"您會收到這封信是因為您或是某人在 %(site_domain)s 這個網站上要求重設您帳號的密"
+"碼。\n"
+"若您沒有要求我們重設密碼,請您直接忽略這封信。若要重設您的密碼,請點擊下面的"
+"連結。"
+
#: templates/account/email_confirm.html:6
#: templates/account/email_confirm.html:10
msgid "Confirm E-mail Address"
@@ -485,7 +510,7 @@
"送新的電子郵件確認信。"
#: templates/account/login.html:6 templates/account/login.html:10
-#: templates/account/login.html:43
+#: templates/account/login.html:43 templates/socialaccount/login.html:4
msgid "Sign In"
msgstr "登入"
@@ -606,10 +631,17 @@
msgstr "如果在重設密碼時碰到問題,請與我們聯絡。"
#: templates/account/password_reset_done.html:15
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
-"We have sent you an e-mail. Please contact us if you do not receive it "
-"within a few minutes."
-msgstr "我們已經寄了一封電子郵件給您,如果數分鐘內您沒有收到,請與我們聯絡。"
+"We have sent you an e-mail. If you have not received it please check your "
+"spam folder. Otherwise contact us if you do not receive it in a few minutes."
+msgstr ""
+"我們剛剛寄了一封電子郵件確認信給您,\n"
+"請點擊郵件中的連結。您在數分鐘內尚無法收到郵件,請與我們聯絡。"
#: templates/account/password_reset_from_key.html:7
msgid "Bad Token"
@@ -625,11 +657,10 @@
"密碼重設連結已失效,可能是因為該連結已經被人用過了,請重新申請重設密碼。"
-#: templates/account/password_reset_from_key.html:17
+#: templates/account/password_reset_from_key.html:16
msgid "change password"
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 "您的密碼已變更。"
@@ -680,10 +711,16 @@
msgstr "驗證您的電子郵件地址"
#: templates/account/verification_sent.html:10
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for verification. Follow the link provided "
+#| "to finalize the signup process. Please contact us if you do not receive "
+#| "it within a few minutes."
msgid ""
"We have sent an e-mail to you for verification. Follow the link provided to "
-"finalize the signup process. Please contact us if you do not receive it "
-"within a few minutes."
+"finalize the signup process. If you do not see the verification e-mail in "
+"your main inbox, check your spam folder. Please contact us if you do not "
+"receive the verification e-mail within a few minutes."
msgstr ""
"我們剛剛寄了一封電子郵件確認信給您,請點擊郵件中的連結以完成註冊流程。若您在"
"數分鐘內尚無法收到郵件,請與我們聯絡。"
@@ -698,9 +735,16 @@
"因此我們需要確認您的電子郵件地址。"
#: templates/account/verified_email_required.html:16
+#, fuzzy
+#| msgid ""
+#| "We have sent an e-mail to you for\n"
+#| "verification. Please click on the link inside this e-mail. Please\n"
+#| "contact us if you do not receive it within a few minutes."
msgid ""
"We have sent an e-mail to you for\n"
-"verification. Please click on the link inside this e-mail. Please\n"
+"verification. Please click on the link inside that e-mail. If you do not see "
+"the verification e-mail in your main inbox, check your spam folder. "
+"Otherwise\n"
"contact us if you do not receive it within a few minutes."
msgstr ""
"我們剛剛寄了一封電子郵件確認信給您,\n"
@@ -749,27 +793,27 @@
msgid "Add a 3rd Party Account"
msgstr "增加一個第三方帳號"
-#: templates/socialaccount/login.html:6
+#: templates/socialaccount/login.html:8
#, python-format
msgid "Connect %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:8
+#: templates/socialaccount/login.html:10
#, python-format
msgid "You are about to connect a new third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:10
+#: templates/socialaccount/login.html:12
#, python-format
msgid "Sign In Via %(provider)s"
msgstr ""
-#: templates/socialaccount/login.html:12
+#: templates/socialaccount/login.html:14
#, python-format
msgid "You are about to sign in using a third party account from %(provider)s."
msgstr ""
-#: templates/socialaccount/login.html:17
+#: templates/socialaccount/login.html:19
msgid "Continue"
msgstr ""
@@ -811,6 +855,12 @@
"您將使用 %(provider_name)s 這個帳號登入\n"
" %(site_name)s 這個網站。最後一步,請填完下列表單:"
+#~ msgid ""
+#~ "We have sent you an e-mail. Please contact us if you do not receive it "
+#~ "within a few minutes."
+#~ msgstr ""
+#~ "我們已經寄了一封電子郵件給您,如果數分鐘內您沒有收到,請與我們聯絡。"
+
#~ msgid "Account"
#~ msgstr "帳號"
diff -Nru django-allauth-0.47.0/allauth/ratelimit.py django-allauth-0.51.0/allauth/ratelimit.py
--- django-allauth-0.47.0/allauth/ratelimit.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/ratelimit.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,77 @@
+import hashlib
+import time
+from collections import namedtuple
+
+from django.core.cache import cache
+from django.shortcuts import render
+
+
+Rate = namedtuple("Rate", "amount duration")
+
+
+def parse(rate):
+ ret = None
+ if rate:
+ amount, duration = rate.split("/")
+ amount = int(amount)
+ duration_map = {"s": 1, "m": 60, "h": 3600, "d": 86400}
+ if duration not in duration_map:
+ raise ValueError("Invalid duration: %s" % duration)
+ duration = duration_map[duration]
+ ret = Rate(amount, duration)
+ return ret
+
+
+def _cache_key(request, *, action, key=None, user=None):
+ from allauth.account.adapter import get_adapter
+
+ if key:
+ source = ()
+ elif user or request.user.is_authenticated:
+ source = ("user", str((user or request.user).pk))
+ else:
+ source = ("ip", get_adapter().get_client_ip(request))
+ keys = ["allauth", "rl", action, *source]
+ if key is not None:
+ key_hash = hashlib.sha256(key.encode("utf8")).hexdigest()
+ keys.append(key_hash)
+ return ":".join(keys)
+
+
+def clear(request, *, action, key=None, user=None):
+ cache_key = _cache_key(request, action=action, key=key, user=user)
+ cache.delete(cache_key)
+
+
+def consume(request, *, action, key=None, amount=None, duration=None, user=None):
+ allowed = True
+ from allauth.account import app_settings
+
+ rate = app_settings.RATE_LIMITS.get(action)
+ if rate:
+ rate = parse(rate)
+ if not amount:
+ amount = rate.amount
+ if not duration:
+ duration = rate.duration
+
+ if request.method == "GET" or not amount or not duration:
+ pass
+ else:
+ cache_key = _cache_key(request, action=action, key=key, user=user)
+ history = cache.get(cache_key, [])
+ now = time.time()
+ while history and history[-1] <= now - duration:
+ history.pop()
+ allowed = len(history) < amount
+ if allowed:
+ history.insert(0, now)
+ cache.set(cache_key, history, duration)
+ return allowed
+
+
+def consume_or_429(request, *args, **kwargs):
+ from allauth.account import app_settings
+
+ if not consume(request, *args, **kwargs):
+ return render(request, "429." + app_settings.TEMPLATE_EXTENSION, status=429)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/admin.py django-allauth-0.51.0/allauth/socialaccount/admin.py
--- django-allauth-0.47.0/allauth/socialaccount/admin.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/admin.py 2022-06-07 09:42:31.000000000 +0000
@@ -1,6 +1,7 @@
from django import forms
from django.contrib import admin
+from allauth import app_settings
from allauth.account.adapter import get_adapter
from .models import SocialAccount, SocialApp, SocialToken
@@ -23,7 +24,7 @@
"name",
"provider",
)
- filter_horizontal = ("sites",)
+ filter_horizontal = ("sites",) if app_settings.SITES_ENABLED else ()
class SocialAccountAdmin(admin.ModelAdmin):
diff -Nru django-allauth-0.47.0/allauth/socialaccount/app_settings.py django-allauth-0.51.0/allauth/socialaccount/app_settings.py
--- django-allauth-0.47.0/allauth/socialaccount/app_settings.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/app_settings.py 2022-06-07 09:42:31.000000000 +0000
@@ -73,12 +73,16 @@
@property
def STORE_TOKENS(self):
- return self._setting("STORE_TOKENS", True)
+ return self._setting("STORE_TOKENS", False)
@property
def UID_MAX_LENGTH(self):
return 191
+ @property
+ def SOCIALACCOUNT_STR(self):
+ return self._setting("SOCIALACCOUNT_STR", None)
+
# Ugly? Guido recommends this himself ...
# http://mail.python.org/pipermail/python-ideas/2012-May/014969.html
diff -Nru django-allauth-0.47.0/allauth/socialaccount/helpers.py django-allauth-0.51.0/allauth/socialaccount/helpers.py
--- django-allauth-0.47.0/allauth/socialaccount/helpers.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/helpers.py 2022-06-07 09:42:31.000000000 +0000
@@ -6,7 +6,12 @@
from allauth.account import app_settings as account_settings
from allauth.account.adapter import get_adapter as get_account_adapter
-from allauth.account.utils import complete_signup, perform_login, user_username
+from allauth.account.utils import (
+ complete_signup,
+ perform_login,
+ user_display,
+ user_username,
+)
from allauth.exceptions import ImmediateHttpResponse
from . import app_settings, signals
@@ -189,3 +194,10 @@
modname, _, attr = path.rpartition(".")
m = __import__(modname, fromlist=[attr])
return getattr(m, attr)
+
+
+def socialaccount_user_display(socialaccount):
+ func = app_settings.SOCIALACCOUNT_STR
+ if not func:
+ return user_display(socialaccount.user)
+ return func(socialaccount)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/migrations/0001_initial.py django-allauth-0.51.0/allauth/socialaccount/migrations/0001_initial.py
--- django-allauth-0.47.0/allauth/socialaccount/migrations/0001_initial.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/migrations/0001_initial.py 2022-06-07 09:42:31.000000000 +0000
@@ -5,15 +5,22 @@
from django.db import migrations, models
import allauth.socialaccount.fields
+from allauth import app_settings
from allauth.socialaccount.providers import registry
class Migration(migrations.Migration):
- dependencies = [
- ("sites", "0001_initial"),
- migrations.swappable_dependency(settings.AUTH_USER_MODEL),
- ]
+ dependencies = (
+ [
+ ("sites", "0001_initial"),
+ ]
+ if app_settings.SITES_ENABLED
+ else []
+ + [
+ migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+ ]
+ )
operations = [
migrations.CreateModel(
@@ -118,8 +125,14 @@
blank=True,
),
),
- ("sites", models.ManyToManyField(to="sites.Site", blank=True)),
- ],
+ ]
+ + (
+ [
+ ("sites", models.ManyToManyField(to="sites.Site", blank=True)),
+ ]
+ if app_settings.SITES_ENABLED
+ else []
+ ),
options={
"verbose_name": "social application",
"verbose_name_plural": "social applications",
diff -Nru django-allauth-0.47.0/allauth/socialaccount/models.py django-allauth-0.51.0/allauth/socialaccount/models.py
--- django-allauth-0.47.0/allauth/socialaccount/models.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/models.py 2022-06-07 09:42:31.000000000 +0000
@@ -1,12 +1,10 @@
from __future__ import absolute_import
from django.contrib.auth import authenticate
-from django.contrib.sites.models import Site
from django.contrib.sites.shortcuts import get_current_site
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
@@ -28,8 +26,11 @@
request._socialapp_cache = cache
app = cache.get(provider)
if not app:
- site = get_current_site(request)
- app = self.get(sites__id=site.id, provider=provider)
+ if allauth.app_settings.SITES_ENABLED:
+ site = get_current_site(request)
+ app = self.get(sites__id=site.id, provider=provider)
+ else:
+ app = self.get(provider=provider)
cache[provider] = app
return app
@@ -57,11 +58,12 @@
key = models.CharField(
verbose_name=_("key"), max_length=191, blank=True, help_text=_("Key")
)
- # Most apps can be used across multiple domains, therefore we use
- # a ManyToManyField. Note that Facebook requires an app per domain
- # (unless the domains share a common base name).
- # blank=True allows for disabling apps without removing them
- sites = models.ManyToManyField(Site, blank=True)
+ if allauth.app_settings.SITES_ENABLED:
+ # Most apps can be used across multiple domains, therefore we use
+ # a ManyToManyField. Note that Facebook requires an app per domain
+ # (unless the domains share a common base name).
+ # blank=True allows for disabling apps without removing them
+ sites = models.ManyToManyField("sites.Site", blank=True)
# We want to move away from storing secrets in the database. So, we're
# putting a halt towards adding more fields for additional secrets, such as
@@ -117,7 +119,9 @@
return authenticate(account=self)
def __str__(self):
- return force_str(self.user)
+ from .helpers import socialaccount_user_display
+
+ return socialaccount_user_display(self)
def get_profile_url(self):
return self.get_provider_account().get_profile_url()
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/bitbucket_oauth2/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/bitbucket_oauth2/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/bitbucket_oauth2/tests.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/bitbucket_oauth2/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -13,7 +13,7 @@
from .provider import BitbucketOAuth2Provider
-@override_settings(SOCIALACCOUNT_QUERY_EMAIL=True)
+@override_settings(SOCIALACCOUNT_QUERY_EMAIL=True, SOCIALACCOUNT_STORE_TOKENS=True)
class BitbucketOAuth2Tests(
create_oauth2_tests(registry.by_id(BitbucketOAuth2Provider.id))
):
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/clever/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/clever/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/clever/provider.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/clever/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,57 @@
+from allauth.socialaccount import providers
+from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
+
+
+class CleverAccount(ProviderAccount):
+ def get_avatar_url(self):
+ # return self.account.extra_data.get('user').get('image_192', None)
+ return None
+
+ def to_str(self):
+ dflt = super(CleverAccount, self).to_str()
+ return "%s (%s)" % (
+ self.account.extra_data.get("name", ""),
+ dflt,
+ )
+
+
+class CleverProvider(OAuth2Provider):
+ id = "clever"
+ name = "Clever"
+ account_class = CleverAccount
+
+ def extract_uid(self, data):
+ return data.get("data", {}).get("id")
+
+ def get_user_type(self, data):
+ return list(data.get("data", {}).get("roles", {}).keys())[0]
+
+ def extract_common_fields(self, data):
+ return dict(
+ first_name=data.get("data", {}).get("name", {}).get("first", None),
+ last_name=data.get("data", {}).get("name", {}).get("last", None),
+ username=data.get("data", {})
+ .get("roles", {})
+ .get(self.get_user_type(data), {})
+ .get("credentials", {})
+ .get("district_username", None),
+ email=data.get("data", {}).get("email", None),
+ )
+
+ def get_default_scope(self):
+ return [
+ "read:district_admins",
+ "read:districts",
+ "read:resources",
+ "read:school_admins",
+ "read:schools",
+ "read:sections",
+ "read:student_contacts",
+ "read:students",
+ "read:teachers",
+ "read:user_id",
+ ]
+
+
+providers.registry.register(CleverProvider)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/clever/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/clever/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/clever/tests.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/clever/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,36 @@
+from allauth.socialaccount.tests import OAuth2TestsMixin
+from allauth.tests import MockedResponse, TestCase
+
+from .provider import SlackProvider
+
+
+class SlackOAuth2Tests(OAuth2TestsMixin, TestCase):
+ provider_id = SlackProvider.id
+
+ def get_mocked_response(self):
+ return MockedResponse(
+ 200,
+ """{
+ "type": "user",
+ "data": {
+ "id": "62027798269867124d10259e",
+ "district": "6202763c8243d2100123dae5",
+ "type": "user",
+ "authorized_by": "district"
+ },
+ "links": [
+ {
+ "rel": "self",
+ "uri": "/me"
+ },
+ {
+ "rel": "canonical",
+ "uri": "/v3.0/users/62027798269867124d10259e"
+ },
+ {
+ "rel": "district",
+ "uri": "/v3.0/districts/6202763c8243d2100123dae5"
+ }
+ ]
+ }""",
+ ) # noqa
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/clever/urls.py django-allauth-0.51.0/allauth/socialaccount/providers/clever/urls.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/clever/urls.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/clever/urls.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,6 @@
+from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns
+
+from .provider import CleverProvider
+
+
+urlpatterns = default_urlpatterns(CleverProvider)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/clever/views.py django-allauth-0.51.0/allauth/socialaccount/providers/clever/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/clever/views.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/clever/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,46 @@
+import requests
+
+from allauth.socialaccount.providers.oauth2.client import OAuth2Error
+from allauth.socialaccount.providers.oauth2.views import (
+ OAuth2Adapter,
+ OAuth2CallbackView,
+ OAuth2LoginView,
+)
+
+from .provider import CleverProvider
+
+
+class CleverOAuth2Adapter(OAuth2Adapter):
+ provider_id = CleverProvider.id
+
+ access_token_url = "https://clever.com/oauth/tokens"
+ authorize_url = "https://clever.com/oauth/authorize"
+ identity_url = "https://api.clever.com/v3.0/me"
+ user_details_url = "https://api.clever.com/v3.0/users"
+
+ supports_state = True
+
+ def complete_login(self, request, app, token, **kwargs):
+ extra_data = self.get_data(token.token)
+ return self.get_provider().sociallogin_from_response(request, extra_data)
+
+ def get_data(self, token):
+ # Verify the user first
+ resp = requests.get(
+ self.identity_url, headers={"Authorization": f"Bearer {token}"}
+ )
+ if resp.status_code != 200:
+ raise OAuth2Error()
+ resp = resp.json()
+ user_id = resp.get("data", {}).get("id")
+ user_details = requests.get(
+ f"{self.user_details_url}/{user_id}",
+ headers={"Authorization": f"Bearer {token}"},
+ )
+ user_details.raise_for_status()
+ user_details = user_details.json()
+ return user_details
+
+
+oauth2_login = OAuth2LoginView.adapter_view(CleverOAuth2Adapter)
+oauth2_callback = OAuth2CallbackView.adapter_view(CleverOAuth2Adapter)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/draugiem/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/draugiem/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/draugiem/tests.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/draugiem/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -1,10 +1,10 @@
from hashlib import md5
from django.contrib.auth.models import User
-from django.contrib.sites.models import Site
from django.urls import reverse
from django.utils.http import urlencode
+from allauth import app_settings
from allauth.socialaccount import providers
from allauth.socialaccount.models import SocialApp, SocialToken
from allauth.tests import Mock, TestCase, patch
@@ -30,7 +30,10 @@
key=self.provider.id,
secret="dummy",
)
- app.sites.add(Site.objects.get_current())
+ if app_settings.SITES_ENABLED:
+ from django.contrib.sites.models import Site
+
+ app.sites.add(Site.objects.get_current())
self.app = app
def get_draugiem_login_response(self):
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/drip/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/drip/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/drip/provider.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/drip/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,31 @@
+from allauth.account.models import EmailAddress
+from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
+
+
+class DripAccount(ProviderAccount):
+ pass
+
+
+class DripProvider(OAuth2Provider):
+ id = "drip"
+ name = "Drip"
+ account_class = DripAccount
+
+ def extract_uid(self, data):
+ # no uid available, we generate one by hashing the email
+ uid = hash(data.get("email"))
+ return str(uid)
+
+ def extract_common_fields(self, data):
+ return dict(email=data.get("email"), name=data.get("name"))
+
+ def extract_email_addresses(self, data):
+ ret = []
+ email = data.get("email")
+ if email:
+ ret.append(EmailAddress(email=email, verified=True, primary=True))
+ return ret
+
+
+provider_classes = [DripProvider]
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/drip/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/drip/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/drip/tests.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/drip/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,21 @@
+from allauth.socialaccount.tests import OAuth2TestsMixin
+from allauth.tests import MockedResponse, TestCase
+
+from .provider import DripProvider
+
+
+class DripTests(OAuth2TestsMixin, TestCase):
+
+ provider_id = DripProvider.id
+
+ def get_mocked_response(self):
+ return MockedResponse(
+ 200,
+ """{
+ "users":[{
+ "email": "john@acme.com",
+ "name": "John Doe",
+ "time_zone": "America/Los_Angeles"
+ }]
+ }""",
+ )
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/drip/urls.py django-allauth-0.51.0/allauth/socialaccount/providers/drip/urls.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/drip/urls.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/drip/urls.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,6 @@
+from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns
+
+from .provider import DripProvider
+
+
+urlpatterns = default_urlpatterns(DripProvider)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/drip/views.py django-allauth-0.51.0/allauth/socialaccount/providers/drip/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/drip/views.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/drip/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,33 @@
+"""Views for Drip API."""
+import requests
+
+from allauth.socialaccount.providers.oauth2.views import (
+ OAuth2Adapter,
+ OAuth2CallbackView,
+ OAuth2LoginView,
+)
+
+from .provider import DripProvider
+
+
+class DripOAuth2Adapter(OAuth2Adapter):
+
+ """OAuth2Adapter for Drip API v3."""
+
+ provider_id = DripProvider.id
+
+ authorize_url = "https://www.getdrip.com/oauth/authorize"
+ access_token_url = "https://www.getdrip.com/oauth/token"
+ profile_url = "https://api.getdrip.com/v2/user"
+
+ def complete_login(self, request, app, token, **kwargs):
+ """Complete login, ensuring correct OAuth header."""
+ headers = {"Authorization": "Bearer {0}".format(token.token)}
+ response = requests.get(self.profile_url, headers=headers)
+ response.raise_for_status()
+ extra_data = response.json()["users"][0]
+ return self.get_provider().sociallogin_from_response(request, extra_data)
+
+
+oauth2_login = OAuth2LoginView.adapter_view(DripOAuth2Adapter)
+oauth2_callback = OAuth2CallbackView.adapter_view(DripOAuth2Adapter)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/edx/views.py django-allauth-0.51.0/allauth/socialaccount/providers/edx/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/edx/views.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/edx/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -25,13 +25,14 @@
redirect_uri_protocol = "https"
def complete_login(self, request, app, token, **kwargs):
- response = requests.get(self.profile_url, params={"access_token": token})
+ headers = {"Authorization": "Bearer {0}".format(token.token)}
+ response = requests.get(self.profile_url, headers=headers)
extra_data = response.json()
if extra_data.get("email", None) is None:
response = requests.get(
self.account_url.format(self.provider_base_url, extra_data["username"]),
- params={"access_token": token},
+ headers=headers,
)
extra_data = response.json()
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/facebook/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/facebook/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/facebook/provider.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/facebook/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -3,7 +3,6 @@
from urllib.parse import quote
from django.conf import settings
-from django.core.exceptions import ImproperlyConfigured
from django.middleware.csrf import get_token
from django.template.loader import render_to_string
from django.urls import reverse
@@ -26,7 +25,7 @@
GRAPH_API_VERSION = (
getattr(settings, "SOCIALACCOUNT_PROVIDERS", {})
.get("facebook", {})
- .get("VERSION", "v7.0")
+ .get("VERSION", "v13.0")
)
GRAPH_API_URL = "https://graph.facebook.com/" + GRAPH_API_VERSION
@@ -157,11 +156,10 @@
try:
app = self.get_app(request)
except SocialApp.DoesNotExist:
- raise ImproperlyConfigured(
- "No Facebook app configured: please"
- " add a SocialApp using the Django"
- " admin"
- )
+ # It's a problem that Facebook isn't configured; but don't raise
+ # an error. Other providers don't raise errors when they're missing
+ # SocialApps in media_js().
+ return ""
def abs_uri(name):
return request.build_absolute_uri(reverse(name))
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/facebook/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/facebook/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/facebook/tests.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/facebook/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -79,6 +79,14 @@
script = provider.media_js(request)
self.assertTrue('"appId": "app123id"' in script)
+ def test_media_js_when_not_configured(self):
+ provider = providers.registry.by_id(FacebookProvider.id)
+ provider.get_app(None).delete()
+ request = RequestFactory().get(reverse("account_login"))
+ request.session = {}
+ script = provider.media_js(request)
+ self.assertEqual(script, "")
+
def test_login_by_token(self):
resp = self.client.get(reverse("account_login"))
with patch(
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/facebook/views.py django-allauth-0.51.0/allauth/socialaccount/providers/facebook/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/facebook/views.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/facebook/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -35,7 +35,7 @@
def fb_complete_login(request, app, token):
- provider = providers.registry.by_id(FacebookProvider.id, request)
+ provider = providers.registry.by_id(app.provider, request)
resp = requests.get(
GRAPH_API_URL + "/me",
params={
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/gitea/views.py django-allauth-0.51.0/allauth/socialaccount/providers/gitea/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/gitea/views.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/gitea/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -15,10 +15,9 @@
if "GITEA_URL" in settings:
web_url = settings.get("GITEA_URL").rstrip("/")
- api_url = "{0}/api/v1".format(web_url)
else:
web_url = "https://gitea.com"
- api_url = "https://gitea.com"
+ api_url = "{0}/api/v1".format(web_url)
access_token_url = "{0}/login/oauth/access_token".format(web_url)
authorize_url = "{0}/login/oauth/authorize".format(web_url)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/gitlab/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/gitlab/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/gitlab/tests.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/gitlab/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -1,11 +1,18 @@
# -*- coding: utf-8 -*-
+import json
+
+from allauth.socialaccount.models import SocialAccount
from allauth.socialaccount.providers.gitlab.provider import GitLabProvider
+from allauth.socialaccount.providers.oauth2.client import OAuth2Error
from allauth.socialaccount.tests import OAuth2TestsMixin
from allauth.tests import MockedResponse, TestCase
+from .views import _check_errors
+
class GitLabTests(OAuth2TestsMixin, TestCase):
provider_id = GitLabProvider.id
+ _uid = 2
def get_mocked_response(self):
return MockedResponse(
@@ -43,3 +50,54 @@
}
""",
)
+
+ def test_valid_response(self):
+ data = {"id": 12345}
+ response = MockedResponse(200, json.dumps(data))
+ self.assertEqual(_check_errors(response), data)
+
+ def test_invalid_data(self):
+ response = MockedResponse(200, json.dumps({}))
+ with self.assertRaises(OAuth2Error):
+ # No id, raises
+ _check_errors(response)
+
+ def test_account_invalid_response(self):
+ body = (
+ "403 Forbidden - You (@domain.com) must accept the Terms of "
+ "Service in order to perform this action. Please access GitLab "
+ "from a web browser to accept these terms."
+ )
+ response = MockedResponse(403, body)
+
+ # GitLab allow users to login with their API and provides
+ # an error requiring the user to accept the Terms of Service.
+ # see: https://gitlab.com/gitlab-org/gitlab-foss/-/issues/45849
+ with self.assertRaises(OAuth2Error):
+ # no id, 4xx code, raises
+ _check_errors(response)
+
+ def test_error_response(self):
+ body = "403 Forbidden"
+ response = MockedResponse(403, body)
+
+ with self.assertRaises(OAuth2Error):
+ # no id, 4xx code, raises
+ _check_errors(response)
+
+ def test_invalid_response(self):
+ response = MockedResponse(200, json.dumps({}))
+ with self.assertRaises(OAuth2Error):
+ # No id, raises
+ _check_errors(response)
+
+ def test_bad_response(self):
+ response = MockedResponse(400, json.dumps({}))
+ with self.assertRaises(OAuth2Error):
+ # bad json, raises
+ _check_errors(response)
+
+ def test_extra_data(self):
+ self.login(self.get_mocked_response())
+ account = SocialAccount.objects.get(uid=str(self._uid))
+ self.assertEqual(account.extra_data["id"], self._uid)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/gitlab/views.py django-allauth-0.51.0/allauth/socialaccount/providers/gitlab/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/gitlab/views.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/gitlab/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -3,6 +3,7 @@
from allauth.socialaccount import app_settings
from allauth.socialaccount.providers.gitlab.provider import GitLabProvider
+from allauth.socialaccount.providers.oauth2.client import OAuth2Error
from allauth.socialaccount.providers.oauth2.views import (
OAuth2Adapter,
OAuth2CallbackView,
@@ -10,6 +11,36 @@
)
+def _check_errors(response):
+ # 403 error's are presented as user-facing errors
+ if response.status_code == 403:
+ msg = response.content
+ raise OAuth2Error("Invalid data from GitLab API: %r" % (msg))
+
+ try:
+ data = response.json()
+ except ValueError: # JSONDecodeError on py3
+ raise OAuth2Error("Invalid JSON from GitLab API: %r" % (response.text))
+
+ if response.status_code >= 400 or "error" in data:
+ # For errors, we expect the following format:
+ # {"error": "error_name", "error_description": "Oops!"}
+ # For example, if the token is not valid, we will get:
+ # {"message": "status_code - message"}
+ error = data.get("error", "") or response.status_code
+ desc = data.get("error_description", "") or data.get("message", "")
+
+ raise OAuth2Error("GitLab error: %s (%s)" % (error, desc))
+
+ # The expected output from the API follows this format:
+ # {"id": 12345, ...}
+ if "id" not in data:
+ # If the id is not present, the output is not usable (no UID)
+ raise OAuth2Error("Invalid data from GitLab API: %r" % (data))
+
+ return data
+
+
class GitLabOAuth2Adapter(OAuth2Adapter):
provider_id = GitLabProvider.id
provider_default_url = "https://gitlab.com"
@@ -23,11 +54,9 @@
profile_url = "{0}/api/{1}/user".format(provider_base_url, provider_api_version)
def complete_login(self, request, app, token, response):
- extra_data = requests.get(
- self.profile_url, params={"access_token": token.token}
- )
-
- return self.get_provider().sociallogin_from_response(request, extra_data.json())
+ response = requests.get(self.profile_url, params={"access_token": token.token})
+ data = _check_errors(response)
+ return self.get_provider().sociallogin_from_response(request, data)
oauth2_login = OAuth2LoginView.adapter_view(GitLabOAuth2Adapter)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/hubspot/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/hubspot/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/hubspot/provider.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/hubspot/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,32 @@
+from allauth.account.models import EmailAddress
+from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
+
+
+class HubspotAccount(ProviderAccount):
+ pass
+
+
+class HubspotProvider(OAuth2Provider):
+ id = "hubspot"
+ name = "Hubspot"
+ account_class = HubspotAccount
+
+ def get_default_scope(self):
+ return ["oauth"]
+
+ def extract_uid(self, data):
+ return str(data["user_id"])
+
+ def extract_common_fields(self, data):
+ return dict(email=data.get("user"))
+
+ def extract_email_addresses(self, data):
+ ret = []
+ email = data.get("user")
+ if email:
+ ret.append(EmailAddress(email=email, verified=True, primary=True))
+ return ret
+
+
+provider_classes = [HubspotProvider]
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/hubspot/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/hubspot/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/hubspot/tests.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/hubspot/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,28 @@
+from allauth.socialaccount.tests import OAuth2TestsMixin
+from allauth.tests import MockedResponse, TestCase
+
+from .provider import HubspotProvider
+
+
+class HubspotTests(OAuth2TestsMixin, TestCase):
+
+ provider_id = HubspotProvider.id
+
+ def get_mocked_response(self):
+ return MockedResponse(
+ 200,
+ """{
+ "token": "CNye4dqFMBICAAEYhOKlDZZ_z6IVKI_xMjIUgmFsNQzgBjNE9YBmhAhNOtfN0ak6BAAAAEFCFIIwn2EVRLpvJI9hP4tbIeKHw7ZXSgNldTFSAFoA",
+ "user": "m@acme.com",
+ "hub_domain": "acme.com",
+ "scopes": ["oauth"],
+ "scope_to_scope_group_pks": [25, 31],
+ "trial_scopes": [],
+ "trial_scope_to_scope_group_pks": [],
+ "hub_id": 211580,
+ "app_id": 833572,
+ "expires_in": 1799,
+ "user_id": 42607123,
+ "token_type": "access"
+ }""",
+ )
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/hubspot/urls.py django-allauth-0.51.0/allauth/socialaccount/providers/hubspot/urls.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/hubspot/urls.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/hubspot/urls.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,6 @@
+from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns
+
+from .provider import HubspotProvider
+
+
+urlpatterns = default_urlpatterns(HubspotProvider)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/hubspot/views.py django-allauth-0.51.0/allauth/socialaccount/providers/hubspot/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/hubspot/views.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/hubspot/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,33 @@
+"""Views for Hubspot API."""
+import requests
+
+from allauth.socialaccount.providers.oauth2.views import (
+ OAuth2Adapter,
+ OAuth2CallbackView,
+ OAuth2LoginView,
+)
+
+from .provider import HubspotProvider
+
+
+class HubspotOAuth2Adapter(OAuth2Adapter):
+ """OAuth2Adapter for Hubspot API v3."""
+
+ provider_id = HubspotProvider.id
+
+ authorize_url = "https://app.hubspot.com/oauth/authorize"
+ access_token_url = "https://api.hubapi.com/oauth/v1/token"
+ profile_url = "https://api.hubapi.com/oauth/v1/access-tokens"
+
+ def complete_login(self, request, app, token, **kwargs):
+ headers = {"Content-Type": "application/json"}
+ response = requests.get(
+ "{0}/{1}".format(self.profile_url, token.token), headers=headers
+ )
+ response.raise_for_status()
+ extra_data = response.json()
+ return self.get_provider().sociallogin_from_response(request, extra_data)
+
+
+oauth2_login = OAuth2LoginView.adapter_view(HubspotOAuth2Adapter)
+oauth2_callback = OAuth2CallbackView.adapter_view(HubspotOAuth2Adapter)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/kakao/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/kakao/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/kakao/provider.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/kakao/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -25,14 +25,14 @@
return str(data["id"])
def extract_common_fields(self, data):
- email = data["kakao_account"].get("email")
+ email = data.get("kakao_account", {}).get("email")
nickname = data.get("properties", {}).get("nickname")
return dict(email=email, username=nickname)
def extract_email_addresses(self, data):
ret = []
- data = data["kakao_account"]
+ data = data.get("kakao_account", {})
email = data.get("email")
if email:
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/lemonldap/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/lemonldap/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/lemonldap/provider.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/lemonldap/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
+
+
+class LemonLDAPAccount(ProviderAccount):
+ def get_avatar_url(self):
+ return self.account.extra_data.get("picture")
+
+ def to_str(self):
+ dflt = super(LemonLDAPAccount, self).to_str()
+ return self.account.extra_data.get("name", dflt)
+
+
+class LemonLDAPProvider(OAuth2Provider):
+ id = "lemonldap"
+ name = "LemonLDAP::NG"
+ account_class = LemonLDAPAccount
+
+ def get_default_scope(self):
+ return ["openid", "profile", "email"]
+
+ def extract_uid(self, data):
+ return str(data["id"])
+
+ def extract_common_fields(self, data):
+ return dict(
+ email=data.get("email"),
+ username=data.get("preferred_username"),
+ name=data.get("name"),
+ picture=data.get("picture"),
+ )
+
+
+provider_classes = [LemonLDAPProvider]
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/lemonldap/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/lemonldap/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/lemonldap/tests.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/lemonldap/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+from allauth.socialaccount.providers.lemonldap.provider import (
+ LemonLDAPProvider,
+)
+from allauth.socialaccount.tests import OAuth2TestsMixin
+from allauth.tests import MockedResponse, TestCase
+
+
+class LemonLDAPTests(OAuth2TestsMixin, TestCase):
+ provider_id = LemonLDAPProvider.id
+
+ def get_mocked_response(self):
+ return MockedResponse(
+ 200,
+ """
+ {
+ "email": "dwho@example.com",
+ "sub": "dwho",
+ "preferred_username": "dwho",
+ "name": "Doctor Who"
+ }
+ """,
+ )
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/lemonldap/urls.py django-allauth-0.51.0/allauth/socialaccount/providers/lemonldap/urls.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/lemonldap/urls.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/lemonldap/urls.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+from allauth.socialaccount.providers.lemonldap.provider import (
+ LemonLDAPProvider,
+)
+from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns
+
+
+urlpatterns = default_urlpatterns(LemonLDAPProvider)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/lemonldap/views.py django-allauth-0.51.0/allauth/socialaccount/providers/lemonldap/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/lemonldap/views.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/lemonldap/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,39 @@
+# -*- coding: utf-8 -*-
+import requests
+
+from allauth.socialaccount import app_settings
+from allauth.socialaccount.providers.lemonldap.provider import (
+ LemonLDAPProvider,
+)
+from allauth.socialaccount.providers.oauth2.views import (
+ OAuth2Adapter,
+ OAuth2CallbackView,
+ OAuth2LoginView,
+)
+
+
+class LemonLDAPOAuth2Adapter(OAuth2Adapter):
+ provider_id = LemonLDAPProvider.id
+ supports_state = True
+
+ settings = app_settings.PROVIDERS.get(provider_id, {})
+ provider_base_url = settings.get("LEMONLDAP_URL")
+
+ access_token_url = "{0}/oauth2/token".format(provider_base_url)
+ authorize_url = "{0}/oauth2/authorize".format(provider_base_url)
+ profile_url = "{0}/oauth2/userinfo".format(provider_base_url)
+
+ def complete_login(self, request, app, token, response):
+ response = requests.post(
+ self.profile_url, headers={"Authorization": "Bearer " + str(token)}
+ )
+ response.raise_for_status()
+ extra_data = response.json()
+ extra_data["id"] = extra_data["sub"]
+ del extra_data["sub"]
+
+ return self.get_provider().sociallogin_from_response(request, extra_data)
+
+
+oauth2_login = OAuth2LoginView.adapter_view(LemonLDAPOAuth2Adapter)
+oauth2_callback = OAuth2CallbackView.adapter_view(LemonLDAPOAuth2Adapter)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/line/views.py django-allauth-0.51.0/allauth/socialaccount/providers/line/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/line/views.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/line/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -45,6 +45,7 @@
else:
headers = {"Authorization": "Bearer {0}".format(token.token)}
resp = requests.get(self.profile_url, headers=headers)
+ resp.raise_for_status()
extra_data = resp.json()
return self.get_provider().sociallogin_from_response(request, extra_data)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/microsoft/models.py django-allauth-0.51.0/allauth/socialaccount/providers/microsoft/models.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/microsoft/models.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/microsoft/models.py 1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-# Create your models here.
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/microsoft/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/microsoft/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/microsoft/provider.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/microsoft/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -1,15 +1,16 @@
from __future__ import unicode_literals
-from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.base import AuthAction, ProviderAccount
from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
class MicrosoftGraphAccount(ProviderAccount):
+ def get_avatar_url(self):
+ return self.account.extra_data.get("photo")
+
def to_str(self):
- name = self.account.extra_data.get("displayName")
- if name and name.strip() != "":
- return name
- return super(MicrosoftGraphAccount, self).to_str()
+ dflt = super(MicrosoftGraphAccount, self).to_str()
+ return self.account.extra_data.get("displayName", dflt)
class MicrosoftGraphProvider(OAuth2Provider):
@@ -19,20 +20,24 @@
def get_default_scope(self):
"""
- Doc on scopes available at
- https://developer.microsoft.com/en-us/graph/docs/concepts/permissions_reference
+ Docs on Scopes and Permissions:
+ https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-permissions-and-consent#scopes-and-permissions
"""
return ["User.Read"]
+ def get_auth_params(self, request, action):
+ ret = super(MicrosoftGraphProvider, self).get_auth_params(request, action)
+ if action == AuthAction.REAUTHENTICATE:
+ ret["prompt"] = "select_account"
+ return ret
+
def extract_uid(self, data):
return str(data["id"])
def extract_common_fields(self, data):
- email = data.get("mail") or data.get("userPrincipalName")
- username = data.get("mailNickname")
return dict(
- username=username,
- email=email,
+ email=data.get("mail") or data.get("userPrincipalName"),
+ username=data.get("mailNickname"),
last_name=data.get("surname"),
first_name=data.get("givenName"),
)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/microsoft/views.py django-allauth-0.51.0/allauth/socialaccount/providers/microsoft/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/microsoft/views.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/microsoft/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -3,6 +3,7 @@
import json
import requests
+from allauth.socialaccount import app_settings
from allauth.socialaccount.providers.oauth2.client import OAuth2Error
from allauth.socialaccount.providers.oauth2.views import (
OAuth2Adapter,
@@ -34,34 +35,37 @@
class MicrosoftGraphOAuth2Adapter(OAuth2Adapter):
provider_id = MicrosoftGraphProvider.id
- def __init__(self, request):
- super(MicrosoftGraphOAuth2Adapter, self).__init__(request)
- provider = self.get_provider()
- tenant = provider.get_settings().get("tenant") or "common"
- user_properties = (
- "businessPhones",
- "displayName",
- "givenName",
- "id",
- "jobTitle",
- "mail",
- "mobilePhone",
- "officeLocation",
- "preferredLanguage",
- "surname",
- "userPrincipalName",
- "mailNickname",
- )
- base_url = "https://login.microsoftonline.com/{0}".format(tenant)
- self.access_token_url = "{0}/oauth2/v2.0/token".format(base_url)
- self.authorize_url = "{0}/oauth2/v2.0/authorize".format(base_url)
- self.profile_url = "https://graph.microsoft.com/v1.0/me/"
- self.profile_url_params = {"$select": ",".join(user_properties)}
+ settings = app_settings.PROVIDERS.get(provider_id, {})
+ # Lower case "tenant" for backwards compatibility
+ tenant = settings.get("TENANT", settings.get("tenant", "common"))
+
+ provider_base_url = "https://login.microsoftonline.com/{0}".format(tenant)
+ access_token_url = "{0}/oauth2/v2.0/token".format(provider_base_url)
+ authorize_url = "{0}/oauth2/v2.0/authorize".format(provider_base_url)
+ profile_url = "https://graph.microsoft.com/v1.0/me"
+
+ user_properties = (
+ "businessPhones",
+ "displayName",
+ "givenName",
+ "id",
+ "jobTitle",
+ "mail",
+ "mobilePhone",
+ "officeLocation",
+ "preferredLanguage",
+ "surname",
+ "userPrincipalName",
+ "mailNickname",
+ )
+ profile_url_params = {"$select": ",".join(user_properties)}
def complete_login(self, request, app, token, **kwargs):
headers = {"Authorization": "Bearer {0}".format(token.token)}
response = requests.get(
- self.profile_url, self.profile_url_params, headers=headers
+ self.profile_url,
+ params=self.profile_url_params,
+ headers=headers,
)
extra_data = _check_errors(response)
return self.get_provider().sociallogin_from_response(request, extra_data)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/odnoklassniki/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/odnoklassniki/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/odnoklassniki/provider.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/odnoklassniki/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -34,7 +34,11 @@
return data["uid"]
def extract_common_fields(self, data):
- return dict(last_name=data.get("last_name"), first_name=data.get("first_name"))
+ return dict(
+ last_name=data.get("last_name"),
+ first_name=data.get("first_name"),
+ email=data.get("email"),
+ )
provider_classes = [OdnoklassnikiProvider]
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/odnoklassniki/views.py django-allauth-0.51.0/allauth/socialaccount/providers/odnoklassniki/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/odnoklassniki/views.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/odnoklassniki/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -11,26 +11,27 @@
USER_FIELDS = [
- "uid",
- "locale",
- "first_name",
- "last_name",
- "name",
- "gender",
"age",
"birthday",
- "has_email",
"current_status",
- "current_status_id",
"current_status_date",
+ "current_status_id",
+ "email",
+ "first_name",
+ "gender",
+ "has_email",
+ "last_name",
+ "locale",
+ "location",
+ "name",
"online",
"photo_id",
- "pic_1", # aka pic50x50
- "pic_2", # aka pic128max
+ "pic1024x768", # big
"pic190x190", # small
"pic640x480", # medium
- "pic1024x768", # big
- "location",
+ "pic_1", # aka pic50x50
+ "pic_2", # aka pic128max
+ "uid",
]
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/openid/utils.py django-allauth-0.51.0/allauth/socialaccount/providers/openid/utils.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/openid/utils.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/openid/utils.py 2022-06-07 09:42:31.000000000 +0000
@@ -102,7 +102,7 @@
for stored_assoc in stored_assocs:
assoc = OIDAssociation(
stored_assoc.handle,
- base64.decodestring(stored_assoc.secret.encode("utf-8")),
+ base64.decodebytes(stored_assoc.secret.encode("utf-8")),
stored_assoc.issued,
stored_assoc.lifetime,
stored_assoc.assoc_type,
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/pocket/client.py django-allauth-0.51.0/allauth/socialaccount/providers/pocket/client.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/pocket/client.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/pocket/client.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,91 @@
+import requests
+from urllib.parse import urlencode
+
+from django.http import HttpResponseRedirect
+from django.utils.translation import gettext as _
+
+from allauth.socialaccount.providers.oauth.client import (
+ OAuthClient,
+ OAuthError,
+ get_token_prefix,
+)
+from allauth.utils import build_absolute_uri
+
+
+class PocketOAuthClient(OAuthClient):
+ def _get_request_token(self):
+ """
+ Obtain a temporary request token to authorize an access token and to
+ sign the request to obtain the access token
+ """
+ if self.request_token is None:
+ redirect_url = build_absolute_uri(self.request, self.callback_url)
+ headers = {
+ "X-Accept": "application/json",
+ }
+ data = {
+ "consumer_key": self.consumer_key,
+ "redirect_uri": redirect_url,
+ }
+ response = requests.post(
+ url=self.request_token_url,
+ json=data,
+ headers=headers,
+ )
+ if response.status_code != 200:
+ raise OAuthError(
+ _("Invalid response while obtaining request token" ' from "%s".')
+ % get_token_prefix(self.request_token_url)
+ )
+ self.request_token = response.json()["code"]
+ self.request.session[
+ "oauth_%s_request_token" % get_token_prefix(self.request_token_url)
+ ] = self.request_token
+ return self.request_token
+
+ def get_redirect(self, authorization_url, extra_params):
+ """
+ Returns a ``HttpResponseRedirect`` object to redirect the user
+ to the Pocket authorization URL.
+ """
+ request_token = self._get_request_token()
+ params = {
+ "request_token": request_token,
+ "redirect_uri": self.request.build_absolute_uri(self.callback_url),
+ }
+ params.update(extra_params)
+ url = authorization_url + "?" + urlencode(params)
+ return HttpResponseRedirect(url)
+
+ def get_access_token(self):
+ """
+ Obtain the access token to access private resources at the API
+ endpoint.
+ """
+ if self.access_token is None:
+ request_token = self._get_rt_from_session()
+ url = self.access_token_url
+ headers = {
+ "X-Accept": "application/json",
+ }
+ data = {
+ "consumer_key": self.consumer_key,
+ "code": request_token,
+ }
+ response = requests.post(url=url, headers=headers, json=data)
+ if response.status_code != 200:
+ raise OAuthError(
+ _("Invalid response while obtaining access token" ' from "%s".')
+ % get_token_prefix(self.request_token_url)
+ )
+ r = response.json()
+ self.access_token = {
+ "oauth_token": request_token,
+ "oauth_token_secret": r["access_token"],
+ "username": r["username"],
+ }
+
+ self.request.session[
+ "oauth_%s_access_token" % get_token_prefix(self.request_token_url)
+ ] = self.access_token
+ return self.access_token
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/pocket/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/pocket/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/pocket/provider.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/pocket/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,35 @@
+from allauth.account.models import EmailAddress
+from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.oauth.provider import OAuthProvider
+
+
+class PocketAccount(ProviderAccount):
+ def to_str(self):
+ dflt = super(PocketAccount, self).to_str()
+ return self.account.extra_data.get("Display_Name", dflt)
+
+
+class PocketProvider(OAuthProvider):
+ id = "pocket"
+ name = "Pocket"
+ account_class = PocketAccount
+
+ def extract_uid(self, data):
+ return data["username"]
+
+ def extract_common_fields(self, data):
+ return dict(
+ email=data["username"],
+ )
+
+ def extract_email_addresses(self, data):
+ return [
+ EmailAddress(
+ email=data["username"],
+ verified=True,
+ primary=True,
+ )
+ ]
+
+
+provider_classes = [PocketProvider]
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/pocket/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/pocket/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/pocket/tests.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/pocket/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,47 @@
+from urllib.parse import parse_qs, urlencode, urlparse
+
+from django.urls import reverse
+
+from allauth.socialaccount.tests import OAuthTestsMixin
+from allauth.tests import MockedResponse, TestCase, mocked_response
+
+from .provider import PocketProvider
+
+
+class PocketOAuthTests(OAuthTestsMixin, TestCase):
+ provider_id = PocketProvider.id
+
+ def get_mocked_response(self):
+ return []
+
+ def get_access_token_response(self):
+ return MockedResponse(
+ 200,
+ """
+ {"access_token":"5678defg-5678-defg-5678-defg56",
+ "username":"name@example.com"}
+ """,
+ )
+
+ def login(self, resp_mocks, process="login"):
+ with mocked_response(
+ MockedResponse(
+ 200,
+ """
+ {"code": "dcba4321-dcba-4321-dcba-4321dc"}
+ """,
+ {"content-type": "application/json"},
+ )
+ ):
+ resp = self.client.post(
+ reverse(self.provider.id + "_login")
+ + "?"
+ + urlencode(dict(process=process))
+ )
+ p = urlparse(resp["location"])
+ q = parse_qs(p.query)
+ complete_url = reverse(self.provider.id + "_callback")
+ self.assertGreater(q["redirect_uri"][0].find(complete_url), 0)
+ with mocked_response(self.get_access_token_response(), *resp_mocks):
+ resp = self.client.get(complete_url)
+ return resp
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/pocket/urls.py django-allauth-0.51.0/allauth/socialaccount/providers/pocket/urls.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/pocket/urls.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/pocket/urls.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,6 @@
+from allauth.socialaccount.providers.oauth.urls import default_urlpatterns
+
+from .provider import PocketProvider
+
+
+urlpatterns = default_urlpatterns(PocketProvider)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/pocket/views.py django-allauth-0.51.0/allauth/socialaccount/providers/pocket/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/pocket/views.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/pocket/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,59 @@
+from ..oauth.views import OAuthAdapter, OAuthCallbackView, OAuthLoginView
+from .client import PocketOAuthClient
+from .provider import PocketProvider
+
+
+class PocketOAuthAdapter(OAuthAdapter):
+ provider_id = PocketProvider.id
+ request_token_url = "https://getpocket.com/v3/oauth/request"
+ access_token_url = "https://getpocket.com/v3/oauth/authorize"
+ authorize_url = "https://getpocket.com/auth/authorize"
+
+ def complete_login(self, request, app, token, response):
+ return self.get_provider().sociallogin_from_response(request, response)
+
+
+class PocketOAuthLoginView(OAuthLoginView):
+ def _get_client(self, request, callback_url):
+ provider = self.adapter.get_provider()
+ app = provider.get_app(request)
+ scope = " ".join(provider.get_scope(request))
+ parameters = {}
+ if scope:
+ parameters["scope"] = scope
+ client = PocketOAuthClient(
+ request,
+ app.client_id,
+ app.secret,
+ self.adapter.request_token_url,
+ self.adapter.access_token_url,
+ callback_url,
+ parameters=parameters,
+ provider=provider,
+ )
+ return client
+
+
+class PocketOAuthCallbackView(OAuthCallbackView):
+ def _get_client(self, request, callback_url):
+ provider = self.adapter.get_provider()
+ app = provider.get_app(request)
+ scope = " ".join(provider.get_scope(request))
+ parameters = {}
+ if scope:
+ parameters["scope"] = scope
+ client = PocketOAuthClient(
+ request,
+ app.client_id,
+ app.secret,
+ self.adapter.request_token_url,
+ self.adapter.access_token_url,
+ callback_url,
+ parameters=parameters,
+ provider=provider,
+ )
+ return client
+
+
+oauth_login = PocketOAuthLoginView.adapter_view(PocketOAuthAdapter)
+oauth_callback = PocketOAuthCallbackView.adapter_view(PocketOAuthAdapter)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/snapchat/provider.py django-allauth-0.51.0/allauth/socialaccount/providers/snapchat/provider.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/snapchat/provider.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/snapchat/provider.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,37 @@
+from allauth.socialaccount.providers.base import ProviderAccount
+from allauth.socialaccount.providers.oauth2.provider import OAuth2Provider
+
+
+class Scope(object):
+ EXTERNAL_ID = "https://auth.snapchat.com/oauth2/api/user.external_id"
+ DISPLAY_NAME = "https://auth.snapchat.com/oauth2/api/user.display_name"
+ BITMOJI = "https://auth.snapchat.com/oauth2/api/user.bitmoji.avatar"
+
+
+class SnapchatAccount(ProviderAccount):
+ def to_str(self):
+ dflt = super(SnapchatAccount, self).to_str()
+ return "%s (%s)" % (
+ self.account.extra_data.get("data").get("me").get("displayName", ""),
+ dflt,
+ )
+
+
+class SnapchatProvider(OAuth2Provider):
+ id = "snapchat"
+ name = "Snapchat"
+ account_class = SnapchatAccount
+
+ def get_default_scope(self):
+ scope = [Scope.EXTERNAL_ID, Scope.DISPLAY_NAME]
+ return scope
+
+ def extract_uid(self, data):
+ return str(data.get("data").get("me").get("externalId"))
+
+ def extract_common_fields(self, data):
+ user = data.get("data", {}).get("me")
+ return {"name": user.get("displayName")}
+
+
+provider_classes = [SnapchatProvider]
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/snapchat/tests.py django-allauth-0.51.0/allauth/socialaccount/providers/snapchat/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/snapchat/tests.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/snapchat/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,26 @@
+from allauth.socialaccount.tests import OAuth2TestsMixin
+from allauth.tests import MockedResponse, TestCase
+
+from .provider import SnapchatProvider
+
+
+class SnapchatOAuth2Tests(OAuth2TestsMixin, TestCase):
+ provider_id = SnapchatProvider.id
+
+ def get_mocked_response(self):
+ return MockedResponse(
+ 200,
+ """{
+ "data":{
+ "me":{
+ "externalId":"CAESIPiRBp0e5gLDq7VVurQ3rVdmdbqxpOJWynjyBL/xlo0w",
+ "displayName":"Karun Shrestha",
+ "bitmoji":{
+ "avatar":"https://sdk.bitmoji.com/render/panel/336d1e96-9055-4818-81aa-adde45ec030f-3aBXH5B0ZPCr~grPTZScjprXRT2RkU90oSd7X_PjDFFnBe3wuFkD1R-v1.png?transparent=1&palette=1",
+ "id":"3aBXH5B0ZPCr~grPTZScjprXRT2RkU90oSd7X_PjDFFnBe3wuFkD1R"
+ }
+ }
+ },
+ "errors":[]
+ }""",
+ ) # noqa
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/snapchat/urls.py django-allauth-0.51.0/allauth/socialaccount/providers/snapchat/urls.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/snapchat/urls.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/snapchat/urls.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,6 @@
+from allauth.socialaccount.providers.oauth2.urls import default_urlpatterns
+
+from .provider import SnapchatProvider
+
+
+urlpatterns = default_urlpatterns(SnapchatProvider)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/providers/snapchat/views.py django-allauth-0.51.0/allauth/socialaccount/providers/snapchat/views.py
--- django-allauth-0.47.0/allauth/socialaccount/providers/snapchat/views.py 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/providers/snapchat/views.py 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,52 @@
+import requests
+
+from allauth.socialaccount import app_settings
+from allauth.socialaccount.providers.oauth2.client import OAuth2Error
+from allauth.socialaccount.providers.oauth2.views import (
+ OAuth2Adapter,
+ OAuth2CallbackView,
+ OAuth2LoginView,
+)
+
+from .provider import Scope, SnapchatProvider
+
+
+class SnapchatOAuth2Adapter(OAuth2Adapter):
+ provider_id = SnapchatProvider.id
+
+ access_token_url = "https://accounts.snapchat.com/accounts/oauth2/token"
+ authorize_url = "https://accounts.snapchat.com/accounts/oauth2/auth"
+ identity_url = "https://api.snapkit.com/v1/me"
+
+ def complete_login(self, request, app, token, **kwargs):
+ extra_data = self.get_data(token.token)
+ return self.get_provider().sociallogin_from_response(request, extra_data)
+
+ def get_data(self, token):
+ provider_id = SnapchatProvider.id
+ settings = app_settings.PROVIDERS.get(provider_id, {})
+ provider_scope = settings.get(
+ "SCOPE",
+ "['https://auth.snapchat.com/oauth2/api/user.external_id', 'https://auth.snapchat.com/oauth2/api/user.display_name']",
+ )
+
+ hed = {
+ "Authorization": "Bearer " + token,
+ "Content-Type": "application/json;charset=UTF-8",
+ }
+ if Scope.BITMOJI in provider_scope:
+ data = {"query": "{ me { externalId displayName bitmoji { avatar id } } }"}
+ else:
+ data = {"query": "{ me { externalId displayName } }"}
+ resp = requests.post(self.identity_url, headers=hed, json=data)
+ resp.raise_for_status()
+ resp = resp.json()
+
+ if not resp.get("data"):
+ raise OAuth2Error()
+
+ return resp
+
+
+oauth2_login = OAuth2LoginView.adapter_view(SnapchatOAuth2Adapter)
+oauth2_callback = OAuth2CallbackView.adapter_view(SnapchatOAuth2Adapter)
diff -Nru django-allauth-0.47.0/allauth/socialaccount/tests.py django-allauth-0.51.0/allauth/socialaccount/tests.py
--- django-allauth-0.47.0/allauth/socialaccount/tests.py 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/socialaccount/tests.py 2022-06-07 09:42:31.000000000 +0000
@@ -7,12 +7,13 @@
from django.contrib.auth.models import AnonymousUser
from django.contrib.messages.middleware import MessageMiddleware
from django.contrib.sessions.middleware import SessionMiddleware
-from django.contrib.sites.models import Site
from django.test.client import RequestFactory
from django.test.utils import override_settings
from django.urls import reverse
from django.utils.http import urlencode
+import allauth.app_settings
+
from ..account import app_settings as account_settings
from ..account.models import EmailAddress
from ..account.utils import user_email, user_username
@@ -34,7 +35,10 @@
key=provider.id,
secret="dummy",
)
- app.sites.add(Site.objects.get_current())
+ if allauth.app_settings.SITES_ENABLED:
+ from django.contrib.sites.models import Site
+
+ app.sites.add(Site.objects.get_current())
return app
@@ -269,7 +273,6 @@
class SocialAccountTests(TestCase):
def setUp(self):
super(SocialAccountTests, self).setUp()
- site = Site.objects.get_current()
for provider in providers.registry.get_list():
app = SocialApp.objects.create(
provider=provider.id,
@@ -278,7 +281,11 @@
key="123",
secret="dummy",
)
- app.sites.add(site)
+ if allauth.app_settings.SITES_ENABLED:
+ from django.contrib.sites.models import Site
+
+ site = Site.objects.get_current()
+ app.sites.add(site)
@override_settings(
SOCIALACCOUNT_AUTO_SIGNUP=True,
@@ -626,3 +633,21 @@
resp = self.client.get(reverse("socialaccount_signup"))
self.assertRedirects(resp, reverse("account_login"))
+
+ def test_social_account_str_default(self):
+ User = get_user_model()
+ user = User(username="test")
+ sa = SocialAccount(user=user)
+ self.assertEqual("test", str(sa))
+
+ def socialaccount_str_custom_formatter(socialaccount):
+ return "A custom str builder for {}".format(socialaccount.user)
+
+ @override_settings(
+ SOCIALACCOUNT_SOCIALACCOUNT_STR=socialaccount_str_custom_formatter
+ )
+ def test_social_account_str_customized(self):
+ User = get_user_model()
+ user = User(username="test")
+ sa = SocialAccount(user=user)
+ self.assertEqual("A custom str builder for test", str(sa))
diff -Nru django-allauth-0.47.0/allauth/templates/account/email/unknown_account_message.txt django-allauth-0.51.0/allauth/templates/account/email/unknown_account_message.txt
--- django-allauth-0.47.0/allauth/templates/account/email/unknown_account_message.txt 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/templates/account/email/unknown_account_message.txt 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,12 @@
+{% extends "account/email/base_message.txt" %}
+{% load i18n %}
+
+{% block content %}{% autoescape off %}{% blocktrans %}You are receiving this e-mail because you or someone else has requested a
+password for your user account. However, we do not have any record of a user
+with email {{ email }} in our database.
+
+This mail can be safely ignored if you did not request a password reset.
+
+If it was you, you can sign up for an account using the link below.{% endblocktrans %}
+
+{{ signup_url }}{% endautoescape %}{% endblock %}
diff -Nru django-allauth-0.47.0/allauth/templates/account/email/unknown_account_subject.txt django-allauth-0.51.0/allauth/templates/account/email/unknown_account_subject.txt
--- django-allauth-0.47.0/allauth/templates/account/email/unknown_account_subject.txt 1970-01-01 00:00:00.000000000 +0000
+++ django-allauth-0.51.0/allauth/templates/account/email/unknown_account_subject.txt 2022-06-07 09:42:31.000000000 +0000
@@ -0,0 +1,4 @@
+{% load i18n %}
+{% autoescape off %}
+{% blocktrans %}Password Reset E-mail{% endblocktrans %}
+{% endautoescape %}
diff -Nru django-allauth-0.47.0/allauth/templates/account/password_reset_done.html django-allauth-0.51.0/allauth/templates/account/password_reset_done.html
--- django-allauth-0.47.0/allauth/templates/account/password_reset_done.html 2021-12-09 15:31:13.000000000 +0000
+++ django-allauth-0.51.0/allauth/templates/account/password_reset_done.html 2022-06-07 09:42:31.000000000 +0000
@@ -12,5 +12,5 @@
{% include "account/snippets/already_logged_in.html" %}
{% endif %}
-
{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}
+
{% blocktrans %}We have sent you an e-mail. If you have not received it please check your spam folder. Otherwise contact us if you do not receive it in a few minutes.{% endblocktrans %}
{% blocktrans %}The password reset link was invalid, possibly because it has already been used. Please request a new password reset.{% endblocktrans %}
{% blocktrans %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}
+
{% blocktrans %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. If you do not see the verification e-mail in your main inbox, check your spam folder. Please contact us if you do not receive the verification e-mail within a few minutes.{% endblocktrans %}
{% blocktrans %}We have sent an e-mail to you for
-verification. Please click on the link inside this e-mail. Please
+verification. Please click on the link inside that e-mail. If you do not see the verification e-mail in your main inbox, check your spam folder. Otherwise
contact us if you do not receive it within a few minutes.{% endblocktrans %}