merge

[wolnelektury.git] / src / wolnelektury / locale-contrib / de / LC_MESSAGES / django.po

diff --git a/src/wolnelektury/locale-contrib/de/LC_MESSAGES/django.po b/src/wolnelektury/locale-contrib/de/LC_MESSAGES/django.po
index 46b4e0c..258803a 100644 (file)
--- a/src/wolnelektury/locale-contrib/de/LC_MESSAGES/django.po
+++ b/src/wolnelektury/locale-contrib/de/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2016-01-25 13:23+0100\n"
+"POT-Creation-Date: 2016-09-14 12:34+0200\n"
 "PO-Revision-Date: 2012-08-14 17:50+0100\n"
 "Last-Translator: Radek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>\n"
 "Language: de\n"
@@ -431,7 +431,7 @@ msgid ""
 "e-mail address for user %(user_display)s."
 msgstr ""
 "Sie haben bestätigt, dass <a href=\"mailto:%(email)s\">%(email)s</a> ist "
-"mit dem User '%(user)s' verbunden."
+"mit dem User '%(user_display)s' verbunden."
 
 #: /home/janek/.virtualenvs/lektury/local/lib/python2.7/site-packages/allauth/templates/account/email_confirm.html:20
 msgid "Confirm"
@@ -451,7 +451,7 @@ msgid ""
 "e-mail address for user %(user_display)s."
 msgstr ""
 "Sie haben bestätigt, dass <a href=\"mailto:%(email)s\">%(email)s</a> ist "
-"mit dem User '%(user)s' verbunden."
+"mit dem User '%(user_display)s' verbunden."
 
 #: /home/janek/.virtualenvs/lektury/local/lib/python2.7/site-packages/allauth/templates/account/login.html:6
 #: /home/janek/.virtualenvs/lektury/local/lib/python2.7/site-packages/allauth/templates/account/login.html:10
@@ -713,7 +713,7 @@ msgstr "Die E-Mail-Adresse %(email)s gelöscht."
 #: /home/janek/.virtualenvs/lektury/local/lib/python2.7/site-packages/allauth/templates/account/messages/logged_in.txt:4
 #, fuzzy, python-format
 msgid "Successfully signed in as %(name)s."
-msgstr "Erfolgreich als %(user)s eingeloggt."
+msgstr "Erfolgreich als %(name)s eingeloggt."
 
 #: /home/janek/.virtualenvs/lektury/local/lib/python2.7/site-packages/allauth/templates/account/messages/logged_out.txt:2
 msgid "You have signed out."
@@ -826,15 +826,6 @@ msgstr "Das Social-Account wurde abgeschaltet."
 #~ msgid "Delete Password"
 #~ msgstr "Password löschen"
 
-#~ msgid ""
-#~ "You may delete your password since "
-#~ "you are currently logged in using "
-#~ "OpenID."
-#~ msgstr ""
-#~ "Sie können Ihr Schlüsselwort löschen, "
-#~ "weil Sie jetzt durch OpenID eingeloggt"
-#~ " sind."
-
 #~ msgid "delete my password"
 #~ msgstr "Password löschen"
 
@@ -844,50 +835,3 @@ msgstr "Das Social-Account wurde abgeschaltet."
 #~ msgid "Your password has been deleted."
 #~ msgstr "Password wurde gelöscht."
 
-#~ msgid ""
-#~ "We have sent an e-mail to <a "
-#~ "href=\"mailto:%(email)s\">%(email)s</a> 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 ""
-
-#~ msgid ""
-#~ "User %(user_display)s at %(site_name)s has "
-#~ "given this as an email address.\n"
-#~ "\n"
-#~ "To confirm this is correct, go to %(activate_url)s\n"
-#~ msgstr ""
-
-#~ 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.\n"
-#~ "\n"
-#~ "%(password_reset_url)s\n"
-#~ "\n"
-#~ "In case you forgot, your username is %(username)s.\n"
-#~ "\n"
-#~ "Thanks for using our site!\n"
-#~ msgstr ""
-#~ "Sie bekommen diese Email an "
-#~ "%(site_domain)s, weil Sie or jemand "
-#~ "anderer Ihr Schlüsselwort erhalten will. "
-#~ "Sie können diese Nachricht ignorieren, "
-#~ "wenn Sie um Neustellung des "
-#~ "Schlüssekworts nicht gebeten haben. Klicken"
-#~ " Sie an das Link unten, um Ihr"
-#~ " Schlüsselwort neu zu stellen.\n"
-#~ "\n"
-#~ "%(password_reset_url)s\n"
-#~ "\n"
-#~ "Falls Sie vergessen haben, ist Ihr Benutzername: %(username)s.\n"
-#~ "\n"
-#~ "Vielen dank, dass Sie unsere Webseite benutzt haben!\n"
-