Merge lp:~canonical-isd-hackers/canonical-identity-provider/remove-newlines into lp:canonical-identity-provider/release

[Łukasz Czyżykowski]

This branch contains exactly the same changes as sanitize-messages, just on top of current trunk. Just removal of new lines from templates, so the strings can be easier translated.

[Szilveszter Farkas (phanatic)]

review: Approve

=== modified file 'identityprovider/templates/500.html'
--- identityprovider/templates/500.html	2010-05-13 16:01:26 +0000
+++ identityprovider/templates/500.html	2010-06-01 11:36:30 +0000
@@ -16,8 +16,7 @@
             {{ brand.oops_error }}
           </p>
           <p>
-            {% blocktrans %}We&#8217;ve recorded what happened,
-and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience.{% endblocktrans %}
+            {% blocktrans %}We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience.{% endblocktrans %}
           </p>
           <p>
             {% blocktrans %}(Error <abbr>ID</abbr>: {{oopsid}}){% endblocktrans %}

=== modified file 'identityprovider/templates/admin/readonly_confirm.html'
--- identityprovider/templates/admin/readonly_confirm.html	2010-05-13 09:47:58 +0000
+++ identityprovider/templates/admin/readonly_confirm.html	2010-06-01 11:36:30 +0000
@@ -39,8 +39,7 @@
     <p>
     {% ifequal action "set" %}
         {% if appserver %}
-            {% blocktrans %}You are about to enable readonly mode on appserver
-<b>{{ appserver }}</b>.{% endblocktrans %}
+            {% blocktrans %}You are about to enable readonly mode on appserver <b>{{ appserver }}</b>.{% endblocktrans %}
         {% else %}
             {% blocktrans %}You are about to enable readonly mode globally.{% endblocktrans %}</p><p>
             {% blocktrans %}All appservers will be passed to read-only mode if you confirm.{% endblocktrans %}

=== modified file 'identityprovider/templates/decide.html'
--- identityprovider/templates/decide.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/decide.html	2010-06-01 11:36:30 +0000
@@ -19,11 +19,9 @@
     <div class="info">
         <p>
         {% if rpconfig %}
-            {% blocktrans with rpconfig.displayname as rpconfigname %}If you proceed, the following information
-will be available to {{ rpconfigname }}:{% endblocktrans %}
+            {% blocktrans with rpconfig.displayname as rpconfigname %}If you proceed, the following information will be available to {{ rpconfigname }}:{% endblocktrans %}
         {% else %}
-            {% blocktrans %}If you proceed, the following information
-will be available to the website:{% endblocktrans %}
+            {% blocktrans %}If you proceed, the following information will be available to the website:{% endblocktrans %}
         {% endif %}
 
         <div class="info-items">

=== modified file 'identityprovider/templates/invalid_identifier.html'
--- identityprovider/templates/invalid_identifier.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/invalid_identifier.html	2010-06-01 11:36:30 +0000
@@ -7,10 +7,7 @@
 {% block "title" %}{% trans "Invalid identifier" %}{% endblock %}
 
 {% block "content" %}
-    <p>{% blocktrans %}A site identifying as {{ trust_root }} has asked us
-for confirmation that {{ identifier }} is your identity URL. However, that
-is not a valid OpenID identity URL for this site, such as
-<strong>{{ root_url }}~USER</strong>.{% endblocktrans %}
+    <p>{% blocktrans %}A site identifying as {{ trust_root }} has asked us for confirmation that {{ identifier }} is your identity URL. However, that is not a valid OpenID identity URL for this site, such as <strong>{{ root_url }}~USER</strong>.{% endblocktrans %}
     </p>
 
     <form action="{{ continue_url }}" method="post">

=== modified file 'identityprovider/templates/limitexceeded.html'
--- identityprovider/templates/limitexceeded.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/limitexceeded.html	2010-06-01 11:36:30 +0000
@@ -13,8 +13,7 @@
         <h1 class="main">{% trans "Rate limit exceeded" %}</h1>
         <div>
           <p>
-            {% blocktrans %}You have made too many failed requests to the SSO
-authentication server over a short period of time.{% endblocktrans %}
+            {% blocktrans %}You have made too many failed requests to the SSO authentication server over a short period of time.{% endblocktrans %}
           </p>
           <p>
             {% blocktrans %}Please try again in a while.{% endblocktrans %}

=== modified file 'identityprovider/templates/preauth_fail.html'
--- identityprovider/templates/preauth_fail.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/preauth_fail.html	2010-06-01 11:36:30 +0000
@@ -8,7 +8,6 @@
 
 {% block "content" %}
     <p>
-    {% blocktrans %}A site identifying as {{ trust_root }} has asked us for
-pre-authorization. However, that site is not approved for pre-authorization.{% endblocktrans %}
+    {% blocktrans %}A site identifying as {{ trust_root }} has asked us for pre-authorization. However, that site is not approved for pre-authorization.{% endblocktrans %}
     </p>
 {% endblock %}

=== modified file 'identityprovider/templates/readonly.html'
--- identityprovider/templates/readonly.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/readonly.html	2010-06-01 11:36:30 +0000
@@ -13,9 +13,7 @@
         <h1 class="main">{% trans "We're currently in read-only mode." %}</h1>
         <div>
           <p>
-            {% blocktrans %}Apologies, the page you're requesting isn't
-accessible at the moment, as we're running with a minimum set of features.
-Hopefully we will have the full service up and running again in no time.{% endblocktrans %}
+            {% blocktrans %}Apologies, the page you're requesting isn't accessible at the moment, as we're running with a minimum set of features. Hopefully we will have the full service up and running again in no time.{% endblocktrans %}
           </p>
           <p>
             {% blocktrans %}Please try again in a while.{% endblocktrans %}

=== modified file 'identityprovider/templates/registration/email_sent.html'
--- identityprovider/templates/registration/email_sent.html	2010-05-13 10:34:30 +0000
+++ identityprovider/templates/registration/email_sent.html	2010-06-01 11:36:30 +0000
@@ -27,7 +27,7 @@
     <h2 class="main">{% trans "Haven&rsquo;t received it?" %}</h2>
     <p>{% blocktrans %}If you don&rsquo;t receive the message within a few minutes, it might be because:{% endblocktrans %}</p>
     <p>{% blocktrans %}Your mail provider uses &ldquo;greylisting&rdquo; to reduce spam. If so, you&rsquo;ll need to wait an hour or two for the message to arrive.{% endblocktrans %}</p>
-    <p>{% blocktrans %}Your mail provider mistakenly blocks messages from this site. Try signing up using a service like <a href="http://gmail.com/">Gmail</a> or <a href="http://mail.yahoo.com/">Yahoo Mail</a>. If that works, complain to your usual mail provider.{% endblocktrans %}
+    <p>{% blocktrans %}Your mail provider mistakenly blocks messages from this site. Try signing up using a service like <a href="http://gmail.com/">Gmail</a> or <a href="http://mail.yahoo.com/">Yahoo Mail</a>.{% endblocktrans %}
     </p>
     {% if email_notreceived_extra %}
     <p>{{ email_notreceived_extra|safe }}</p>

=== modified file 'identityprovider/templates/server_info.html'
--- identityprovider/templates/server_info.html	2010-04-21 15:29:24 +0000
+++ identityprovider/templates/server_info.html	2010-06-01 11:36:30 +0000
@@ -8,7 +8,6 @@
 
 {% block "content" %}
     <p>{{ brand.server_info }}</p>
-    <p>{% blocktrans %}This page is meant to be called from an OpenID-enabled
-site and therefore has no user-facing functions.{% endblocktrans %}</p>
+    <p>{% blocktrans %}This page is meant to be called from an OpenID-enabled site and therefore has no user-facing functions.{% endblocktrans %}</p>
 {% endblock %}
 

=== modified file 'identityprovider/templates/widgets/recaptcha.html'
--- identityprovider/templates/widgets/recaptcha.html	2010-05-13 09:41:09 +0000
+++ identityprovider/templates/widgets/recaptcha.html	2010-06-01 11:36:30 +0000
@@ -21,8 +21,7 @@
 <div {% if captcha_error %}class='captchaError'{% endif %}>
 {% ifequal captcha_error "&error=no-challenge" %}
 <p>
-{% blocktrans %}It appears that our captcha service was unable to load on this page. This may be caused by a plugin on your browser. Please correct this and try again. If the problem persists, please contact
-<a href="https://forms.canonical.com/sso-support/">Ubuntu SSO support</a>{% endblocktrans %}
+{% blocktrans %}It appears that our captcha service was unable to load on this page. This may be caused by a plugin on your browser. Please correct this and try again. If the problem persists, please contact <a href="https://forms.canonical.com/sso-support/">Ubuntu SSO support</a>{% endblocktrans %}
 </p>
 {% endifequal %}
 <script type="text/javascript" src="https://api-secure.recaptcha.net/challenge?k={{ CAPTCHA_PUBLIC_KEY }}{{ captcha_error }}">

=== modified file 'po/django/de.po'
--- po/django/de.po	2010-05-19 13:05:45 +0000
+++ po/django/de.po	2010-06-01 11:36:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: canonical-identity-provider\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:49-0500\n"
+"POT-Creation-Date: 2010-05-31 09:06-0500\n"
 "PO-Revision-Date: 2010-05-19 09:33-0300\n"
 "Last-Translator: Ricardo Kirkner <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
@@ -405,7 +405,7 @@
 msgid "Not found"
 msgstr "Nicht gefunden"
 
-#: templates/404.html:17 templates/500.html:23
+#: templates/404.html:17 templates/500.html:22
 #, python-format
 msgid "(Error <abbr>ID</abbr>: %(oopsid)s)"
 msgstr "(Fehler <abbr>ID</abbr>: %(oopsid)s)"
@@ -416,10 +416,10 @@
 
 #: templates/500.html:19
 msgid ""
-"We&#8217;ve recorded what happened,\n"
-"and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience."
+"We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as "
+"possible. Apologies for the inconvenience."
 msgstr ""
-"Wir haben aufgezeichnet, was passiert ist,\n"
+"Wir haben aufgezeichnet, was passiert ist,"
 "und wir werden es so bald wie möglich beheben. Entschuldigen Sie uns für die "
 "Unannehmlichkeiten."
 
@@ -431,34 +431,33 @@
 #: templates/decide.html:22
 #, python-format
 msgid ""
-"If you proceed, the following information\n"
-"will be available to %(rpconfigname)s:"
+"If you proceed, the following information will be available to %"
+"(rpconfigname)s:"
 msgstr ""
-"Wenn Sie fortfahren, wird die folgende Information\n"
+"Wenn Sie fortfahren, wird die folgende Information "
 "%(rpconfigname)s zur Verfügung stehen:"
 
-#: templates/decide.html:25
+#: templates/decide.html:24
 msgid ""
-"If you proceed, the following information\n"
-"will be available to the website:"
+"If you proceed, the following information will be available to the website:"
 msgstr ""
-"Wenn Sie fortfahren, wird die folgende Information\n"
+"Wenn Sie fortfahren, wird die folgende Information "
 "dem Website zur Verfügung stehen:"
 
-#: templates/decide.html:37
+#: templates/decide.html:35
 msgid "Only your identity URL"
 msgstr "Nur Ihre Identität URL"
 
-#: templates/decide.html:45
+#: templates/decide.html:43
 msgid "Yes, sign me in"
 msgstr "Ja, melden Sie mich in"
 
-#: templates/decide.html:46 templates/readonly.html:23
+#: templates/decide.html:44 templates/readonly.html:21
 #: templates/account/confirm_new_email.html:24
 #: templates/account/delete_email.html:23
 #: templates/account/edit-emails.html:46 templates/account/edit-emails.html:62
 #: templates/account/edit.html:138 templates/account/new_email.html:23
-#: templates/admin/readonly_confirm.html:73
+#: templates/admin/readonly_confirm.html:72
 #: templates/launchpad/registration/login.html:53
 #: templates/registration/confirm_new_account.html:44
 #: templates/registration/forgot_password.html:29
@@ -468,7 +467,7 @@
 msgid "or"
 msgstr "oder"
 
-#: templates/decide.html:47 templates/account/confirm_new_email.html:25
+#: templates/decide.html:45 templates/account/confirm_new_email.html:25
 #: templates/account/delete_email.html:24
 #: templates/account/edit-emails.html:47 templates/account/edit-emails.html:63
 #: templates/account/new_email.html:24
@@ -488,18 +487,17 @@
 #: templates/invalid_identifier.html:10
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us\n"
-"for confirmation that %(identifier)s is your identity URL. However, that\n"
-"is not a valid OpenID identity URL for this site, such as\n"
-"<strong>%(root_url)s~USER</strong>."
+"A site identifying as %(trust_root)s has asked us for confirmation that %"
+"(identifier)s is your identity URL. However, that is not a valid OpenID "
+"identity URL for this site, such as <strong>%(root_url)s~USER</strong>."
 msgstr ""
 "Eine Website identifiziert als %(trust_root)s hat uns um Bestätigung "
-"gebeten, dass %(identifier)s Ihr Identität URL ist. Jedoch ist das\n"
+"gebeten, dass %(identifier)s Ihr Identität URL ist. Jedoch ist das "
 "nicht ein gültiges OpenID Identität URL für dieses Website, wie zum "
-"Beispiel\n"
+"Beispiel "
 "<strong>%(root_url)s~USER</ strong>."
 
-#: templates/invalid_identifier.html:17 templates/account/new_email.html:22
+#: templates/invalid_identifier.html:14 templates/account/new_email.html:22
 #: templates/launchpad/registration/login.html:52
 #: templates/registration/confirm_new_account.html:43
 #: templates/registration/email_sent.html:22
@@ -516,17 +514,17 @@
 
 #: templates/limitexceeded.html:16
 msgid ""
-"You have made too many failed requests to the SSO\n"
-"authentication server over a short period of time."
+"You have made too many failed requests to the SSO authentication server over "
+"a short period of time."
 msgstr ""
-"Sie haben zu viele fehlgeschlagene Zugriffe auf den SSO\n"
+"Sie haben zu viele fehlgeschlagene Zugriffe auf den SSO "
 "Authentifizierungs-Server über einen kurzen Zeitraum gemacht."
 
-#: templates/limitexceeded.html:20 templates/readonly.html:21
+#: templates/limitexceeded.html:19 templates/readonly.html:19
 msgid "Please try again in a while."
 msgstr "Bitte versuchen Sie es nochmals in einer Weile."
 
-#: templates/limitexceeded.html:22 templates/readonly.html:23
+#: templates/limitexceeded.html:21 templates/readonly.html:21
 msgid "Try again"
 msgstr "Versuchen Sie es nochmal"
 
@@ -542,10 +540,10 @@
 #: templates/preauth_fail.html:11
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us for\n"
-"pre-authorization. However, that site is not approved for pre-authorization."
+"A site identifying as %(trust_root)s has asked us for pre-authorization. "
+"However, that site is not approved for pre-authorization."
 msgstr ""
-"Eine Website identifiziert als %(trust_root)s hat uns für\n"
+"Eine Website identifiziert als %(trust_root)s hat uns für "
 "Vor-Ermächtigung gebeten. Allerdings ist dieses Website nicht für Vor-"
 "Ermächtigung genehmigt."
 
@@ -559,16 +557,16 @@
 
 #: templates/readonly.html:16
 msgid ""
-"Apologies, the page you're requesting isn't\n"
-"accessible at the moment, as we're running with a minimum set of features.\n"
-"Hopefully we will have the full service up and running again in no time."
+"Apologies, the page you're requesting isn't accessible at the moment, as "
+"we're running with a minimum set of features. Hopefully we will have the "
+"full service up and running again in no time."
 msgstr ""
-"Wir bitten um Entschuldigung, die angeforderte Seite ist im Moment nicht\n"
-"zugänglich, als wir mit minimaler Funktionalität ausführen.\n"
+"Wir bitten um Entschuldigung, die angeforderte Seite ist im Moment nicht "
+"zugänglich, als wir mit minimaler Funktionalität ausführen. "
 "Hoffentlich können wir die volle Funktionalität in kürzester Zeit wieder in "
 "Lauf bringen."
 
-#: templates/readonly.html:24
+#: templates/readonly.html:22
 msgid "Go to our home page"
 msgstr "Gehen Sie zu unserer Startseite"
 
@@ -599,10 +597,10 @@
 
 #: templates/server_info.html:11
 msgid ""
-"This page is meant to be called from an OpenID-enabled\n"
-"site and therefore has no user-facing functions."
+"This page is meant to be called from an OpenID-enabled site and therefore "
+"has no user-facing functions."
 msgstr ""
-"Diese Seite soll von einem OpenID-fähigen Website aufgerufen werden\n"
+"Diese Seite soll von einem OpenID-fähigen Website aufgerufen werden "
 "und zeigt daher keine Benutzer-brauchbare Funktionen vor."
 
 #: templates/untrusted.html:8
@@ -619,7 +617,7 @@
 "Es tut uns leid, aber wir erlauben derzeitig keine Anfragen von\n"
 "%(trust_root)s."
 
-#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:73
+#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:72
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -637,7 +635,7 @@
 msgstr "Sind Sie sicher, dass Sie Sie diese E-Mail-Adresse bestätigen wollen?"
 
 #: templates/account/confirm_new_email.html:22
-#: templates/admin/readonly_confirm.html:72
+#: templates/admin/readonly_confirm.html:71
 msgid "Yes, I'm sure"
 msgstr "Ja, Ich bin sicher"
 
@@ -854,28 +852,27 @@
 #: templates/admin/readonly_confirm.html:42
 #, python-format
 msgid ""
-"You are about to enable readonly mode on appserver\n"
-"<b>%(appserver)s</b>."
+"You are about to enable readonly mode on appserver <b>%(appserver)s</b>."
 msgstr "<b>%(appserver)s</b>"
 
-#: templates/admin/readonly_confirm.html:45
+#: templates/admin/readonly_confirm.html:44
 msgid "You are about to enable readonly mode globally."
 msgstr "Sie sind dabei, den read-only-Modus globalerweise zu aktivieren."
 
-#: templates/admin/readonly_confirm.html:46
+#: templates/admin/readonly_confirm.html:45
 msgid "All appservers will be passed to read-only mode if you confirm."
 msgstr ""
 "Alle Anwendungsserver werden zum read-only-Modus gesetzt, wenn Sie "
 "bestätigen."
 
-#: templates/admin/readonly_confirm.html:51
+#: templates/admin/readonly_confirm.html:50
 #, python-format
 msgid "You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
 msgstr ""
 "Sie sind dabei, den read-only-Modus auf den Anwendungsserver <b>%(appserver)"
 "s</b> zu verlassen."
 
-#: templates/admin/readonly_confirm.html:52
+#: templates/admin/readonly_confirm.html:51
 #, python-format
 msgid ""
 "If you confirm, <b>%(appserver)s</b> will attempt to resume normal operation "
@@ -885,18 +882,18 @@
 "versuchen, den normalen Betrieb mit seiner Master-Datenbank-Verbindung "
 "wieder aufzunehmen."
 
-#: templates/admin/readonly_confirm.html:54
+#: templates/admin/readonly_confirm.html:53
 msgid "You are about to clear readonly mode globally."
 msgstr ""
 "Sie sind dabei den read-only-Modus auf alle Anwendungsserver zu verlassen."
 
-#: templates/admin/readonly_confirm.html:55
+#: templates/admin/readonly_confirm.html:54
 msgid "If you confirm, all appservers will attempt to resume normal operation."
 msgstr ""
 "Wenn sie bestätigen, werden alle Anwendungsserver versuchen den normalen "
 "Betrieb wieder aufzunehmen."
 
-#: templates/admin/readonly_confirm.html:59
+#: templates/admin/readonly_confirm.html:58
 #, python-format
 msgid ""
 "You are about to enable the <b>%(conn)s</b> database connection on appserver "
@@ -905,7 +902,7 @@
 "Sie sind dabei die <b>%(conn)s</> Datenbank-Verbindung auf dem <b>%"
 "(appserver)s</b> Anwendungsserver zu aktivieren."
 
-#: templates/admin/readonly_confirm.html:62
+#: templates/admin/readonly_confirm.html:61
 #, python-format
 msgid ""
 "You are about to disable the <b>%(conn)s</b> database connection on "
@@ -928,198 +925,6 @@
 "neuen Konten erstellen, persönlichen Informationen aktualisieren, oder "
 "Passwort Mahnungen anfordern können."
 
-#: templates/launchpad/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Launchpad Login Service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Hallo\n"
-"\n"
-"Wir erhielten eine Anfrage um die E-Mail Adresse %(toaddress)s für den "
-"Einsatz in dem Launchpad Anmeldedienst zu überprüfen.\n"
-"\n"
-"Wenn Sie diesen Antrag gestellt haben, kopieren Sie bitte den token "
-"unten in der Desktop-Anwendung, um den Prozess um die Addresse %(toaddress)s "
-"zu Ihrem bestehenden Launchpad Anmeldedienst Konto anzutragen zu enden.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"Wenn Sie diesen Antrag nicht gestellt haben, ignorieren Sie bitte diese "
-"Nachricht oder tragen Sie ein Bericht als möglicher Versuch eines Angriffs "
-"auf die Sicherheit Ihrer Daten ein.\n"
-"\n"
-"Vielen Dank,\n"
-"\n"
-"Das Launchpad Anmeldedienst Team"
-
-#: templates/launchpad/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Launchpad Login Service account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Launchpad Login Service. Sorry about that. You don't "
-"need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Hallo\n"
-"\n"
-"Sie haben ein neues Passwort für Ihr Launchpad Anmeldedienst Konto angefragt.\n"
-"\n"
-"Um Ihr Passwort zu ändern:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Wenn Sie nicht wissen, worum es geht, dann hat jemand anderes Ihre "
-"E-Mail Adresse an dem Launchpad Anmeldedienst angegeben. Wir entschuldigen "
-"uns dafür. Sie brauchen nichts weiteres zu tun; löschen Sie einfach diese "
-"Meldung.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"\n"
-"Das Launchpad Anmeldedienst Team"
-
-#: templates/launchpad/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Wir haben einen Antrag um ein neues Konto mit Ihrer E-Mail Adresse zu "
-"erstellen empfangen.\n"
-"\n"
-"Wenn Sie es tatsächlich waren, haben Sie vielleicht Ihr Passwort vergessen?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"Wenn nicht, kann jemand versucht haben, Sie zu imitieren. Wenn Sie mehr "
-"Anfragen wie diese bekommen, lassen Sie es uns bitte wissen.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"\n"
-"Das Launchpad Anmeldedienst Team"
-
-#: templates/launchpad/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Launchpad Login Service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Launchpad Login Service web site. Sorry "
-"about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Hallo\n"
-"\n"
-"Danke für die Registrierung mit dem Launchpad Anmeldedienst.\n"
-"\n"
-"Um Ihre Registrierung abzuschließen:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Wenn Sie nicht wissen, worum es geht, dann hat jemand wohl Ihre "
-"E-Mail Adresse aus Versehen an der Launchpad Anmeldedienst Website "
-"eingegeben. Wir entschuldigen uns dafür. Sie brauchen nichts weiteres zu "
-"tun; löschen Sie einfach diese Nachricht.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"\n"
-"Das Launchpad Anmeldedienst Team"
-
-#: templates/launchpad/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Launchpad Login Service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Hallo\n"
-"\n"
-"Wir erhielten eine Anfrage von %(requester)s mit der E-Mail Adresse "
-"%(requester_email)s, um die E-Mail Adresse %(toaddress)s für den Einsatz "
-"im Launchpad Anmeldedienst zu üperprüfen.\n"
-"\n"
-"Wenn Sie diesen Antrag gestellt haben, klicken Sie bitte auf den unten "
-"stehenden Link um den Vorgang die E-Mail Addresse %(toaddress)s an Ihr "
-"bestehendes Launchpad Anmeldedienst Konto anzutragen, abzuschließen.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Wenn Sie diesen Antrag nicht gestellt haben, ignorieren Sie bitte diese "
-"Nachricht oder tragen Sie einen Bericht ein, an\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"als einen möglichen Versuch eines Angriffs auf die Sicherheit Ihrer Daten.\n"
-"\n"
-"Vielen Dank,\n"
-"\n"
-"Das Launchpad Anmeldedienst Team"
-
 #: templates/launchpad/registration/login.html:18
 msgid "Log in to Launchpad Login Service"
 msgstr "Melden Sie sich beim Launchpad Anmeldedienst an"
@@ -1237,14 +1042,12 @@
 msgid ""
 "Your mail provider mistakenly blocks messages from this site. Try signing up "
 "using a service like <a href=\"http://gmail.com/\">Gmail</a> or <a href="
-"\"http://mail.yahoo.com/\">Yahoo Mail</a>. If that works, complain to your "
-"usual mail provider."
+"\"http://mail.yahoo.com/\">Yahoo Mail</a>."
 msgstr ""
 "Ihr E-Mail Anbieter blockiert irrtümlich Nachrichten aus diesem Website. "
 "Versuchen Sie, unter Verwendung eines Dienstes wie <a href=\"http://gmail."
 "com/\">Google Mail</a> oder <a href=\"http://mail.yahoo.com/\">Yahoo Mail</"
-"a> sich anzumelden. Wenn das funktioniert, beschweren Sie sich bei Ihrem "
-"üblichen E-Mail Anbieter."
+"a> sich anzumelden."
 
 #: templates/registration/email_sent.html:35
 msgid "If neither of those work, our service might be having a problem."
@@ -1530,199 +1333,6 @@
 "\">Nutzungsbedingungen</a> sowie unsere <a href=\"http://ubuntu.com/"
 "legal#privacy\">Datenschutzbestimmungen</a>."
 
-#: templates/ubuntu/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Ubuntu Single Sign On service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Hallo\n"
-"\n"
-"Wir erhielten eine Anfrage um die E-Mail Adresse %(toaddress)s für den "
-"Einsatz in dem Ubuntu Single Sign On Dienst zu überprüfen.\n"
-"\n"
-"Wenn Sie diesen Antrag gestellt haben, kopieren Sie bitte den token "
-"unten in der Desktop-Anwendung, um den Prozess um die Addresse "
-"%(toaddress)s zu Ihrem bestehenden Ubuntu Single Sign On Konto anzutragen "
-"zu enden.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"Wenn Sie diesen Antrag nicht gestellt haben, ignorieren Sie bitte diese "
-"Nachricht oder tragen Sie ein Bericht als möglicher Versuch eines Angriffs "
-"auf die Sicherheit Ihrer Daten ein.\n"
-"\n"
-"Vielen Dank,\n"
-"\n"
-"Das Ubuntu Single Sign On Dienst Team"
-
-#: templates/ubuntu/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Ubuntu Single Sign On account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Ubuntu Single Sign On service. Sorry about that. You "
-"don't need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Hallo \n"
-"\n"
-"Sie haben ein neues Passwort für Ihr Ubuntu Signle Sign On Konto angefragt.\n"
-"\n"
-"Um Ihr Passwort zu ändern:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Wenn Sie nicht wissen, worum es geht, dann hat jemand anderes Ihre "
-"E-Mail Adresse an dem Ubuntu Single Sign On Dienst angegeben. Wir "
-"entschuldigen uns dafür. Sie brauchen nichts weiteres zu tun; löschen "
-"Sie einfach diese Meldung.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"\n"
-"Das Ubuntu Single Sign On Diesnt Team"
-
-#: templates/ubuntu/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Wir haben einen Antrag um ein neues Konto mit Ihrer E-Mail Adresse zu "
-"erstellen empfangen.\n"
-"\n"
-"Wenn Sie es tatsächlich waren, haben Sie vielleicht Ihr Passwort vergessen?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"Wenn nicht, kann jemand versucht haben, Sie zu imitieren. Wenn Sie mehr "
-"Anfragen wie diese bekommen, lassen Sie es uns bitte wissen.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"\n"
-"Das Ubuntu Single Sign On Dienst Team"
-
-#: templates/ubuntu/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Ubuntu Single Sign On service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Ubuntu Single Sign On service web site. "
-"Sorry about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Hallo\n"
-"\n"
-"Danke für die Registrierung mit dem Ubuntu Single Sign On Dienst.\n"
-"\n"
-"Um Ihre Registrierung abzuschließen:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Wenn Sie nicht wissen, worum es geht, dann hat jemand wohl Ihre "
-"E-Mail Adresse aus Versehen an der Ubuntu Single Sign On Dienst Website "
-"eingegeben. Wir entschuldigen uns dafür. Sie brauchen nichts weiteres zu "
-"tun; löschen Sie einfach diese Nachricht.\n"
-"\n"
-"Mit freundlichen Grüßen,\n"
-"\n"
-"Das Ubuntu Single Sign On Dienst Team"
-
-#: templates/ubuntu/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Ubuntu Single Sign On service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Hallo\n"
-"\n"
-"Wir erhielten eine Anfrage von %(requester)s mit der E-Mail Adresse "
-"%(requester_email)s, um die E-Mail Adresse %(toaddress)s für den Einsatz "
-"im Ubuntu Single Sign On Dienst zu üperprüfen.\n"
-"\n"
-"Wenn Sie diesen Antrag gestellt haben, klicken Sie bitte auf den unten "
-"stehenden Link um den Vorgang die E-Mail Addresse %(toaddress)s an Ihr "
-"bestehendes Ubuntu Single Sign On Konto anzutragen, abzuschließen.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Wenn Sie diesen Antrag nicht gestellt haben, ignorieren Sie bitte diese "
-"Nachricht oder tragen Sie einen Bericht ein, an\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"als einen möglichen Versuch eines Angriffs auf die Sicherheit Ihrer Daten.\n"
-"\n"
-"Vielen Dank,\n"
-"\n"
-"Das Ubuntu Single Sign On Dienst Team"
-
 #: templates/ubuntu/registration/login.html:18
 msgid "Log in to Ubuntu Single Sign On"
 msgstr "Melden Sie sich bei dem Ubuntu Single Sign On Dienst an"
@@ -1816,8 +1426,8 @@
 msgid ""
 "It appears that our captcha service was unable to load on this page. This "
 "may be caused by a plugin on your browser. Please correct this and try "
-"again. If the problem persists, please contact\n"
-"<a href=\"https://forms.canonical.com/sso-support/\">Ubuntu SSO support</a>"
+"again. If the problem persists, please contact <a href=\"https://forms."
+"canonical.com/sso-support/\">Ubuntu SSO support</a>"
 msgstr ""
 "Es scheint, als ob unserer Captcha-Dienst auf dieser Seite nicht geladen "
 "werden konnte. Dies kann durch ein Plugin in Ihrem Browser verursacht "
@@ -1959,6 +1569,380 @@
 msgstr "Falsche Captcha-Lösung."
 
 #~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request to validate the email address %(toaddress)s for use "
+#~ "in the Launchpad Login Service.\n"
+#~ "\n"
+#~ "If you made this request, please copy and paste the token below into the "
+#~ "desktop application to complete the process to add %(toaddress)s to your "
+#~ "existing Launchpad Login Service account.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Hallo\n"
+#~ "\n"
+#~ "Wir erhielten eine Anfrage um die E-Mail Adresse %(toaddress)s für den "
+#~ "Einsatz in dem Launchpad Anmeldedienst zu überprüfen.\n"
+#~ "\n"
+#~ "Wenn Sie diesen Antrag gestellt haben, kopieren Sie bitte den token unten "
+#~ "in der Desktop-Anwendung, um den Prozess um die Addresse %(toaddress)s zu "
+#~ "Ihrem bestehenden Launchpad Anmeldedienst Konto anzutragen zu enden.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "Wenn Sie diesen Antrag nicht gestellt haben, ignorieren Sie bitte diese "
+#~ "Nachricht oder tragen Sie ein Bericht als möglicher Versuch eines "
+#~ "Angriffs auf die Sicherheit Ihrer Daten ein.\n"
+#~ "\n"
+#~ "Vielen Dank,\n"
+#~ "\n"
+#~ "Das Launchpad Anmeldedienst Team"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "You have requested a new password for your Launchpad Login Service "
+#~ "account.\n"
+#~ "\n"
+#~ "To change your password:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone else has entered your "
+#~ "email address at the Launchpad Login Service. Sorry about that. You don't "
+#~ "need to do anything further, just delete this message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Hallo\n"
+#~ "\n"
+#~ "Sie haben ein neues Passwort für Ihr Launchpad Anmeldedienst Konto "
+#~ "angefragt.\n"
+#~ "\n"
+#~ "Um Ihr Passwort zu ändern:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Wenn Sie nicht wissen, worum es geht, dann hat jemand anderes Ihre E-Mail "
+#~ "Adresse an dem Launchpad Anmeldedienst angegeben. Wir entschuldigen uns "
+#~ "dafür. Sie brauchen nichts weiteres zu tun; löschen Sie einfach diese "
+#~ "Meldung.\n"
+#~ "\n"
+#~ "Mit freundlichen Grüßen,\n"
+#~ "\n"
+#~ "Das Launchpad Anmeldedienst Team"
+
+#~ msgid ""
+#~ "We've received a request to create a new account with your email "
+#~ "address.\n"
+#~ "\n"
+#~ "If this was you, perhaps you've forgotten your password?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "If not, someone may be trying to impersonate you. If you get more "
+#~ "requests like this, please let us know.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Wir haben einen Antrag um ein neues Konto mit Ihrer E-Mail Adresse zu "
+#~ "erstellen empfangen.\n"
+#~ "\n"
+#~ "Wenn Sie es tatsächlich waren, haben Sie vielleicht Ihr Passwort "
+#~ "vergessen?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "Wenn nicht, kann jemand versucht haben, Sie zu imitieren. Wenn Sie mehr "
+#~ "Anfragen wie diese bekommen, lassen Sie es uns bitte wissen.\n"
+#~ "\n"
+#~ "Mit freundlichen Grüßen,\n"
+#~ "\n"
+#~ "Das Launchpad Anmeldedienst Team"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "Thank you for registering with the Launchpad Login Service.\n"
+#~ "\n"
+#~ "To complete your registration:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone has probably entered "
+#~ "your email address by mistake at the Launchpad Login Service web site. "
+#~ "Sorry about that. You don't need to do anything further, just delete this "
+#~ "message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Hallo\n"
+#~ "\n"
+#~ "Danke für die Registrierung mit dem Launchpad Anmeldedienst.\n"
+#~ "\n"
+#~ "Um Ihre Registrierung abzuschließen:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Wenn Sie nicht wissen, worum es geht, dann hat jemand wohl Ihre E-Mail "
+#~ "Adresse aus Versehen an der Launchpad Anmeldedienst Website eingegeben. "
+#~ "Wir entschuldigen uns dafür. Sie brauchen nichts weiteres zu tun; löschen "
+#~ "Sie einfach diese Nachricht.\n"
+#~ "\n"
+#~ "Mit freundlichen Grüßen,\n"
+#~ "\n"
+#~ "Das Launchpad Anmeldedienst Team"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request from %(requester)s using email address %"
+#~ "(requester_email)s, trying to validate the email address %(toaddress)s "
+#~ "for use in the Launchpad Login Service.\n"
+#~ "\n"
+#~ "If you made this request, please click on the link below and complete the "
+#~ "process to add %(toaddress)s to your existing Launchpad Login Service "
+#~ "account.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "on\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Hallo\n"
+#~ "\n"
+#~ "Wir erhielten eine Anfrage von %(requester)s mit der E-Mail Adresse %"
+#~ "(requester_email)s, um die E-Mail Adresse %(toaddress)s für den Einsatz "
+#~ "im Launchpad Anmeldedienst zu üperprüfen.\n"
+#~ "\n"
+#~ "Wenn Sie diesen Antrag gestellt haben, klicken Sie bitte auf den unten "
+#~ "stehenden Link um den Vorgang die E-Mail Addresse %(toaddress)s an Ihr "
+#~ "bestehendes Launchpad Anmeldedienst Konto anzutragen, abzuschließen.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Wenn Sie diesen Antrag nicht gestellt haben, ignorieren Sie bitte diese "
+#~ "Nachricht oder tragen Sie einen Bericht ein, an\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "als einen möglichen Versuch eines Angriffs auf die Sicherheit Ihrer "
+#~ "Daten.\n"
+#~ "\n"
+#~ "Vielen Dank,\n"
+#~ "\n"
+#~ "Das Launchpad Anmeldedienst Team"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request to validate the email address %(toaddress)s for use "
+#~ "in the Ubuntu Single Sign On service.\n"
+#~ "\n"
+#~ "If you made this request, please copy and paste the token below into the "
+#~ "desktop application to complete the process to add %(toaddress)s to your "
+#~ "existing Ubuntu Single Sign On service account.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Hallo\n"
+#~ "\n"
+#~ "Wir erhielten eine Anfrage um die E-Mail Adresse %(toaddress)s für den "
+#~ "Einsatz in dem Ubuntu Single Sign On Dienst zu überprüfen.\n"
+#~ "\n"
+#~ "Wenn Sie diesen Antrag gestellt haben, kopieren Sie bitte den token unten "
+#~ "in der Desktop-Anwendung, um den Prozess um die Addresse %(toaddress)s zu "
+#~ "Ihrem bestehenden Ubuntu Single Sign On Konto anzutragen zu enden.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "Wenn Sie diesen Antrag nicht gestellt haben, ignorieren Sie bitte diese "
+#~ "Nachricht oder tragen Sie ein Bericht als möglicher Versuch eines "
+#~ "Angriffs auf die Sicherheit Ihrer Daten ein.\n"
+#~ "\n"
+#~ "Vielen Dank,\n"
+#~ "\n"
+#~ "Das Ubuntu Single Sign On Dienst Team"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "You have requested a new password for your Ubuntu Single Sign On "
+#~ "account.\n"
+#~ "\n"
+#~ "To change your password:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone else has entered your "
+#~ "email address at the Ubuntu Single Sign On service. Sorry about that. You "
+#~ "don't need to do anything further, just delete this message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Hallo \n"
+#~ "\n"
+#~ "Sie haben ein neues Passwort für Ihr Ubuntu Signle Sign On Konto "
+#~ "angefragt.\n"
+#~ "\n"
+#~ "Um Ihr Passwort zu ändern:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Wenn Sie nicht wissen, worum es geht, dann hat jemand anderes Ihre E-Mail "
+#~ "Adresse an dem Ubuntu Single Sign On Dienst angegeben. Wir entschuldigen "
+#~ "uns dafür. Sie brauchen nichts weiteres zu tun; löschen Sie einfach diese "
+#~ "Meldung.\n"
+#~ "\n"
+#~ "Mit freundlichen Grüßen,\n"
+#~ "\n"
+#~ "Das Ubuntu Single Sign On Diesnt Team"
+
+#~ msgid ""
+#~ "We've received a request to create a new account with your email "
+#~ "address.\n"
+#~ "\n"
+#~ "If this was you, perhaps you've forgotten your password?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "If not, someone may be trying to impersonate you. If you get more "
+#~ "requests like this, please let us know.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Wir haben einen Antrag um ein neues Konto mit Ihrer E-Mail Adresse zu "
+#~ "erstellen empfangen.\n"
+#~ "\n"
+#~ "Wenn Sie es tatsächlich waren, haben Sie vielleicht Ihr Passwort "
+#~ "vergessen?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "Wenn nicht, kann jemand versucht haben, Sie zu imitieren. Wenn Sie mehr "
+#~ "Anfragen wie diese bekommen, lassen Sie es uns bitte wissen.\n"
+#~ "\n"
+#~ "Mit freundlichen Grüßen,\n"
+#~ "\n"
+#~ "Das Ubuntu Single Sign On Dienst Team"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "Thank you for registering with the Ubuntu Single Sign On service.\n"
+#~ "\n"
+#~ "To complete your registration:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone has probably entered "
+#~ "your email address by mistake at the Ubuntu Single Sign On service web "
+#~ "site. Sorry about that. You don't need to do anything further, just "
+#~ "delete this message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Hallo\n"
+#~ "\n"
+#~ "Danke für die Registrierung mit dem Ubuntu Single Sign On Dienst.\n"
+#~ "\n"
+#~ "Um Ihre Registrierung abzuschließen:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Wenn Sie nicht wissen, worum es geht, dann hat jemand wohl Ihre E-Mail "
+#~ "Adresse aus Versehen an der Ubuntu Single Sign On Dienst Website "
+#~ "eingegeben. Wir entschuldigen uns dafür. Sie brauchen nichts weiteres zu "
+#~ "tun; löschen Sie einfach diese Nachricht.\n"
+#~ "\n"
+#~ "Mit freundlichen Grüßen,\n"
+#~ "\n"
+#~ "Das Ubuntu Single Sign On Dienst Team"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request from %(requester)s using email address %"
+#~ "(requester_email)s, trying to validate the email address %(toaddress)s "
+#~ "for use in the Ubuntu Single Sign On service.\n"
+#~ "\n"
+#~ "If you made this request, please click on the link below and complete the "
+#~ "process to add %(toaddress)s to your existing Ubuntu Single Sign On "
+#~ "service account.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "on\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Hallo\n"
+#~ "\n"
+#~ "Wir erhielten eine Anfrage von %(requester)s mit der E-Mail Adresse %"
+#~ "(requester_email)s, um die E-Mail Adresse %(toaddress)s für den Einsatz "
+#~ "im Ubuntu Single Sign On Dienst zu üperprüfen.\n"
+#~ "\n"
+#~ "Wenn Sie diesen Antrag gestellt haben, klicken Sie bitte auf den unten "
+#~ "stehenden Link um den Vorgang die E-Mail Addresse %(toaddress)s an Ihr "
+#~ "bestehendes Ubuntu Single Sign On Konto anzutragen, abzuschließen.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Wenn Sie diesen Antrag nicht gestellt haben, ignorieren Sie bitte diese "
+#~ "Nachricht oder tragen Sie einen Bericht ein, an\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "als einen möglichen Versuch eines Angriffs auf die Sicherheit Ihrer "
+#~ "Daten.\n"
+#~ "\n"
+#~ "Vielen Dank,\n"
+#~ "\n"
+#~ "Das Ubuntu Single Sign On Dienst Team"
+
+#~ msgid ""
 #~ "You can not confirm this token because you are logged in as a different "
 #~ "user. Please log out and try again."
 #~ msgstr ""

=== modified file 'po/django/django.pot'
--- po/django/django.pot	2010-05-18 20:09:48 +0000
+++ po/django/django.pot	2010-06-01 11:36:30 +0000
@@ -1,9 +1,6 @@
-#, fuzzy
-msgid ""
-msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:49-0500\n"
+"POT-Creation-Date: 2010-05-31 09:06-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -360,7 +357,7 @@
 msgid "Not found"
 msgstr ""
 
-#: templates/404.html:17 templates/500.html:23
+#: templates/404.html:17 templates/500.html:22
 #, python-format
 msgid "(Error <abbr>ID</abbr>: %(oopsid)s)"
 msgstr ""
@@ -371,8 +368,8 @@
 
 #: templates/500.html:19
 msgid ""
-"We&#8217;ve recorded what happened,\n"
-"and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience."
+"We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as "
+"possible. Apologies for the inconvenience."
 msgstr ""
 
 #: templates/decide.html:8
@@ -383,30 +380,29 @@
 #: templates/decide.html:22
 #, python-format
 msgid ""
-"If you proceed, the following information\n"
-"will be available to %(rpconfigname)s:"
+"If you proceed, the following information will be available to %"
+"(rpconfigname)s:"
 msgstr ""
 
-#: templates/decide.html:25
+#: templates/decide.html:24
 msgid ""
-"If you proceed, the following information\n"
-"will be available to the website:"
+"If you proceed, the following information will be available to the website:"
 msgstr ""
 
-#: templates/decide.html:37
+#: templates/decide.html:35
 msgid "Only your identity URL"
 msgstr ""
 
-#: templates/decide.html:45
+#: templates/decide.html:43
 msgid "Yes, sign me in"
 msgstr ""
 
-#: templates/decide.html:46 templates/readonly.html:23
+#: templates/decide.html:44 templates/readonly.html:21
 #: templates/account/confirm_new_email.html:24
 #: templates/account/delete_email.html:23
 #: templates/account/edit-emails.html:46 templates/account/edit-emails.html:62
 #: templates/account/edit.html:138 templates/account/new_email.html:23
-#: templates/admin/readonly_confirm.html:73
+#: templates/admin/readonly_confirm.html:72
 #: templates/launchpad/registration/login.html:53
 #: templates/registration/confirm_new_account.html:44
 #: templates/registration/forgot_password.html:29
@@ -416,7 +412,7 @@
 msgid "or"
 msgstr ""
 
-#: templates/decide.html:47 templates/account/confirm_new_email.html:25
+#: templates/decide.html:45 templates/account/confirm_new_email.html:25
 #: templates/account/delete_email.html:24
 #: templates/account/edit-emails.html:47 templates/account/edit-emails.html:63
 #: templates/account/new_email.html:24
@@ -436,13 +432,12 @@
 #: templates/invalid_identifier.html:10
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us\n"
-"for confirmation that %(identifier)s is your identity URL. However, that\n"
-"is not a valid OpenID identity URL for this site, such as\n"
-"<strong>%(root_url)s~USER</strong>."
+"A site identifying as %(trust_root)s has asked us for confirmation that %"
+"(identifier)s is your identity URL. However, that is not a valid OpenID "
+"identity URL for this site, such as <strong>%(root_url)s~USER</strong>."
 msgstr ""
 
-#: templates/invalid_identifier.html:17 templates/account/new_email.html:22
+#: templates/invalid_identifier.html:14 templates/account/new_email.html:22
 #: templates/launchpad/registration/login.html:52
 #: templates/registration/confirm_new_account.html:43
 #: templates/registration/email_sent.html:22
@@ -459,15 +454,15 @@
 
 #: templates/limitexceeded.html:16
 msgid ""
-"You have made too many failed requests to the SSO\n"
-"authentication server over a short period of time."
+"You have made too many failed requests to the SSO authentication server over "
+"a short period of time."
 msgstr ""
 
-#: templates/limitexceeded.html:20 templates/readonly.html:21
+#: templates/limitexceeded.html:19 templates/readonly.html:19
 msgid "Please try again in a while."
 msgstr ""
 
-#: templates/limitexceeded.html:22 templates/readonly.html:23
+#: templates/limitexceeded.html:21 templates/readonly.html:21
 msgid "Try again"
 msgstr ""
 
@@ -483,8 +478,8 @@
 #: templates/preauth_fail.html:11
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us for\n"
-"pre-authorization. However, that site is not approved for pre-authorization."
+"A site identifying as %(trust_root)s has asked us for pre-authorization. "
+"However, that site is not approved for pre-authorization."
 msgstr ""
 
 #: templates/readonly.html:8
@@ -497,12 +492,12 @@
 
 #: templates/readonly.html:16
 msgid ""
-"Apologies, the page you're requesting isn't\n"
-"accessible at the moment, as we're running with a minimum set of features.\n"
-"Hopefully we will have the full service up and running again in no time."
+"Apologies, the page you're requesting isn't accessible at the moment, as "
+"we're running with a minimum set of features. Hopefully we will have the "
+"full service up and running again in no time."
 msgstr ""
 
-#: templates/readonly.html:24
+#: templates/readonly.html:22
 msgid "Go to our home page"
 msgstr ""
 
@@ -529,8 +524,8 @@
 
 #: templates/server_info.html:11
 msgid ""
-"This page is meant to be called from an OpenID-enabled\n"
-"site and therefore has no user-facing functions."
+"This page is meant to be called from an OpenID-enabled site and therefore "
+"has no user-facing functions."
 msgstr ""
 
 #: templates/untrusted.html:8
@@ -545,7 +540,7 @@
 "%(trust_root)s."
 msgstr ""
 
-#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:73
+#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:72
 msgid "Cancel"
 msgstr ""
 
@@ -563,7 +558,7 @@
 msgstr ""
 
 #: templates/account/confirm_new_email.html:22
-#: templates/admin/readonly_confirm.html:72
+#: templates/admin/readonly_confirm.html:71
 msgid "Yes, I'm sure"
 msgstr ""
 
@@ -770,46 +765,45 @@
 #: templates/admin/readonly_confirm.html:42
 #, python-format
 msgid ""
-"You are about to enable readonly mode on appserver\n"
-"<b>%(appserver)s</b>."
+"You are about to enable readonly mode on appserver <b>%(appserver)s</b>."
+msgstr ""
+
+#: templates/admin/readonly_confirm.html:44
+msgid "You are about to enable readonly mode globally."
 msgstr ""
 
 #: templates/admin/readonly_confirm.html:45
-msgid "You are about to enable readonly mode globally."
-msgstr ""
-
-#: templates/admin/readonly_confirm.html:46
 msgid "All appservers will be passed to read-only mode if you confirm."
 msgstr ""
 
+#: templates/admin/readonly_confirm.html:50
+#, python-format
+msgid "You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
+msgstr ""
+
 #: templates/admin/readonly_confirm.html:51
 #, python-format
-msgid "You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
-msgstr ""
-
-#: templates/admin/readonly_confirm.html:52
-#, python-format
 msgid ""
 "If you confirm, <b>%(appserver)s</b> will attempt to resume normal operation "
 "with its master database connection."
 msgstr ""
 
+#: templates/admin/readonly_confirm.html:53
+msgid "You are about to clear readonly mode globally."
+msgstr ""
+
 #: templates/admin/readonly_confirm.html:54
-msgid "You are about to clear readonly mode globally."
-msgstr ""
-
-#: templates/admin/readonly_confirm.html:55
 msgid "If you confirm, all appservers will attempt to resume normal operation."
 msgstr ""
 
-#: templates/admin/readonly_confirm.html:59
+#: templates/admin/readonly_confirm.html:58
 #, python-format
 msgid ""
 "You are about to enable the <b>%(conn)s</b> database connection on appserver "
 "<b>%(appserver)s</b>."
 msgstr ""
 
-#: templates/admin/readonly_confirm.html:62
+#: templates/admin/readonly_confirm.html:61
 #, python-format
 msgid ""
 "You are about to disable the <b>%(conn)s</b> database connection on "
@@ -827,113 +821,6 @@
 "reminders."
 msgstr ""
 
-#: templates/launchpad/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Launchpad Login Service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Launchpad Login Service account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Launchpad Login Service. Sorry about that. You don't "
-"need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Launchpad Login Service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Launchpad Login Service web site. Sorry "
-"about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Launchpad Login Service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
 #: templates/launchpad/registration/login.html:18
 msgid "Log in to Launchpad Login Service"
 msgstr ""
@@ -1029,8 +916,7 @@
 msgid ""
 "Your mail provider mistakenly blocks messages from this site. Try signing up "
 "using a service like <a href=\"http://gmail.com/\">Gmail</a> or <a href="
-"\"http://mail.yahoo.com/\">Yahoo Mail</a>. If that works, complain to your "
-"usual mail provider."
+"\"http://mail.yahoo.com/\">Yahoo Mail</a>."
 msgstr ""
 
 #: templates/registration/email_sent.html:35
@@ -1226,113 +1112,6 @@
 "a>."
 msgstr ""
 
-#: templates/ubuntu/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Ubuntu Single Sign On service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Ubuntu Single Sign On account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Ubuntu Single Sign On service. Sorry about that. You "
-"don't need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Ubuntu Single Sign On service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Ubuntu Single Sign On service web site. "
-"Sorry about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Ubuntu Single Sign On service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
 #: templates/ubuntu/registration/login.html:18
 msgid "Log in to Ubuntu Single Sign On"
 msgstr ""
@@ -1419,8 +1198,8 @@
 msgid ""
 "It appears that our captcha service was unable to load on this page. This "
 "may be caused by a plugin on your browser. Please correct this and try "
-"again. If the problem persists, please contact\n"
-"<a href=\"https://forms.canonical.com/sso-support/\">Ubuntu SSO support</a>"
+"again. If the problem persists, please contact <a href=\"https://forms."
+"canonical.com/sso-support/\">Ubuntu SSO support</a>"
 msgstr ""
 
 #: templates/widgets/trusted_rp.html:7

=== modified file 'po/django/es.po'
--- po/django/es.po	2010-05-19 13:05:45 +0000
+++ po/django/es.po	2010-06-01 11:36:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: canonical-identity-provider\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:49-0500\n"
+"POT-Creation-Date: 2010-05-31 09:05-0500\n"
 "PO-Revision-Date: 2010-05-19 10:04-0300\n"
 "Last-Translator: Anthony Lenton <Unknown>\n"
 "Language-Team: Spanish <[e-mail]>\n"
@@ -397,7 +397,7 @@
 msgid "Not found"
 msgstr "No encontrado"
 
-#: templates/404.html:17 templates/500.html:23
+#: templates/404.html:17 templates/500.html:22
 #, python-format
 msgid "(Error <abbr>ID</abbr>: %(oopsid)s)"
 msgstr "(<abbr>ID</abbr> de Error: %(oopsid)s)"
@@ -408,10 +408,10 @@
 
 #: templates/500.html:19
 msgid ""
-"We&#8217;ve recorded what happened,\n"
-"and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience."
+"We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as "
+"possible. Apologies for the inconvenience."
 msgstr ""
-"Hemos registrado lo sucedido,\n"
+"Hemos registrado lo sucedido, "
 "y lo arreglaremos lo más pronto posible.  Disculpe las molestias."
 
 #: templates/decide.html:8
@@ -422,32 +422,31 @@
 #: templates/decide.html:22
 #, python-format
 msgid ""
-"If you proceed, the following information\n"
-"will be available to %(rpconfigname)s:"
+"If you proceed, the following information will be available to %"
+"(rpconfigname)s:"
 msgstr "Si procedes, la siguiente información será enviada a %(rpconfigname)s:"
 
-#: templates/decide.html:25
+#: templates/decide.html:24
 msgid ""
-"If you proceed, the following information\n"
-"will be available to the website:"
+"If you proceed, the following information will be available to the website:"
 msgstr ""
-"Si procedes, la siguiente información será\n"
+"Si procedes, la siguiente información será "
 "enviada al sitio web:"
 
-#: templates/decide.html:37
+#: templates/decide.html:35
 msgid "Only your identity URL"
 msgstr "Sólo tu URL de identidad"
 
-#: templates/decide.html:45
+#: templates/decide.html:43
 msgid "Yes, sign me in"
 msgstr "Sí, quiero autenticarme"
 
-#: templates/decide.html:46 templates/readonly.html:23
+#: templates/decide.html:44 templates/readonly.html:21
 #: templates/account/confirm_new_email.html:24
 #: templates/account/delete_email.html:23
 #: templates/account/edit-emails.html:46 templates/account/edit-emails.html:62
 #: templates/account/edit.html:138 templates/account/new_email.html:23
-#: templates/admin/readonly_confirm.html:73
+#: templates/admin/readonly_confirm.html:72
 #: templates/launchpad/registration/login.html:53
 #: templates/registration/confirm_new_account.html:44
 #: templates/registration/forgot_password.html:29
@@ -457,7 +456,7 @@
 msgid "or"
 msgstr "o"
 
-#: templates/decide.html:47 templates/account/confirm_new_email.html:25
+#: templates/decide.html:45 templates/account/confirm_new_email.html:25
 #: templates/account/delete_email.html:24
 #: templates/account/edit-emails.html:47 templates/account/edit-emails.html:63
 #: templates/account/new_email.html:24
@@ -477,17 +476,16 @@
 #: templates/invalid_identifier.html:10
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us\n"
-"for confirmation that %(identifier)s is your identity URL. However, that\n"
-"is not a valid OpenID identity URL for this site, such as\n"
-"<strong>%(root_url)s~USER</strong>."
+"A site identifying as %(trust_root)s has asked us for confirmation that %"
+"(identifier)s is your identity URL. However, that is not a valid OpenID "
+"identity URL for this site, such as <strong>%(root_url)s~USER</strong>."
 msgstr ""
-"Un sitio que se identificó como %(trust_root)s ha pedido que\n"
-"confirmamos que %(identifier)s es tu URL de identidad.  Sin embargo, eso\n"
-"no parece una URL de identidad válida OpenID para este sitio, como\n"
+"Un sitio que se identificó como %(trust_root)s ha pedido que "
+"confirmamos que %(identifier)s es tu URL de identidad.  Sin embargo, eso "
+"no parece una URL de identidad válida OpenID para este sitio, como "
 "<strong>%(root_url)s~USER</strong>."
 
-#: templates/invalid_identifier.html:17 templates/account/new_email.html:22
+#: templates/invalid_identifier.html:14 templates/account/new_email.html:22
 #: templates/launchpad/registration/login.html:52
 #: templates/registration/confirm_new_account.html:43
 #: templates/registration/email_sent.html:22
@@ -504,17 +502,17 @@
 
 #: templates/limitexceeded.html:16
 msgid ""
-"You have made too many failed requests to the SSO\n"
-"authentication server over a short period of time."
+"You have made too many failed requests to the SSO authentication server over "
+"a short period of time."
 msgstr ""
-"Has realizado demasiados pedidos fallidos al\n"
+"Has realizado demasiados pedidos fallidos al "
 "servidor de autenticación de SSO en un corto período de tiempo."
 
-#: templates/limitexceeded.html:20 templates/readonly.html:21
+#: templates/limitexceeded.html:19 templates/readonly.html:19
 msgid "Please try again in a while."
 msgstr "Por favor vuelve a intentar en un rato."
 
-#: templates/limitexceeded.html:22 templates/readonly.html:23
+#: templates/limitexceeded.html:21 templates/readonly.html:21
 msgid "Try again"
 msgstr "Reintentar"
 
@@ -530,10 +528,10 @@
 #: templates/preauth_fail.html:11
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us for\n"
-"pre-authorization. However, that site is not approved for pre-authorization."
+"A site identifying as %(trust_root)s has asked us for pre-authorization. "
+"However, that site is not approved for pre-authorization."
 msgstr ""
-"Un sitio que se identificó como %(trust_root)s ha pedido que te\n"
+"Un sitio que se identificó como %(trust_root)s ha pedido que te "
 "pre-autoricemos.  Sin embargo, ese sitio no está habilitado para pedir pre-"
 "autorizaciones."
 
@@ -547,16 +545,16 @@
 
 #: templates/readonly.html:16
 msgid ""
-"Apologies, the page you're requesting isn't\n"
-"accessible at the moment, as we're running with a minimum set of features.\n"
-"Hopefully we will have the full service up and running again in no time."
+"Apologies, the page you're requesting isn't accessible at the moment, as "
+"we're running with a minimum set of features. Hopefully we will have the "
+"full service up and running again in no time."
 msgstr ""
-"Disculpas, la página que solicitaste no está disponible en este momento,\n"
-"ya que estamos corriendo con un conjunto de funcionalidades mínimas.\n"
+"Disculpas, la página que solicitaste no está disponible en este momento, "
+"ya que estamos corriendo con un conjunto de funcionalidades mínimas. "
 "Con suerte estaremos brindando el servicio completo una vez más en poco "
 "tiempo."
 
-#: templates/readonly.html:24
+#: templates/readonly.html:22
 msgid "Go to our home page"
 msgstr "Ir a la página principal"
 
@@ -587,10 +585,10 @@
 
 #: templates/server_info.html:11
 msgid ""
-"This page is meant to be called from an OpenID-enabled\n"
-"site and therefore has no user-facing functions."
+"This page is meant to be called from an OpenID-enabled site and therefore "
+"has no user-facing functions."
 msgstr ""
-"Esta página debe ser llamada por un sitio que utilice OpenID\n"
+"Esta página debe ser llamada por un sitio que utilice OpenID "
 "y no tiene ninguna funcionalidad para el usuario."
 
 #: templates/untrusted.html:8
@@ -607,7 +605,7 @@
 "Disculpas, no aceptamos pedidos de\n"
 "%(trust_root)s."
 
-#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:73
+#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:72
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -626,7 +624,7 @@
 "Estás seguro de que quieres confirmar y validar esta dirección de email?"
 
 #: templates/account/confirm_new_email.html:22
-#: templates/admin/readonly_confirm.html:72
+#: templates/admin/readonly_confirm.html:71
 msgid "Yes, I'm sure"
 msgstr "Sí, estoy seguro"
 
@@ -842,29 +840,28 @@
 #: templates/admin/readonly_confirm.html:42
 #, python-format
 msgid ""
-"You are about to enable readonly mode on appserver\n"
-"<b>%(appserver)s</b>."
+"You are about to enable readonly mode on appserver <b>%(appserver)s</b>."
 msgstr ""
-"Estás por entrar en modo solo-lectura en el servidor de aplicación\n"
+"Estás por entrar en modo solo-lectura en el servidor de aplicación "
 "<b>%(appserver)s</b>."
 
-#: templates/admin/readonly_confirm.html:45
+#: templates/admin/readonly_confirm.html:44
 msgid "You are about to enable readonly mode globally."
 msgstr "Estás por entrar en modo solo-lectura globalmente."
 
-#: templates/admin/readonly_confirm.html:46
+#: templates/admin/readonly_confirm.html:45
 msgid "All appservers will be passed to read-only mode if you confirm."
 msgstr ""
 "Todos los servidores de aplicación pasarán a modo solo-lectura si confirmas."
 
-#: templates/admin/readonly_confirm.html:51
+#: templates/admin/readonly_confirm.html:50
 #, python-format
 msgid "You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
 msgstr ""
 "Estás por salir de modo solo lectura en el servidor de aplicación <b>%"
 "(appserver)s</b>."
 
-#: templates/admin/readonly_confirm.html:52
+#: templates/admin/readonly_confirm.html:51
 #, python-format
 msgid ""
 "If you confirm, <b>%(appserver)s</b> will attempt to resume normal operation "
@@ -873,17 +870,17 @@
 "Si confirmas, <b>%(appserver)s</b> intentará retomar el funcionamiento "
 "normal con su conexión a la base de datos maestra."
 
-#: templates/admin/readonly_confirm.html:54
+#: templates/admin/readonly_confirm.html:53
 msgid "You are about to clear readonly mode globally."
 msgstr "Estás por salir de modo solo-lectura globalmente."
 
-#: templates/admin/readonly_confirm.html:55
+#: templates/admin/readonly_confirm.html:54
 msgid "If you confirm, all appservers will attempt to resume normal operation."
 msgstr ""
 "Si confirmas, todos los servidores de aplicación intentarán retomar el modo "
 "de operación normal."
 
-#: templates/admin/readonly_confirm.html:59
+#: templates/admin/readonly_confirm.html:58
 #, python-format
 msgid ""
 "You are about to enable the <b>%(conn)s</b> database connection on appserver "
@@ -892,7 +889,7 @@
 "Estás a punto de habilitar la conexión de base de datos <b>%(conn)s</b> "
 "desde el servidor de aplicación <b>%(appserver)s</b>."
 
-#: templates/admin/readonly_confirm.html:62
+#: templates/admin/readonly_confirm.html:61
 #, python-format
 msgid ""
 "You are about to disable the <b>%(conn)s</b> database connection on "
@@ -915,199 +912,6 @@
 "momento no puedes crear nuevas cuentas, actualizar tus datos personales ni "
 "pedir reestablecer tu contraseña."
 
-#: templates/launchpad/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Launchpad Login Service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Hola\n"
-"\n"
-"Hemos recibido una solicitud para validar la dirección de correo electrónico "
-"%(toaddress)s para su uso en el Servicio de Login Launchpad.\n"
-"\n"
-"Si usted hizo esta petición, por favor copie y pegue el token en la "
-"aplicación de escritorio para completar el proceso para agregar %(toaddress)s "
-"a su Cuenta de Servicio de Login Launchpad existente.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"Si usted no ha realizado dicha solicitud, por favor, ignore este mensaje o informe "
-"de un posible intento de ataque de seguridad a sus datos.\n"
-"\n"
-"Muchas gracias,\n "
-"\n"
-"El equipo del Servicio de Login Launchpad"
-
-#: templates/launchpad/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Launchpad Login Service account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Launchpad Login Service. Sorry about that. You don't "
-"need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Hola\n"
-"\n"
-"Usted ha solicitado una nueva clave para su cuenta de Servicio de Login "
-"Launchpad.\n"
-"\n"
-"Para cambiar su clave:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Si no sabe nada acerca de esta solicitud, alguien más ha ingresado su "
-"dirección de correo electrónico en el Servicio de Login Launchpad. Disculpe "
-"las molestias. No es necesario que realice ninguna otra acción, simplemente "
-"elimine este mensaje.\n"
-"\n"
-"Atentamente,\n"
-"\n"
-"El equipo del Servicio de Login Launchpad"
-
-#: templates/launchpad/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Hemos recibido una solicitud para crear una nueva cuenta con su dirección de "
-"correo electrónico.\n"
-"\n"
-"Si efectivamente realizó esta solicitud, quizás haya Usted olvidado su "
-"clave?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"De lo contrario, quizas alguien esté intentando impersonarlo. Si recibe más "
-"solicitudes como éstas, por favor, dejenos saberlo.\n"
-"\n"
-"Atentamente,\n"
-"\n"
-"El equipo del Servicio de Login Launchpad"
-
-#: templates/launchpad/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Launchpad Login Service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Launchpad Login Service web site. Sorry "
-"about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Hola\n"
-"\n"
-"Muchas gracias por registrarse con el Servicio de Login Launchpad.\n"
-"\n"
-"Para completar su registración:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Si no sabe de qué se trata esto, es posible que alguien haya utilizado su "
-"dirección de correo electrónico por error en la página web del Servicio de "
-"Login Launchpad. Disculpe las molestias. No es necesario que realice ningúna "
-"otra acción, simplemente elimine este mensaje.\n"
-"\n"
-"Atentamente,\n"
-"\n"
-"El equipo del Servicio de Login Launchpad"
-
-#: templates/launchpad/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Launchpad Login Service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Hola\n"
-"\n"
-"Hemos recibido una solicitud de %(requester)s utilizando la dirección de "
-"correo electrónico %(requester_email)s, para validar la dirección de correo "
-"electrónico %(toaddress)s para su uso en el Servicio de Login Launchpad.\n"
-"\n"
-"Si efectivamente realizó esta solicitud, por favor siga el vínculo a "
-"continuación para completar el proceso para agregar %(toaddress)s a su cuenta "
-"del Servicio de Login Launchpad existente.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Si Usted no realizó dicha solicitud, por favor ignore este mensaje, o "
-"reportelo en\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"como un potencial intento de un ataque a la seguridad de sus datos.\n"
-"\n"
-"Muchas gracias,\n"
-"\n"
-"El equipo del Servicio de Login Launchpad"
-
 #: templates/launchpad/registration/login.html:18
 msgid "Log in to Launchpad Login Service"
 msgstr "Entrar en el servicio de Login de Launchpad"
@@ -1222,8 +1026,7 @@
 msgid ""
 "Your mail provider mistakenly blocks messages from this site. Try signing up "
 "using a service like <a href=\"http://gmail.com/\">Gmail</a> or <a href="
-"\"http://mail.yahoo.com/\">Yahoo Mail</a>. If that works, complain to your "
-"usual mail provider."
+"\"http://mail.yahoo.com/\">Yahoo Mail</a>."
 msgstr ""
 "Tu proveedor de correo está bloqueando incorrectamente los mensajes de este "
 "sitio.  Intenta utilizando otro servicio como <a href=\"http://gmail.com/"
@@ -1509,199 +1312,6 @@
 "Servicio</a> al igual que nuestra <a href=\"http://ubuntu.com/legal#privacy"
 "\">Política de Privacidad</a>."
 
-#: templates/ubuntu/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Ubuntu Single Sign On service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Hola\n"
-"\n"
-"Hemos recibido una solicitud para validar la dirección de correo electrónico "
-"%(toaddress)s para su uso en el Servicio de Cuenta Única de Ubuntu.\n"
-"\n"
-"Si usted hizo esta petición, por favor copie y pegue el token en la "
-"aplicación de escritorio para completar el proceso para agregar %(toaddress)s "
-"a su Cuenta Única de Ubuntu existente.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"Si usted no ha realizado dicha solicitud, por favor, ignore este mensaje o informe "
-"de un posible intento de ataque de seguridad a sus datos.\n"
-"\n"
-"Muchas gracias,\n "
-"\n"
-"El equipo del Servicio de Cuenta Única de Ubuntu"
-
-#: templates/ubuntu/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Ubuntu Single Sign On account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Ubuntu Single Sign On service. Sorry about that. You "
-"don't need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Hola\n"
-"\n"
-"Usted ha solicitado una nueva clave para su Cuenta Única de Ubuntu.\n"
-"\n"
-"Para cambiar su clave:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Si no sabe nada acerca de esta solicitud, alguien más ha ingresado su "
-"dirección de correo electrónico en el Servicio de Cuenta Única de Ubuntu. "
-"Disculpe las molestias. No es necesario que realice ninguna otra acción, "
-"simplemente elimine este mensaje.\n"
-"\n"
-"Atentamente,\n"
-"\n"
-"El equipo del Servicio de Cuenta Única de Ubuntu"
-
-#: templates/ubuntu/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Hemos recibido una solicitud para crear una nueva cuenta con su dirección de "
-"correo electrónico.\n"
-"\n"
-"Si efectivamente realizó esta solicitud, quizás haya Usted olvidado su "
-"clave?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"De lo contrario, quizas alguien esté intentando impersonarlo. Si recibe más "
-"solicitudes como éstas, por favor, dejenos saberlo.\n"
-"\n"
-"Atentamente,\n"
-"\n"
-"El equipo del Servicio de Cuenta Única de Ubuntu"
-
-#: templates/ubuntu/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Ubuntu Single Sign On service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Ubuntu Single Sign On service web site. "
-"Sorry about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Hola\n"
-"\n"
-"Muchas gracias por registrarse con el Servicio de Cuenta Única de Ubuntu.\n"
-"\n"
-"Para completar su registración:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Si no sabe de qué se trata esto, es posible que alguien haya utilizado su "
-"dirección de correo electrónico por error en la página web del Servicio de "
-"Cuenta Única de Ubuntu. Disculpe las molestias. No es necesario que realice "
-"ningúna otra acción, simplemente elimine este mensaje.\n"
-"\n"
-"Atentamente,\n"
-"\n"
-"El equipo del Servicio de Cuenta Única de Ubuntu"
-
-#: templates/ubuntu/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Ubuntu Single Sign On service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Hola\n"
-"\n"
-"Hemos recibido una solicitud de %(requester)s utilizando la dirección de "
-"correo electrónico %(requester_email)s, para validar la dirección de correo "
-"electrónico %(toaddress)s para su uso en el Servicio de Cuenta Única de "
-"Ubuntu.\n"
-"\n"
-"Si efectivamente realizó esta solicitud, por favor siga el vínculo a "
-"continuación para completar el proceso para agregar %(toaddress)s a su cuenta "
-"del Servicio de Cuenta Única de Ubuntu existente.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Si Usted no realizó dicha solicitud, por favor ignore este mensaje, o "
-"reportelo en\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"como un potencial intento de un ataque a la seguridad de sus datos.\n"
-"\n"
-"Muchas gracias,\n"
-"\n"
-"El equipo del Servicio de Cuenta Única de Ubuntu"
-
 #: templates/ubuntu/registration/login.html:18
 msgid "Log in to Ubuntu Single Sign On"
 msgstr "Ingrese al Servicio de Cuenta Única de Ubuntu"
@@ -1794,12 +1404,12 @@
 msgid ""
 "It appears that our captcha service was unable to load on this page. This "
 "may be caused by a plugin on your browser. Please correct this and try "
-"again. If the problem persists, please contact\n"
-"<a href=\"https://forms.canonical.com/sso-support/\">Ubuntu SSO support</a>"
+"again. If the problem persists, please contact <a href=\"https://forms."
+"canonical.com/sso-support/\">Ubuntu SSO support</a>"
 msgstr ""
 "Parece que nuestro servicio de captcha no pudo ser cargado en esta página.  "
 "Esto puede ser causado por algún plugin en tu navegador.  Por favor corrije "
-"esto y vuelve a intentar.  Si el problema persiste, por favor contacta al\n"
+"esto y vuelve a intentar.  Si el problema persiste, por favor contacta al "
 "<a href=\"https://forms.canonical.com/sso-support/\">soporte de Cuenta Única "
 "Ubuntu</a>"
 
@@ -1935,6 +1545,379 @@
 msgstr "Solución incorrecta de captcha."
 
 #~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request to validate the email address %(toaddress)s for use "
+#~ "in the Launchpad Login Service.\n"
+#~ "\n"
+#~ "If you made this request, please copy and paste the token below into the "
+#~ "desktop application to complete the process to add %(toaddress)s to your "
+#~ "existing Launchpad Login Service account.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Hola\n"
+#~ "\n"
+#~ "Hemos recibido una solicitud para validar la dirección de correo "
+#~ "electrónico %(toaddress)s para su uso en el Servicio de Login Launchpad.\n"
+#~ "\n"
+#~ "Si usted hizo esta petición, por favor copie y pegue el token en la "
+#~ "aplicación de escritorio para completar el proceso para agregar %"
+#~ "(toaddress)s a su Cuenta de Servicio de Login Launchpad existente.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "Si usted no ha realizado dicha solicitud, por favor, ignore este mensaje "
+#~ "o informe de un posible intento de ataque de seguridad a sus datos.\n"
+#~ "\n"
+#~ "Muchas gracias,\n"
+#~ " \n"
+#~ "El equipo del Servicio de Login Launchpad"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "You have requested a new password for your Launchpad Login Service "
+#~ "account.\n"
+#~ "\n"
+#~ "To change your password:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone else has entered your "
+#~ "email address at the Launchpad Login Service. Sorry about that. You don't "
+#~ "need to do anything further, just delete this message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Hola\n"
+#~ "\n"
+#~ "Usted ha solicitado una nueva clave para su cuenta de Servicio de Login "
+#~ "Launchpad.\n"
+#~ "\n"
+#~ "Para cambiar su clave:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Si no sabe nada acerca de esta solicitud, alguien más ha ingresado su "
+#~ "dirección de correo electrónico en el Servicio de Login Launchpad. "
+#~ "Disculpe las molestias. No es necesario que realice ninguna otra acción, "
+#~ "simplemente elimine este mensaje.\n"
+#~ "\n"
+#~ "Atentamente,\n"
+#~ "\n"
+#~ "El equipo del Servicio de Login Launchpad"
+
+#~ msgid ""
+#~ "We've received a request to create a new account with your email "
+#~ "address.\n"
+#~ "\n"
+#~ "If this was you, perhaps you've forgotten your password?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "If not, someone may be trying to impersonate you. If you get more "
+#~ "requests like this, please let us know.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Hemos recibido una solicitud para crear una nueva cuenta con su dirección "
+#~ "de correo electrónico.\n"
+#~ "\n"
+#~ "Si efectivamente realizó esta solicitud, quizás haya Usted olvidado su "
+#~ "clave?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "De lo contrario, quizas alguien esté intentando impersonarlo. Si recibe "
+#~ "más solicitudes como éstas, por favor, dejenos saberlo.\n"
+#~ "\n"
+#~ "Atentamente,\n"
+#~ "\n"
+#~ "El equipo del Servicio de Login Launchpad"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "Thank you for registering with the Launchpad Login Service.\n"
+#~ "\n"
+#~ "To complete your registration:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone has probably entered "
+#~ "your email address by mistake at the Launchpad Login Service web site. "
+#~ "Sorry about that. You don't need to do anything further, just delete this "
+#~ "message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Hola\n"
+#~ "\n"
+#~ "Muchas gracias por registrarse con el Servicio de Login Launchpad.\n"
+#~ "\n"
+#~ "Para completar su registración:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Si no sabe de qué se trata esto, es posible que alguien haya utilizado su "
+#~ "dirección de correo electrónico por error en la página web del Servicio "
+#~ "de Login Launchpad. Disculpe las molestias. No es necesario que realice "
+#~ "ningúna otra acción, simplemente elimine este mensaje.\n"
+#~ "\n"
+#~ "Atentamente,\n"
+#~ "\n"
+#~ "El equipo del Servicio de Login Launchpad"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request from %(requester)s using email address %"
+#~ "(requester_email)s, trying to validate the email address %(toaddress)s "
+#~ "for use in the Launchpad Login Service.\n"
+#~ "\n"
+#~ "If you made this request, please click on the link below and complete the "
+#~ "process to add %(toaddress)s to your existing Launchpad Login Service "
+#~ "account.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "on\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Hola\n"
+#~ "\n"
+#~ "Hemos recibido una solicitud de %(requester)s utilizando la dirección de "
+#~ "correo electrónico %(requester_email)s, para validar la dirección de "
+#~ "correo electrónico %(toaddress)s para su uso en el Servicio de Login "
+#~ "Launchpad.\n"
+#~ "\n"
+#~ "Si efectivamente realizó esta solicitud, por favor siga el vínculo a "
+#~ "continuación para completar el proceso para agregar %(toaddress)s a su "
+#~ "cuenta del Servicio de Login Launchpad existente.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Si Usted no realizó dicha solicitud, por favor ignore este mensaje, o "
+#~ "reportelo en\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "como un potencial intento de un ataque a la seguridad de sus datos.\n"
+#~ "\n"
+#~ "Muchas gracias,\n"
+#~ "\n"
+#~ "El equipo del Servicio de Login Launchpad"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request to validate the email address %(toaddress)s for use "
+#~ "in the Ubuntu Single Sign On service.\n"
+#~ "\n"
+#~ "If you made this request, please copy and paste the token below into the "
+#~ "desktop application to complete the process to add %(toaddress)s to your "
+#~ "existing Ubuntu Single Sign On service account.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Hola\n"
+#~ "\n"
+#~ "Hemos recibido una solicitud para validar la dirección de correo "
+#~ "electrónico %(toaddress)s para su uso en el Servicio de Cuenta Única de "
+#~ "Ubuntu.\n"
+#~ "\n"
+#~ "Si usted hizo esta petición, por favor copie y pegue el token en la "
+#~ "aplicación de escritorio para completar el proceso para agregar %"
+#~ "(toaddress)s a su Cuenta Única de Ubuntu existente.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "Si usted no ha realizado dicha solicitud, por favor, ignore este mensaje "
+#~ "o informe de un posible intento de ataque de seguridad a sus datos.\n"
+#~ "\n"
+#~ "Muchas gracias,\n"
+#~ " \n"
+#~ "El equipo del Servicio de Cuenta Única de Ubuntu"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "You have requested a new password for your Ubuntu Single Sign On "
+#~ "account.\n"
+#~ "\n"
+#~ "To change your password:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone else has entered your "
+#~ "email address at the Ubuntu Single Sign On service. Sorry about that. You "
+#~ "don't need to do anything further, just delete this message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Hola\n"
+#~ "\n"
+#~ "Usted ha solicitado una nueva clave para su Cuenta Única de Ubuntu.\n"
+#~ "\n"
+#~ "Para cambiar su clave:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Si no sabe nada acerca de esta solicitud, alguien más ha ingresado su "
+#~ "dirección de correo electrónico en el Servicio de Cuenta Única de Ubuntu. "
+#~ "Disculpe las molestias. No es necesario que realice ninguna otra acción, "
+#~ "simplemente elimine este mensaje.\n"
+#~ "\n"
+#~ "Atentamente,\n"
+#~ "\n"
+#~ "El equipo del Servicio de Cuenta Única de Ubuntu"
+
+#~ msgid ""
+#~ "We've received a request to create a new account with your email "
+#~ "address.\n"
+#~ "\n"
+#~ "If this was you, perhaps you've forgotten your password?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "If not, someone may be trying to impersonate you. If you get more "
+#~ "requests like this, please let us know.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Hemos recibido una solicitud para crear una nueva cuenta con su dirección "
+#~ "de correo electrónico.\n"
+#~ "\n"
+#~ "Si efectivamente realizó esta solicitud, quizás haya Usted olvidado su "
+#~ "clave?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "De lo contrario, quizas alguien esté intentando impersonarlo. Si recibe "
+#~ "más solicitudes como éstas, por favor, dejenos saberlo.\n"
+#~ "\n"
+#~ "Atentamente,\n"
+#~ "\n"
+#~ "El equipo del Servicio de Cuenta Única de Ubuntu"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "Thank you for registering with the Ubuntu Single Sign On service.\n"
+#~ "\n"
+#~ "To complete your registration:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone has probably entered "
+#~ "your email address by mistake at the Ubuntu Single Sign On service web "
+#~ "site. Sorry about that. You don't need to do anything further, just "
+#~ "delete this message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Hola\n"
+#~ "\n"
+#~ "Muchas gracias por registrarse con el Servicio de Cuenta Única de "
+#~ "Ubuntu.\n"
+#~ "\n"
+#~ "Para completar su registración:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Si no sabe de qué se trata esto, es posible que alguien haya utilizado su "
+#~ "dirección de correo electrónico por error en la página web del Servicio "
+#~ "de Cuenta Única de Ubuntu. Disculpe las molestias. No es necesario que "
+#~ "realice ningúna otra acción, simplemente elimine este mensaje.\n"
+#~ "\n"
+#~ "Atentamente,\n"
+#~ "\n"
+#~ "El equipo del Servicio de Cuenta Única de Ubuntu"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request from %(requester)s using email address %"
+#~ "(requester_email)s, trying to validate the email address %(toaddress)s "
+#~ "for use in the Ubuntu Single Sign On service.\n"
+#~ "\n"
+#~ "If you made this request, please click on the link below and complete the "
+#~ "process to add %(toaddress)s to your existing Ubuntu Single Sign On "
+#~ "service account.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "on\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Hola\n"
+#~ "\n"
+#~ "Hemos recibido una solicitud de %(requester)s utilizando la dirección de "
+#~ "correo electrónico %(requester_email)s, para validar la dirección de "
+#~ "correo electrónico %(toaddress)s para su uso en el Servicio de Cuenta "
+#~ "Única de Ubuntu.\n"
+#~ "\n"
+#~ "Si efectivamente realizó esta solicitud, por favor siga el vínculo a "
+#~ "continuación para completar el proceso para agregar %(toaddress)s a su "
+#~ "cuenta del Servicio de Cuenta Única de Ubuntu existente.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Si Usted no realizó dicha solicitud, por favor ignore este mensaje, o "
+#~ "reportelo en\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "como un potencial intento de un ataque a la seguridad de sus datos.\n"
+#~ "\n"
+#~ "Muchas gracias,\n"
+#~ "\n"
+#~ "El equipo del Servicio de Cuenta Única de Ubuntu"
+
+#~ msgid ""
 #~ "Password must be at least 8 characters long,\n"
 #~ "and must contain at least one number and an upper case letter."
 #~ msgstr ""

=== modified file 'po/django/he.po'
--- po/django/he.po	2010-05-18 20:09:48 +0000
+++ po/django/he.po	2010-06-01 11:36:30 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: canonical-identity-provider\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:50-0500\n"
+"POT-Creation-Date: 2010-05-31 09:05-0500\n"
 "PO-Revision-Date: 2010-04-15 12:00-0500\n"
 "Last-Translator: Danny Tamez <[e-mail]>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
@@ -393,7 +393,7 @@
 msgid "Not found"
 msgstr "לא נמצאו"
 
-#: templates/404.html:17 templates/500.html:23
+#: templates/404.html:17 templates/500.html:22
 #, python-format
 msgid "(Error <abbr>ID</abbr>: %(oopsid)s)"
 msgstr ""
@@ -403,9 +403,10 @@
 msgstr "אופס!"
 
 #: templates/500.html:19
+#, fuzzy
 msgid ""
-"We&#8217;ve recorded what happened,\n"
-"and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience."
+"We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as "
+"possible. Apologies for the inconvenience."
 msgstr ""
 ".יש לנו נרשם מה קרה\n"
 "ואנחנו נתקן את זה בהקדם האפשרי. אני מתנצל על אי הנוחות."
@@ -416,34 +417,36 @@
 msgstr ""
 
 #: templates/decide.html:22
-#, python-format
-msgid ""
-"If you proceed, the following information\n"
-"will be available to %(rpconfigname)s:"
-msgstr ""
-
-#: templates/decide.html:25
-msgid ""
-"If you proceed, the following information\n"
-"will be available to the website:"
-msgstr ""
-".אם תמשיך, את הפרטים הבאים\n"
-" יהיה זמין באתר האינטרנט"
-
-#: templates/decide.html:37
+#, fuzzy, python-format
+msgid ""
+"If you proceed, the following information will be available to %"
+"(rpconfigname)s:"
+msgstr ""
+".אם תמשיך, את הפרטים הבאים\n"
+" יהיה זמין באתר האינטרנט"
+
+#: templates/decide.html:24
+#, fuzzy
+msgid ""
+"If you proceed, the following information will be available to the website:"
+msgstr ""
+".אם תמשיך, את הפרטים הבאים\n"
+" יהיה זמין באתר האינטרנט"
+
+#: templates/decide.html:35
 msgid "Only your identity URL"
 msgstr "רק הזהות שלך כתובת"
 
-#: templates/decide.html:45
+#: templates/decide.html:43
 msgid "Yes, sign me in"
 msgstr "כן, סימן לי"
 
-#: templates/decide.html:46 templates/readonly.html:23
+#: templates/decide.html:44 templates/readonly.html:21
 #: templates/account/confirm_new_email.html:24
 #: templates/account/delete_email.html:23
 #: templates/account/edit-emails.html:46 templates/account/edit-emails.html:62
 #: templates/account/edit.html:138 templates/account/new_email.html:23
-#: templates/admin/readonly_confirm.html:73
+#: templates/admin/readonly_confirm.html:72
 #: templates/launchpad/registration/login.html:53
 #: templates/registration/confirm_new_account.html:44
 #: templates/registration/forgot_password.html:29
@@ -453,7 +456,7 @@
 msgid "or"
 msgstr "או"
 
-#: templates/decide.html:47 templates/account/confirm_new_email.html:25
+#: templates/decide.html:45 templates/account/confirm_new_email.html:25
 #: templates/account/delete_email.html:24
 #: templates/account/edit-emails.html:47 templates/account/edit-emails.html:63
 #: templates/account/new_email.html:24
@@ -473,13 +476,12 @@
 #: templates/invalid_identifier.html:10
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us\n"
-"for confirmation that %(identifier)s is your identity URL. However, that\n"
-"is not a valid OpenID identity URL for this site, such as\n"
-"<strong>%(root_url)s~USER</strong>."
+"A site identifying as %(trust_root)s has asked us for confirmation that %"
+"(identifier)s is your identity URL. However, that is not a valid OpenID "
+"identity URL for this site, such as <strong>%(root_url)s~USER</strong>."
 msgstr ""
 
-#: templates/invalid_identifier.html:17 templates/account/new_email.html:22
+#: templates/invalid_identifier.html:14 templates/account/new_email.html:22
 #: templates/launchpad/registration/login.html:52
 #: templates/registration/confirm_new_account.html:43
 #: templates/registration/email_sent.html:22
@@ -495,16 +497,17 @@
 msgstr "להגביל את שיעור חריגה"
 
 #: templates/limitexceeded.html:16
+#, fuzzy
 msgid ""
-"You have made too many failed requests to the SSO\n"
-"authentication server over a short period of time."
+"You have made too many failed requests to the SSO authentication server over "
+"a short period of time."
 msgstr "ביצעת בקשות נכשל מדי לשרת אימות SSO במשך זמן קצר"
 
-#: templates/limitexceeded.html:20 templates/readonly.html:21
+#: templates/limitexceeded.html:19 templates/readonly.html:19
 msgid "Please try again in a while."
 msgstr ".אנא נסה שוב בעוד זמן מה"
 
-#: templates/limitexceeded.html:22 templates/readonly.html:23
+#: templates/limitexceeded.html:21 templates/readonly.html:21
 msgid "Try again"
 msgstr "נסה שוב"
 
@@ -520,8 +523,8 @@
 #: templates/preauth_fail.html:11
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us for\n"
-"pre-authorization. However, that site is not approved for pre-authorization."
+"A site identifying as %(trust_root)s has asked us for pre-authorization. "
+"However, that site is not approved for pre-authorization."
 msgstr ""
 
 #: templates/readonly.html:8
@@ -533,16 +536,17 @@
 msgstr ".אנחנו כרגע במצב של קריאה בלבד"
 
 #: templates/readonly.html:16
+#, fuzzy
 msgid ""
-"Apologies, the page you're requesting isn't\n"
-"accessible at the moment, as we're running with a minimum set of features.\n"
-"Hopefully we will have the full service up and running again in no time."
+"Apologies, the page you're requesting isn't accessible at the moment, as "
+"we're running with a minimum set of features. Hopefully we will have the "
+"full service up and running again in no time."
 msgstr ""
 ".אני מתנצל, את הדף שאתה מבקש אינו נגיש כרגע, \n"
 "ככל שאנחנו רצים עם סט מינימלי של תכונות\n"
 ". אני מקווה שתהיה לנו את השירות המלא והפעלה שוב תוך זמן קצר"
 
-#: templates/readonly.html:24
+#: templates/readonly.html:22
 msgid "Go to our home page"
 msgstr "לדף הבית שלנו"
 
@@ -568,9 +572,10 @@
 msgstr "זהו שרת OpenID"
 
 #: templates/server_info.html:11
+#, fuzzy
 msgid ""
-"This page is meant to be called from an OpenID-enabled\n"
-"site and therefore has no user-facing functions."
+"This page is meant to be called from an OpenID-enabled site and therefore "
+"has no user-facing functions."
 msgstr ".מקור נועד להיקרא מאתר OpenID מאופשר ולכן אין למשתמש מול פונקציות"
 
 #: templates/untrusted.html:8
@@ -585,7 +590,7 @@
 "%(trust_root)s."
 msgstr ""
 
-#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:73
+#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:72
 msgid "Cancel"
 msgstr "לבטל"
 
@@ -604,7 +609,7 @@
 msgstr "האם אתה בטוח שאתה רוצה להסיר מאומתות דואר לכתובת מיי"
 
 #: templates/account/confirm_new_email.html:22
-#: templates/admin/readonly_confirm.html:72
+#: templates/admin/readonly_confirm.html:71
 msgid "Yes, I'm sure"
 msgstr ""
 
@@ -820,46 +825,45 @@
 #: templates/admin/readonly_confirm.html:42
 #, python-format
 msgid ""
-"You are about to enable readonly mode on appserver\n"
-"<b>%(appserver)s</b>."
+"You are about to enable readonly mode on appserver <b>%(appserver)s</b>."
+msgstr ""
+
+#: templates/admin/readonly_confirm.html:44
+msgid "You are about to enable readonly mode globally."
 msgstr ""
 
 #: templates/admin/readonly_confirm.html:45
-msgid "You are about to enable readonly mode globally."
-msgstr ""
-
-#: templates/admin/readonly_confirm.html:46
 msgid "All appservers will be passed to read-only mode if you confirm."
 msgstr ""
 
+#: templates/admin/readonly_confirm.html:50
+#, python-format
+msgid "You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
+msgstr ""
+
 #: templates/admin/readonly_confirm.html:51
 #, python-format
-msgid "You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
-msgstr ""
-
-#: templates/admin/readonly_confirm.html:52
-#, python-format
 msgid ""
 "If you confirm, <b>%(appserver)s</b> will attempt to resume normal operation "
 "with its master database connection."
 msgstr ""
 
+#: templates/admin/readonly_confirm.html:53
+msgid "You are about to clear readonly mode globally."
+msgstr ""
+
 #: templates/admin/readonly_confirm.html:54
-msgid "You are about to clear readonly mode globally."
-msgstr ""
-
-#: templates/admin/readonly_confirm.html:55
 msgid "If you confirm, all appservers will attempt to resume normal operation."
 msgstr ""
 
-#: templates/admin/readonly_confirm.html:59
+#: templates/admin/readonly_confirm.html:58
 #, python-format
 msgid ""
 "You are about to enable the <b>%(conn)s</b> database connection on appserver "
 "<b>%(appserver)s</b>."
 msgstr ""
 
-#: templates/admin/readonly_confirm.html:62
+#: templates/admin/readonly_confirm.html:61
 #, python-format
 msgid ""
 "You are about to disable the <b>%(conn)s</b> database connection on "
@@ -877,113 +881,6 @@
 "reminders."
 msgstr ""
 
-#: templates/launchpad/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Launchpad Login Service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Launchpad Login Service account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Launchpad Login Service. Sorry about that. You don't "
-"need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Launchpad Login Service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Launchpad Login Service web site. Sorry "
-"about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Launchpad Login Service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
 #: templates/launchpad/registration/login.html:18
 #, fuzzy
 msgid "Log in to Launchpad Login Service"
@@ -1083,8 +980,7 @@
 msgid ""
 "Your mail provider mistakenly blocks messages from this site. Try signing up "
 "using a service like <a href=\"http://gmail.com/\">Gmail</a> or <a href="
-"\"http://mail.yahoo.com/\">Yahoo Mail</a>. If that works, complain to your "
-"usual mail provider."
+"\"http://mail.yahoo.com/\">Yahoo Mail</a>."
 msgstr ""
 
 #: templates/registration/email_sent.html:35
@@ -1286,113 +1182,6 @@
 "a>."
 msgstr ""
 
-#: templates/ubuntu/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Ubuntu Single Sign On service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Ubuntu Single Sign On account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Ubuntu Single Sign On service. Sorry about that. You "
-"don't need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Ubuntu Single Sign On service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Ubuntu Single Sign On service web site. "
-"Sorry about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Ubuntu Single Sign On service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
 #: templates/ubuntu/registration/login.html:18
 #, fuzzy
 msgid "Log in to Ubuntu Single Sign On"
@@ -1489,8 +1278,8 @@
 msgid ""
 "It appears that our captcha service was unable to load on this page. This "
 "may be caused by a plugin on your browser. Please correct this and try "
-"again. If the problem persists, please contact\n"
-"<a href=\"https://forms.canonical.com/sso-support/\">Ubuntu SSO support</a>"
+"again. If the problem persists, please contact <a href=\"https://forms."
+"canonical.com/sso-support/\">Ubuntu SSO support</a>"
 msgstr ""
 "נראה כי השירות captcha שלנו לא היה מסוגל לטעון בדף זה. זו עלולה להיגרם על "
 "ידי תוסף על הדפדפן. אנא תקן זה ונסה שוב. אם הבעיה נמשכת, אנא צור קשר<a href="

=== modified file 'po/django/hu.po'
--- po/django/hu.po	2010-05-18 20:09:48 +0000
+++ po/django/hu.po	2010-06-01 11:36:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: canonical-identity-provider\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:49-0500\n"
+"POT-Creation-Date: 2010-05-31 09:05-0500\n"
 "PO-Revision-Date: 2010-04-13 12:01+0000\n"
 "Last-Translator: Szilveszter Farkas <[e-mail]>\n"
 "Language-Team: Hungarian <[e-mail]>\n"
@@ -388,7 +388,7 @@
 msgid "Not found"
 msgstr "Nincs találat"
 
-#: templates/404.html:17 templates/500.html:23
+#: templates/404.html:17 templates/500.html:22
 #, python-format
 msgid "(Error <abbr>ID</abbr>: %(oopsid)s)"
 msgstr ""
@@ -399,8 +399,8 @@
 
 #: templates/500.html:19
 msgid ""
-"We&#8217;ve recorded what happened,\n"
-"and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience."
+"We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as "
+"possible. Apologies for the inconvenience."
 msgstr ""
 
 #: templates/decide.html:8
@@ -411,30 +411,29 @@
 #: templates/decide.html:22
 #, python-format
 msgid ""
-"If you proceed, the following information\n"
-"will be available to %(rpconfigname)s:"
+"If you proceed, the following information will be available to %"
+"(rpconfigname)s:"
 msgstr ""
 
-#: templates/decide.html:25
+#: templates/decide.html:24
 msgid ""
-"If you proceed, the following information\n"
-"will be available to the website:"
+"If you proceed, the following information will be available to the website:"
 msgstr ""
 
-#: templates/decide.html:37
+#: templates/decide.html:35
 msgid "Only your identity URL"
 msgstr "Csak az azonosító URL"
 
-#: templates/decide.html:45
+#: templates/decide.html:43
 msgid "Yes, sign me in"
 msgstr "Igen, bejelentkezek"
 
-#: templates/decide.html:46 templates/readonly.html:23
+#: templates/decide.html:44 templates/readonly.html:21
 #: templates/account/confirm_new_email.html:24
 #: templates/account/delete_email.html:23
 #: templates/account/edit-emails.html:46 templates/account/edit-emails.html:62
 #: templates/account/edit.html:138 templates/account/new_email.html:23
-#: templates/admin/readonly_confirm.html:73
+#: templates/admin/readonly_confirm.html:72
 #: templates/launchpad/registration/login.html:53
 #: templates/registration/confirm_new_account.html:44
 #: templates/registration/forgot_password.html:29
@@ -444,7 +443,7 @@
 msgid "or"
 msgstr "vagy"
 
-#: templates/decide.html:47 templates/account/confirm_new_email.html:25
+#: templates/decide.html:45 templates/account/confirm_new_email.html:25
 #: templates/account/delete_email.html:24
 #: templates/account/edit-emails.html:47 templates/account/edit-emails.html:63
 #: templates/account/new_email.html:24
@@ -464,13 +463,12 @@
 #: templates/invalid_identifier.html:10
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us\n"
-"for confirmation that %(identifier)s is your identity URL. However, that\n"
-"is not a valid OpenID identity URL for this site, such as\n"
-"<strong>%(root_url)s~USER</strong>."
+"A site identifying as %(trust_root)s has asked us for confirmation that %"
+"(identifier)s is your identity URL. However, that is not a valid OpenID "
+"identity URL for this site, such as <strong>%(root_url)s~USER</strong>."
 msgstr ""
 
-#: templates/invalid_identifier.html:17 templates/account/new_email.html:22
+#: templates/invalid_identifier.html:14 templates/account/new_email.html:22
 #: templates/launchpad/registration/login.html:52
 #: templates/registration/confirm_new_account.html:43
 #: templates/registration/email_sent.html:22
@@ -487,15 +485,15 @@
 
 #: templates/limitexceeded.html:16
 msgid ""
-"You have made too many failed requests to the SSO\n"
-"authentication server over a short period of time."
+"You have made too many failed requests to the SSO authentication server over "
+"a short period of time."
 msgstr ""
 
-#: templates/limitexceeded.html:20 templates/readonly.html:21
+#: templates/limitexceeded.html:19 templates/readonly.html:19
 msgid "Please try again in a while."
 msgstr ""
 
-#: templates/limitexceeded.html:22 templates/readonly.html:23
+#: templates/limitexceeded.html:21 templates/readonly.html:21
 msgid "Try again"
 msgstr ""
 
@@ -511,8 +509,8 @@
 #: templates/preauth_fail.html:11
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us for\n"
-"pre-authorization. However, that site is not approved for pre-authorization."
+"A site identifying as %(trust_root)s has asked us for pre-authorization. "
+"However, that site is not approved for pre-authorization."
 msgstr ""
 
 #: templates/readonly.html:8
@@ -525,12 +523,12 @@
 
 #: templates/readonly.html:16
 msgid ""
-"Apologies, the page you're requesting isn't\n"
-"accessible at the moment, as we're running with a minimum set of features.\n"
-"Hopefully we will have the full service up and running again in no time."
+"Apologies, the page you're requesting isn't accessible at the moment, as "
+"we're running with a minimum set of features. Hopefully we will have the "
+"full service up and running again in no time."
 msgstr ""
 
-#: templates/readonly.html:24
+#: templates/readonly.html:22
 msgid "Go to our home page"
 msgstr ""
 
@@ -557,8 +555,8 @@
 
 #: templates/server_info.html:11
 msgid ""
-"This page is meant to be called from an OpenID-enabled\n"
-"site and therefore has no user-facing functions."
+"This page is meant to be called from an OpenID-enabled site and therefore "
+"has no user-facing functions."
 msgstr ""
 
 #: templates/untrusted.html:8
@@ -573,7 +571,7 @@
 "%(trust_root)s."
 msgstr ""
 
-#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:73
+#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:72
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -592,7 +590,7 @@
 msgstr ""
 
 #: templates/account/confirm_new_email.html:22
-#: templates/admin/readonly_confirm.html:72
+#: templates/admin/readonly_confirm.html:71
 msgid "Yes, I'm sure"
 msgstr ""
 
@@ -801,46 +799,45 @@
 #: templates/admin/readonly_confirm.html:42
 #, python-format
 msgid ""
-"You are about to enable readonly mode on appserver\n"
-"<b>%(appserver)s</b>."
+"You are about to enable readonly mode on appserver <b>%(appserver)s</b>."
+msgstr ""
+
+#: templates/admin/readonly_confirm.html:44
+msgid "You are about to enable readonly mode globally."
 msgstr ""
 
 #: templates/admin/readonly_confirm.html:45
-msgid "You are about to enable readonly mode globally."
-msgstr ""
-
-#: templates/admin/readonly_confirm.html:46
 msgid "All appservers will be passed to read-only mode if you confirm."
 msgstr ""
 
+#: templates/admin/readonly_confirm.html:50
+#, python-format
+msgid "You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
+msgstr ""
+
 #: templates/admin/readonly_confirm.html:51
 #, python-format
-msgid "You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
-msgstr ""
-
-#: templates/admin/readonly_confirm.html:52
-#, python-format
 msgid ""
 "If you confirm, <b>%(appserver)s</b> will attempt to resume normal operation "
 "with its master database connection."
 msgstr ""
 
+#: templates/admin/readonly_confirm.html:53
+msgid "You are about to clear readonly mode globally."
+msgstr ""
+
 #: templates/admin/readonly_confirm.html:54
-msgid "You are about to clear readonly mode globally."
-msgstr ""
-
-#: templates/admin/readonly_confirm.html:55
 msgid "If you confirm, all appservers will attempt to resume normal operation."
 msgstr ""
 
-#: templates/admin/readonly_confirm.html:59
+#: templates/admin/readonly_confirm.html:58
 #, python-format
 msgid ""
 "You are about to enable the <b>%(conn)s</b> database connection on appserver "
 "<b>%(appserver)s</b>."
 msgstr ""
 
-#: templates/admin/readonly_confirm.html:62
+#: templates/admin/readonly_confirm.html:61
 #, python-format
 msgid ""
 "You are about to disable the <b>%(conn)s</b> database connection on "
@@ -858,113 +855,6 @@
 "reminders."
 msgstr ""
 
-#: templates/launchpad/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Launchpad Login Service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Launchpad Login Service account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Launchpad Login Service. Sorry about that. You don't "
-"need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Launchpad Login Service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Launchpad Login Service web site. Sorry "
-"about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
-#: templates/launchpad/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Launchpad Login Service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-
 #: templates/launchpad/registration/login.html:18
 #, fuzzy
 msgid "Log in to Launchpad Login Service"
@@ -1061,8 +951,7 @@
 msgid ""
 "Your mail provider mistakenly blocks messages from this site. Try signing up "
 "using a service like <a href=\"http://gmail.com/\">Gmail</a> or <a href="
-"\"http://mail.yahoo.com/\">Yahoo Mail</a>. If that works, complain to your "
-"usual mail provider."
+"\"http://mail.yahoo.com/\">Yahoo Mail</a>."
 msgstr ""
 
 #: templates/registration/email_sent.html:35
@@ -1258,113 +1147,6 @@
 "a>."
 msgstr ""
 
-#: templates/ubuntu/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Ubuntu Single Sign On service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Ubuntu Single Sign On account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Ubuntu Single Sign On service. Sorry about that. You "
-"don't need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Ubuntu Single Sign On service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Ubuntu Single Sign On service web site. "
-"Sorry about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
-#: templates/ubuntu/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address %"
-"(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Ubuntu Single Sign On service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-
 #: templates/ubuntu/registration/login.html:18
 #, fuzzy
 msgid "Log in to Ubuntu Single Sign On"
@@ -1453,8 +1235,8 @@
 msgid ""
 "It appears that our captcha service was unable to load on this page. This "
 "may be caused by a plugin on your browser. Please correct this and try "
-"again. If the problem persists, please contact\n"
-"<a href=\"https://forms.canonical.com/sso-support/\">Ubuntu SSO support</a>"
+"again. If the problem persists, please contact <a href=\"https://forms."
+"canonical.com/sso-support/\">Ubuntu SSO support</a>"
 msgstr ""
 
 #: templates/widgets/trusted_rp.html:7

=== modified file 'po/django/pl.po'
--- po/django/pl.po	2010-05-19 13:21:09 +0000
+++ po/django/pl.po	2010-06-01 11:36:30 +0000
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: canonical-identity-provider\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-18 13:49-0500\n"
+"POT-Creation-Date: 2010-05-31 09:06-0500\n"
 "PO-Revision-Date: 2010-05-19 11:39+0000\n"
 "Last-Translator: Łukasz Czyżykowski <Unknown>\n"
 "Language-Team: Polish <[e-mail]>\n"
@@ -222,8 +222,7 @@
 
 #: utils.py:109
 #, python-format
-msgid ""
-"The email address %s can not be used to log in as it belongs to a team."
+msgid "The email address %s can not be used to log in as it belongs to a team."
 msgstr "Email %s nie może zostać użyty, ponieważ należy on do zespołu."
 
 #: utils.py:138 tests/test_utils.py:71
@@ -239,8 +238,8 @@
 msgid ""
 "Attempted to %(command)s while in read-only mode: '%(sql)s' %% (%(params)s)"
 msgstr ""
-"Próbowano wykonać %(command)s w trybie tylko do odczytu: '%(sql)s' %% "
-"(%(params)s)"
+"Próbowano wykonać %(command)s w trybie tylko do odczytu: '%(sql)s' %% (%"
+"(params)s)"
 
 #: management/commands/readonly.py:23
 msgid "List available application servers."
@@ -317,8 +316,8 @@
 #: middleware/csrf.py:26
 msgid ""
 "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\"><body><h1>403 "
-"Forbidden</h1><p>Cross Site Request Forgery detected. Request "
-"aborted.</p></body></html>"
+"Forbidden</h1><p>Cross Site Request Forgery detected. Request aborted.</p></"
+"body></html>"
 msgstr ""
 "<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\"><body><h1>403 "
 "Forbidden</h1><p>Wykryto próbę ataku z użyciem metody CSRF. Żądanie "
@@ -398,7 +397,7 @@
 msgid "Not found"
 msgstr "Nie znaleziono"
 
-#: templates/404.html:17 templates/500.html:23
+#: templates/404.html:17 templates/500.html:22
 #, python-format
 msgid "(Error <abbr>ID</abbr>: %(oopsid)s)"
 msgstr "(Identyfikator błędu: %(oopsid)s)"
@@ -409,10 +408,10 @@
 
 #: templates/500.html:19
 msgid ""
-"We&#8217;ve recorded what happened,\n"
-"and we&#8217;ll fix it as soon as possible. Apologies for the inconvenience."
+"We&#8217;ve recorded what happened, and we&#8217;ll fix it as soon as "
+"possible. Apologies for the inconvenience."
 msgstr ""
-"Dane o błędzie zostały zapisane.\n"
+"Dane o błędzie zostały zapisane. "
 "Możliwie najszybciej postaramy się go naprawić. Przepraszamy za zaistniajłą "
 "niedogodność."
 
@@ -424,34 +423,33 @@
 #: templates/decide.html:22
 #, python-format
 msgid ""
-"If you proceed, the following information\n"
-"will be available to %(rpconfigname)s:"
+"If you proceed, the following information will be available to %"
+"(rpconfigname)s:"
 msgstr ""
-"Jeżeli kontynuujesz następujące informacje zostaną\n"
+"Jeżeli kontynuujesz następujące informacje zostaną "
 "udostępnione do %(rpconfigname)s:"
 
-#: templates/decide.html:25
+#: templates/decide.html:24
 msgid ""
-"If you proceed, the following information\n"
-"will be available to the website:"
+"If you proceed, the following information will be available to the website:"
 msgstr ""
-"Jeśli kontynułujesz, następujące informacje\n"
+"Jeśli kontynułujesz, następujące informacje "
 "zostaną udostępnione stronie internetowej:"
 
-#: templates/decide.html:37
+#: templates/decide.html:35
 msgid "Only your identity URL"
 msgstr "Tylko twój URL tożsamości"
 
-#: templates/decide.html:45
+#: templates/decide.html:43
 msgid "Yes, sign me in"
 msgstr "Tak, zaloguj mnie"
 
-#: templates/decide.html:46 templates/readonly.html:23
+#: templates/decide.html:44 templates/readonly.html:21
 #: templates/account/confirm_new_email.html:24
 #: templates/account/delete_email.html:23
 #: templates/account/edit-emails.html:46 templates/account/edit-emails.html:62
 #: templates/account/edit.html:138 templates/account/new_email.html:23
-#: templates/admin/readonly_confirm.html:73
+#: templates/admin/readonly_confirm.html:72
 #: templates/launchpad/registration/login.html:53
 #: templates/registration/confirm_new_account.html:44
 #: templates/registration/forgot_password.html:29
@@ -461,7 +459,7 @@
 msgid "or"
 msgstr "lub"
 
-#: templates/decide.html:47 templates/account/confirm_new_email.html:25
+#: templates/decide.html:45 templates/account/confirm_new_email.html:25
 #: templates/account/delete_email.html:24
 #: templates/account/edit-emails.html:47 templates/account/edit-emails.html:63
 #: templates/account/new_email.html:24
@@ -481,18 +479,17 @@
 #: templates/invalid_identifier.html:10
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us\n"
-"for confirmation that %(identifier)s is your identity URL. However, that\n"
-"is not a valid OpenID identity URL for this site, such as\n"
-"<strong>%(root_url)s~USER</strong>."
+"A site identifying as %(trust_root)s has asked us for confirmation that %"
+"(identifier)s is your identity URL. However, that is not a valid OpenID "
+"identity URL for this site, such as <strong>%(root_url)s~USER</strong>."
 msgstr ""
-"Serwis %(trust_root)s poprosił o\n"
+"Serwis %(trust_root)s poprosił o "
 "potwierdzenie, że %(identifier)s jest Twoim identyfikatorem. Jednakże to nie "
-"jest prawidłowy\n"
-"identyfikator OpenID dla tej strony, powinien on być następującej postaci:\n"
+"jest prawidłowy "
+"identyfikator OpenID dla tej strony, powinien on być następującej postaci: "
 "<strong>%(root_url)s~UŻYTKOWNIK</strong>."
 
-#: templates/invalid_identifier.html:17 templates/account/new_email.html:22
+#: templates/invalid_identifier.html:14 templates/account/new_email.html:22
 #: templates/launchpad/registration/login.html:52
 #: templates/registration/confirm_new_account.html:43
 #: templates/registration/email_sent.html:22
@@ -509,17 +506,17 @@
 
 #: templates/limitexceeded.html:16
 msgid ""
-"You have made too many failed requests to the SSO\n"
-"authentication server over a short period of time."
+"You have made too many failed requests to the SSO authentication server over "
+"a short period of time."
 msgstr ""
-"Za dużo nieudanych prób autoryzacji do serwera w\n"
+"Za dużo nieudanych prób autoryzacji do serwera w "
 "bardzo krótkim czasie"
 
-#: templates/limitexceeded.html:20 templates/readonly.html:21
+#: templates/limitexceeded.html:19 templates/readonly.html:19
 msgid "Please try again in a while."
 msgstr "Proszę spróbować trochę później."
 
-#: templates/limitexceeded.html:22 templates/readonly.html:23
+#: templates/limitexceeded.html:21 templates/readonly.html:21
 msgid "Try again"
 msgstr "Spróbuj ponownie"
 
@@ -535,10 +532,10 @@
 #: templates/preauth_fail.html:11
 #, python-format
 msgid ""
-"A site identifying as %(trust_root)s has asked us for\n"
-"pre-authorization. However, that site is not approved for pre-authorization."
+"A site identifying as %(trust_root)s has asked us for pre-authorization. "
+"However, that site is not approved for pre-authorization."
 msgstr ""
-"Strona identyfikująca się jako %(trust_root)s poprosiła o\n"
+"Strona identyfikująca się jako %(trust_root)s poprosiła o "
 "pre-autoryzację, ale pre-autoryzacja nie została uaktywniona dla niej."
 
 #: templates/readonly.html:8
@@ -551,15 +548,15 @@
 
 #: templates/readonly.html:16
 msgid ""
-"Apologies, the page you're requesting isn't\n"
-"accessible at the moment, as we're running with a minimum set of features.\n"
-"Hopefully we will have the full service up and running again in no time."
+"Apologies, the page you're requesting isn't accessible at the moment, as "
+"we're running with a minimum set of features. Hopefully we will have the "
+"full service up and running again in no time."
 msgstr ""
-"Przepraszamy, ale strona którą chcesz obejrzeć jest aktualnie niedostępna,\n"
-"ponieważ aktualnie działamy z minimalną funkcjalnością.\n"
+"Przepraszamy, ale strona którą chcesz obejrzeć jest aktualnie niedostępna, "
+"ponieważ aktualnie działamy z minimalną funkcjalnością. "
 "Mamy nadzieję, że bardzo szybko przywrócimy pełne działanie usługi."
 
-#: templates/readonly.html:24
+#: templates/readonly.html:22
 msgid "Go to our home page"
 msgstr "Udaj się na stronę główną"
 
@@ -575,14 +572,14 @@
 #: templates/select_language.html:26
 msgid ""
 "We welcome volunteers to help us translate this site to new languages. If "
-"you are able to help, please visit our <a "
-"href=\"https://translations.launchpad.net/canonical-identity-"
-"provider\">translations site</a> to get started."
+"you are able to help, please visit our <a href=\"https://translations."
+"launchpad.net/canonical-identity-provider\">translations site</a> to get "
+"started."
 msgstr ""
 "Z chęcią przyjmiemy ochotników chcących pomóc nam przetłumaczyć ten serwis "
-"na nowe języki. Jeżeli jesteś w stanie pomóc, zacznij od odwiedzenia <a "
-"href=\"https://translations.launchpad.net/canonical-identity-"
-"provider\">naszej strony tłumaczeń</a>."
+"na nowe języki. Jeżeli jesteś w stanie pomóc, zacznij od odwiedzenia <a href="
+"\"https://translations.launchpad.net/canonical-identity-provider\">naszej "
+"strony tłumaczeń</a>."
 
 #: templates/server_info.html:7
 msgid "This is an OpenID server"
@@ -590,11 +587,11 @@
 
 #: templates/server_info.html:11
 msgid ""
-"This page is meant to be called from an OpenID-enabled\n"
-"site and therefore has no user-facing functions."
+"This page is meant to be called from an OpenID-enabled site and therefore "
+"has no user-facing functions."
 msgstr ""
 "Ta strona jest przeznaczona do wywoływania przez serwisy korzystające z "
-"OpenID\n"
+"OpenID "
 "i dlatego nie posiada żadnych elementów przeznaczonych dla użytkowników."
 
 #: templates/untrusted.html:8
@@ -611,7 +608,7 @@
 "Przepraszamy, ale aktualnie nie akceptujemy żądań z\n"
 "%(trust_root)s."
 
-#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:73
+#: templates/untrusted.html:18 templates/admin/readonly_confirm.html:72
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -629,7 +626,7 @@
 msgstr "Na pewno chcesz potwierdzić i zweryfikować ten adres email?"
 
 #: templates/account/confirm_new_email.html:22
-#: templates/admin/readonly_confirm.html:72
+#: templates/admin/readonly_confirm.html:71
 msgid "Yes, I'm sure"
 msgstr "Tak, jestem pewien."
 
@@ -844,54 +841,51 @@
 #: templates/admin/readonly_confirm.html:42
 #, python-format
 msgid ""
-"You are about to enable readonly mode on appserver\n"
-"<b>%(appserver)s</b>."
+"You are about to enable readonly mode on appserver <b>%(appserver)s</b>."
 msgstr ""
-"Jesteś w trakcie włączania trybu tylko do odczytu na serwerze aplikacji "
-"<b>%(appserver)s</b>."
+"Jesteś w trakcie włączania trybu tylko do odczytu na serwerze aplikacji <b>%"
+"(appserver)s</b>."
 
-#: templates/admin/readonly_confirm.html:45
+#: templates/admin/readonly_confirm.html:44
 msgid "You are about to enable readonly mode globally."
 msgstr ""
 "Jesteś w trakcie włączania trybu tylko do odczytu na wszystkich serwerach."
 
-#: templates/admin/readonly_confirm.html:46
+#: templates/admin/readonly_confirm.html:45
 msgid "All appservers will be passed to read-only mode if you confirm."
 msgstr ""
 "Jeśli potwierdzisz wszystkie serwery aplikacji zostaną przełączone w tryb "
 "tylko do odczytu."
 
+#: templates/admin/readonly_confirm.html:50
+#, python-format
+msgid "You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
+msgstr ""
+"Jesteś w trakcie wyłączania trybu tylko do odczytu na serwerze aplikacji <b>%"
+"(appserver)s</b>."
+
 #: templates/admin/readonly_confirm.html:51
 #, python-format
 msgid ""
-"You are about to clear readonly mode on appserver <b>%(appserver)s</b>."
-msgstr ""
-"Jesteś w trakcie wyłączania trybu tylko do odczytu na serwerze aplikacji "
-"<b>%(appserver)s</b>."
-
-#: templates/admin/readonly_confirm.html:52
-#, python-format
-msgid ""
 "If you confirm, <b>%(appserver)s</b> will attempt to resume normal operation "
 "with its master database connection."
 msgstr ""
 "Jeśli potwierdzisz, <b>%(appserver)s</b> spróbuje przywrócić normalne "
 "działanie korzystając z głównego połączenia z bazą."
 
-#: templates/admin/readonly_confirm.html:54
+#: templates/admin/readonly_confirm.html:53
 msgid "You are about to clear readonly mode globally."
 msgstr ""
 "Jesteś w trakcie wyłączania trybu tylko do odczytu na wszystkich serwerach "
 "aplikacji."
 
-#: templates/admin/readonly_confirm.html:55
-msgid ""
-"If you confirm, all appservers will attempt to resume normal operation."
+#: templates/admin/readonly_confirm.html:54
+msgid "If you confirm, all appservers will attempt to resume normal operation."
 msgstr ""
 "Jeśli potwierdzisz, wszystkie serwery aplikacji spróbują przywrócić normalne "
 "działanie."
 
-#: templates/admin/readonly_confirm.html:59
+#: templates/admin/readonly_confirm.html:58
 #, python-format
 msgid ""
 "You are about to enable the <b>%(conn)s</b> database connection on appserver "
@@ -900,7 +894,7 @@
 "Jesteś w trakcie uaktywniania <b>%(conn)s</b> połączenia z bazą danych na "
 "serwerze aplikacji <b>%(appserver)s</b>."
 
-#: templates/admin/readonly_confirm.html:62
+#: templates/admin/readonly_confirm.html:61
 #, python-format
 msgid ""
 "You are about to disable the <b>%(conn)s</b> database connection on "
@@ -922,203 +916,13 @@
 "Serwis aktualnie działa w trybie tylko do odczytu. Oznacza to, że nie można "
 "tworzyć nowych kont"
 
-#: templates/launchpad/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Launchpad Login Service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Cześć,\n"
-"\n"
-"Otrzymaliśmy prośbę weryfikacji adresu email %(toaddress)s w serwisie "
-"logowania Launchpad.\n"
-"\n"
-"Jeżeli prośba pochodzi od Ciebie, proszę skopiuj i wklej poniższy ciąg "
-"znaków do aplikacji w celu dokończenia procesu dodawania %(toaddress)s do "
-"Twojego istniejącego konta w serwisie logowania Launchpad.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"Jeżeli prośba nie pochodzi od Ciebie, zignoruj tą wiadomość lub zgłoś jako "
-"możliwa próba naruszenia bezpieczeństwa Twoich danych.\n"
-"\n"
-"Dziękujemy,\n"
-"\n"
-"Zespół serwisu logowania Launchpad"
-
-#: templates/launchpad/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Launchpad Login Service account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Launchpad Login Service. Sorry about that. You don't "
-"need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Cześć,\n"
-"\n"
-"Wysłałeś prośbę utworzenia nowego hasła do konta w serwisie logowania "
-"Launchpad.\n"
-"\n"
-"Aby zmienić hasło kliknij:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Jeżeli nic Ci o tym nie wiadomo to oznacza, że ktoś inny wprowadził Twój "
-"adres email w serwisie logowania Launchpad. Przepraszamy za zaistniałą "
-"sytuację. W takim wypadku nie musisz nic więcej robić i możesz po prostu "
-"usunąć tą wiadomość\n"
-"\n"
-"Z wyrazami szacunku,\n"
-"\n"
-"Zespół serwisu logowania Launchpad"
-
-#: templates/launchpad/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Otrzymaliśmy prośbę utworzenia nowego konta związanego z tym adresem email.\n"
-"\n"
-"Jeżeli prośba pochodziła od Ciebie, może chodzi o zapomniane hasło?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"Jeżeli nie, ktoś inny próbował się podszyć za Ciebie. Jeżeli nadejdzie "
-"więcej takich wiadomości, prosimy, daj nam znać.\n"
-"\n"
-"Z wyrazami szacunku,\n"
-"\n"
-"Zespół serwisu logowania Launchpad"
-
-#: templates/launchpad/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Launchpad Login Service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Launchpad Login Service web site. Sorry "
-"about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Cześć,\n"
-"\n"
-"Dziękujemy za rejestrację w serwisie logowania Launchpad.\n"
-"\n"
-"Aby zakończyć rejestrację kliknij:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Jeżeli nie wiesz o co chodzi to prawdopodobnie ktoś przez pomyłkę wprowadził "
-"Twój adres email na stronie serwisu logowania Launchpad. Przepraszamy za to. "
-"Nie musisz nic więcej robić, po prostu usuń tą wiadomość.\n"
-"\n"
-"Z wyrazami szacunku,\n"
-"\n"
-"Zespół serwisu logowania Launchpad"
-
-#: templates/launchpad/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address "
-"%(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Launchpad Login Service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Launchpad Login Service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Launchpad Login Service team"
-msgstr ""
-"Cześć\n"
-"\n"
-"Otrzymaliśmy prośbę od %(requester)s (%(requester_email)s), w celu "
-"weryfikacji adresu email %(toaddress)s w serwisie logowania Launchpad.\n"
-"\n"
-"Jeżeli prośba pochodzi od Ciebie, kliknij na poniższy link i zakończ proces "
-"dodawania adresu %(toaddress)s do Twojego konta w serwisie logowania "
-"Launchpad.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Zignoruj tą wiadomość, jeżeli prośba ta nie pochodzi od Ciebie. "
-"Alternatywnie możesz zgłosić ten fakt pod adresem:\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"jako możliwa próba ataku na bezpieczeństwo Twoich danych.\n"
-"\n"
-"Dziękujemy,\n"
-"\n"
-"Zespół serwisu logowania Launchpad"
-
 #: templates/launchpad/registration/login.html:18
 msgid "Log in to Launchpad Login Service"
 msgstr "Zaloguj się w serwisie logowania Launchpad"
 
 #: templates/launchpad/registration/login.html:24
 #, python-format
-msgid ""
-"You are here because %(rpconfigname)s uses the Launchpad Login Service."
+msgid "You are here because %(rpconfigname)s uses the Launchpad Login Service."
 msgstr ""
 "Znajdujesz się tutaj ponieważ %(rpconfigname)s korzysta z serwisu logowania "
 "Launchpad."
@@ -1155,20 +959,20 @@
 
 #: templates/launchpad/registration/login.html:70
 msgid ""
-"This is the Launchpad login service utilizing <a "
-"href=\"http://openid.net/\">OpenID</a> technology. This site allows you to "
-"use <a href=\"https://launchpad.net/people/+me\">your Launchpad account</a> "
-"to log into OpenID-enabled sites around the Internet."
+"This is the Launchpad login service utilizing <a href=\"http://openid.net/"
+"\">OpenID</a> technology. This site allows you to use <a href=\"https://"
+"launchpad.net/people/+me\">your Launchpad account</a> to log into OpenID-"
+"enabled sites around the Internet."
 msgstr ""
-"To jest serwer logowania Launchpad używający technologi <a href=\\"
-"\"http://openid.net/\\\">OpenID</a>. Ta strona umożliwia używania <a href=\\"
-"\"https://launchpad.net/people/+me\\\">Twojego konta Launchpad</a> do "
-"logowania się do stron korzystających z technologi OpenID."
+"To jest serwer logowania Launchpad używający technologi <a href=\\\"http://"
+"openid.net/\\\">OpenID</a>. Ta strona umożliwia używania <a href=\\\"https://"
+"launchpad.net/people/+me\\\">Twojego konta Launchpad</a> do logowania się do "
+"stron korzystających z technologi OpenID."
 
 #: templates/launchpad/registration/login.html:73
 msgid ""
-"To learn more about using this service, please review the <a "
-"href=\"https://help.launchpad.net/OpenID\">instructions</a>."
+"To learn more about using this service, please review the <a href=\"https://"
+"help.launchpad.net/OpenID\">instructions</a>."
 msgstr ""
 "Aby dowiedzieć się więcej o używaniu tej usługi, proszę przeczytaj <a href=\\"
 "\"https://help.launchpad.net/OpenID\\\">instrukcję</a>."
@@ -1221,22 +1025,20 @@
 "Your mail provider uses &ldquo;greylisting&rdquo; to reduce spam. If so, "
 "you&rsquo;ll need to wait an hour or two for the message to arrive."
 msgstr ""
-"Twój dostawca email używa <a href=\\"
-"\"http://pl.wikipedia.org/wiki/Greylisting\\\">greylisting</a> aby "
-"ograniczyć ilość spamu. Jeżeli tak, to trzeba będzie poczekać od godziny do "
-"dwóch na dotarcie wiadomości."
+"Twój dostawca email używa <a href=\\\"http://pl.wikipedia.org/wiki/"
+"Greylisting\\\">greylisting</a> aby ograniczyć ilość spamu. Jeżeli tak, to "
+"trzeba będzie poczekać od godziny do dwóch na dotarcie wiadomości."
 
 #: templates/registration/email_sent.html:30
 msgid ""
 "Your mail provider mistakenly blocks messages from this site. Try signing up "
-"using a service like <a href=\"http://gmail.com/\">Gmail</a> or <a "
-"href=\"http://mail.yahoo.com/\">Yahoo Mail</a>. If that works, complain to "
-"your usual mail provider."
+"using a service like <a href=\"http://gmail.com/\">Gmail</a> or <a href="
+"\"http://mail.yahoo.com/\">Yahoo Mail</a>."
 msgstr ""
 "Twój dostawca email błędnie blokuje wiadomości z tej strony. Spróbuj użyć "
 "adresu email z usług takich jak <a href=\\\"http://gmail.com/\\\">Gmail</a> "
-"lub <a href=\\\"http://mail.yahoo.com/\\\">Yahoo Mail</a>. Jeżeli to "
-"zadziała, poskarż się Twojemu dostawcy."
+"lub <a href=\\\"http://mail.yahoo.com/\\\">Yahoo Mail</a>."
+
 
 #: templates/registration/email_sent.html:35
 msgid "If neither of those work, our service might be having a problem."
@@ -1373,9 +1175,9 @@
 "more questions, please <a href=\"https://answers.launchpad.net/canonical-"
 "identity-provider\">submit them on Launchpad</a> and we'll do our\n"
 "best to respond to them. We also have an email support channel - you\n"
-"can submit your support requests using our support form at <a "
-"href=\"https://forms.canonical.com/sso-"
-"support/\">https://forms.canonical.com/sso-support</a>. If\n"
+"can submit your support requests using our support form at <a href=\"https://"
+"forms.canonical.com/sso-support/\">https://forms.canonical.com/sso-support</"
+"a>. If\n"
 "you have found a bug, please take a few minutes to tell us about it on our "
 "<a href=\"https://bugs.launchpad.net/canonical-identity-provider\">Launchpad "
 "project</a>."
@@ -1386,11 +1188,10 @@
 "identity-provider\"> o zadawanie je w serwisie Launchpad</a> a my zrobimy co "
 "w naszej mocy aby na nie odpowiedzieć. Posiadamy również pomoc przez email - "
 "możesz wysłać pytania używając naszego formularza wsparcia znajdującego się "
-"pod adresem <a href=\"https://forms.canonical.com/sso-"
-"support/\">https://forms.canonical.com/sso-support</a>. W przypadku "
-"znalezienia błędu, prosimy o poświęcenie chwili aby go zgłosić na <a "
-"href=\"https://bugs.launchpad.net/canonical-identity-provider\">stronie "
-"projektu</a> w serwisie Launchpad."
+"pod adresem <a href=\"https://forms.canonical.com/sso-support/\">https://"
+"forms.canonical.com/sso-support</a>. W przypadku znalezienia błędu, prosimy "
+"o poświęcenie chwili aby go zgłosić na <a href=\"https://bugs.launchpad.net/"
+"canonical-identity-provider\">stronie projektu</a> w serwisie Launchpad."
 
 #: templates/static/faq.html:7
 msgid "FAQ - Ubuntu Single Sign On"
@@ -1449,16 +1250,15 @@
 #: templates/static/faq.html:36
 msgid ""
 "Yes, and it's also built and hosted on open source\n"
-"technologies (<a href=\"http://www.python.org/\">Python</a>, <a "
-"href=\"http://www.djangoproject.com/\">Django</a>, <a "
-"href=\"http://httpd.apache.org/\">Apache</a> and <a "
-"href=\"http://www.postgresql.org/\">PostgreSQL</a> amongst others)."
+"technologies (<a href=\"http://www.python.org/\">Python</a>, <a href="
+"\"http://www.djangoproject.com/\">Django</a>, <a href=\"http://httpd.apache."
+"org/\">Apache</a> and <a href=\"http://www.postgresql.org/\">PostgreSQL</a> "
+"amongst others)."
 msgstr ""
 "Tak, jest zbudowany i hostowany w oparciu o technologie otwartego kodu "
-"(między innymi <a href=\"http://www.python.org/\">Python</a>, <a "
-"href=\"http://www.djangoproject.com/\">Django</a>, <a "
-"href=\"http://httpd.apache.org/\">Apache</a> i <a "
-"href=\"http://www.postgresql.org/\">PostgreSQL</a>)."
+"(między innymi <a href=\"http://www.python.org/\">Python</a>, <a href="
+"\"http://www.djangoproject.com/\">Django</a>, <a href=\"http://httpd.apache."
+"org/\">Apache</a> i <a href=\"http://www.postgresql.org/\">PostgreSQL</a>)."
 
 #: templates/static/faq.html:40
 msgid "I have a problem with the new service. Where can I get help?"
@@ -1467,239 +1267,49 @@
 #: templates/static/faq.html:43
 msgid ""
 "We have an email support channel. You can submit your support requests\n"
-"using our support form at <a href=\"https://forms.canonical.com/sso-"
-"support/\">https://forms.canonical.com/sso-support</a>. If you have found a "
-"bug, please take a\n"
+"using our support form at <a href=\"https://forms.canonical.com/sso-support/"
+"\">https://forms.canonical.com/sso-support</a>. If you have found a bug, "
+"please take a\n"
 "few minutes to tell us about it at\n"
-"<a href=\"https://bugs.launchpad.net/canonical-identity-"
-"provider\">https://bugs.launchpad.net/canonical-identity-provider</a>."
+"<a href=\"https://bugs.launchpad.net/canonical-identity-provider\">https://"
+"bugs.launchpad.net/canonical-identity-provider</a>."
 msgstr ""
 "Posiadamy pomoc za pomocą email. Możesz wysłać pytanie za pomocą naszego\n"
-"formularza znajdującego się pod adresem <a "
-"href=\"https://forms.canonical.com/sso-"
-"support/\">https://forms.canonical.com/sso-support</a>. W przypadku "
+"formularza znajdującego się pod adresem <a href=\"https://forms.canonical."
+"com/sso-support/\">https://forms.canonical.com/sso-support</a>. W przypadku "
 "znalezienia błędu, prosimy o poświęcenie chwili aby go zgłosić pod adresem "
-"<a href=\"https://bugs.launchpad.net/canonical-identity-"
-"provider\">https://bugs.launchpad.net/canonical-identity-provider</a>."
+"<a href=\"https://bugs.launchpad.net/canonical-identity-provider\">https://"
+"bugs.launchpad.net/canonical-identity-provider</a>."
 
 #: templates/static/faq.html:50
 msgid ""
 "We're sure you have more questions. Please submit them at\n"
-"<a href=\"https://answers.launchpad.net/canonical-identity-"
-"provider\">https://answers.launchpad.net/canonical-identity-provider</a> and "
-"we'll do\n"
+"<a href=\"https://answers.launchpad.net/canonical-identity-provider"
+"\">https://answers.launchpad.net/canonical-identity-provider</a> and we'll "
+"do\n"
 "our best to respond to them all."
 msgstr ""
 "Mamy pewność, że masz więcej pytań. Prosimy o ich zadawanie pod adresem\n"
-"<a href=\"https://answers.launchpad.net/canonical-identity-"
-"provider\">https://answers.launchpad.net/canonical-identity-provider</a> a "
-"my zrobimy\n"
+"<a href=\"https://answers.launchpad.net/canonical-identity-provider"
+"\">https://answers.launchpad.net/canonical-identity-provider</a> a my "
+"zrobimy\n"
 "wszystko co w naszej mocy aby na nie zareagować."
 
 #: templates/ubuntu/base.html:56
 msgid ""
 "&copy; 2009-2010 Canonical Ltd.<br />\n"
-"Ubuntu and Canonical are registered trademarks of Canonical Group Ltd.<br "
-"/>\n"
+"Ubuntu and Canonical are registered trademarks of Canonical Group Ltd.<br /"
+">\n"
 "Please review our <a href=\"http://ubuntu.com/legal\">Terms of Service</a> "
-"as well as our <a href=\"http://ubuntu.com/legal#privacy\">Privacy "
-"Policy</a>."
+"as well as our <a href=\"http://ubuntu.com/legal#privacy\">Privacy Policy</"
+"a>."
 msgstr ""
 "&copy; 2009-2010 Canonical Ltd.<br />\n"
-"Ubuntu i Canonical są zastrzeżonymi znakami handlowymi Canonical Group "
-"Lt.<br />\n"
+"Ubuntu i Canonical są zastrzeżonymi znakami handlowymi Canonical Group Lt."
+"<br />\n"
 "Zapoznaj się z naszymi <a href=\"http://ubuntu.com/legal\">Warunkami "
-"Korzystania z Serwisu</a> oraz <a "
-"href=\"http://ubuntu.com/legal#privacy\">Polityką Prywatności</a>."
-
-#: templates/ubuntu/email/email-validation-token.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request to validate the email address %(toaddress)s for use in "
-"the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please copy and paste the token below into the "
-"desktop application to complete the process to add %(toaddress)s to your "
-"existing Ubuntu Single Sign On service account.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it as "
-"a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Cześć,\n"
-"\n"
-"Otrzymaliśmy prośbę weryfikacji adresu email %(toaddress)s w serwisie Ubuntu "
-"Single Sign On.\n"
-"\n"
-"Jeżeli prośba pochodzi od Ciebie, proszę skopiuj i wklej poniższy ciąg "
-"znaków do aplikacji w celu dokończenia procesu dodawania %(toaddress)s do "
-"Twojego istniejącego konta w serwisie Ubuntu Single Sign On.\n"
-"\n"
-"    %(token)s\n"
-"\n"
-"Jeżeli prośba nie pochodzi od Ciebie, zignoruj tą wiadomość lub zgłoś jako "
-"możliwa próba naruszenia bezpieczeństwa Twoich danych.\n"
-"\n"
-"Dziękujemy,\n"
-"\n"
-"Zespół serwisu Ubuntu Single Sign On"
-
-#: templates/ubuntu/email/forgottenpassword.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"You have requested a new password for your Ubuntu Single Sign On account.\n"
-"\n"
-"To change your password:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone else has entered your "
-"email address at the Ubuntu Single Sign On service. Sorry about that. You "
-"don't need to do anything further, just delete this message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Cześć,\n"
-"\n"
-"Wysłałeś prośbę utworzenia nowego hasła do konta w serwisie Ubuntu Single "
-"Sign On.\n"
-"\n"
-"Aby zmienić hasło kliknij:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Jeżeli nic Ci o tym nie wiadomo to oznacza, że ktoś inny wprowadził Twój "
-"adres email w serwisie Ubuntu Single Sign On. Przepraszamy za zaistniałą "
-"sytuację. W takim wypadku nie musisz nic więcej robić i możesz po prostu "
-"usunąć tą wiadomość\n"
-"\n"
-"Z wyrazami szacunku,\n"
-"\n"
-"Zespół serwisu Ubuntu Single Sign On"
-
-#: templates/ubuntu/email/impersonate-warning.txt:2
-#, python-format
-msgid ""
-"We've received a request to create a new account with your email address.\n"
-"\n"
-"If this was you, perhaps you've forgotten your password?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"If not, someone may be trying to impersonate you. If you get more requests "
-"like this, please let us know.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Otrzymaliśmy prośbę utworzenia nowego konta związanego z tym adresem email.\n"
-"\n"
-"Jeżeli prośba pochodziła od Ciebie, może chodzi o zapomniane hasło?\n"
-"\n"
-"    %(forgotten_password_url)s\n"
-"\n"
-"Jeżeli nie, ktoś inny próbował się podszyć za Ciebie. Jeżeli nadejdzie "
-"więcej takich wiadomości, prosimy, daj nam znać.\n"
-"\n"
-"Z wyrazami szacunku,\n"
-"\n"
-"Zespół serwisu Ubuntu Single Sign On"
-
-#: templates/ubuntu/email/newuser.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"Thank you for registering with the Ubuntu Single Sign On service.\n"
-"\n"
-"To complete your registration:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you don't know what this is about, then someone has probably entered your "
-"email address by mistake at the Ubuntu Single Sign On service web site. "
-"Sorry about that. You don't need to do anything further, just delete this "
-"message.\n"
-"\n"
-"Regards,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Cześć,\n"
-"\n"
-"Dziękujemy za rejestrację w serwisie Ubuntu Single Sign On.\n"
-"\n"
-"Aby zakończyć rejestrację kliknij:\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Jeżeli nie wiesz o co chodzi to prawdopodobnie ktoś przez pomyłkę wprowadził "
-"Twój adres email na stronie serwisu Ubuntu Single Sign On. Przepraszamy za "
-"to. Nie musisz nic więcej robić, po prostu usuń tą wiadomość.\n"
-"\n"
-"Z wyrazami szacunku,\n"
-"\n"
-"Zespół serwisu Ubuntu Single Sign On"
-
-#: templates/ubuntu/email/validate-email.txt:2
-#, python-format
-msgid ""
-"Hello\n"
-"\n"
-"We received a request from %(requester)s using email address "
-"%(requester_email)s, trying to validate the email address %(toaddress)s for "
-"use in the Ubuntu Single Sign On service.\n"
-"\n"
-"If you made this request, please click on the link below and complete the "
-"process to add %(toaddress)s to your existing Ubuntu Single Sign On service "
-"account.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"If you did not make this request, please ignore this message or report it "
-"on\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"as a possible attempt at a security attack on your data.\n"
-"\n"
-"Thank you,\n"
-"\n"
-"The Ubuntu Single Sign On team"
-msgstr ""
-"Cześć\n"
-"\n"
-"Otrzymaliśmy prośbę od %(requester)s (%(requester_email)s), w celu "
-"weryfikacji adresu email %(toaddress)s w serwisie Ubuntu Single Sign On.\n"
-"\n"
-"Jeżeli prośba pochodzi od Ciebie, kliknij na poniższy link i zakończ proces "
-"dodawania adresu %(toaddress)s do Twojego konta w serwisie Ubuntu Single "
-"Sign On.\n"
-"\n"
-"    %(token_url)s\n"
-"\n"
-"Zignoruj tą wiadomość, jeżeli prośba ta nie pochodzi od Ciebie. "
-"Alternatywnie możesz zgłosić ten fakt pod adresem:\n"
-"\n"
-"    %(support_form_url)s\n"
-"\n"
-"jako możliwa próba ataku na bezpieczeństwo Twoich danych.\n"
-"\n"
-"Dziękujemy,\n"
-"\n"
-"Zespół serwisu Ubuntu Single Sign On"
+"Korzystania z Serwisu</a> oraz <a href=\"http://ubuntu.com/legal#privacy"
+"\">Polityką Prywatności</a>."
 
 #: templates/ubuntu/registration/login.html:18
 msgid "Log in to Ubuntu Single Sign On"
@@ -1793,14 +1403,14 @@
 msgid ""
 "It appears that our captcha service was unable to load on this page. This "
 "may be caused by a plugin on your browser. Please correct this and try "
-"again. If the problem persists, please contact\n"
-"<a href=\"https://forms.canonical.com/sso-support/\">Ubuntu SSO support</a>"
+"again. If the problem persists, please contact <a href=\"https://forms."
+"canonical.com/sso-support/\">Ubuntu SSO support</a>"
 msgstr ""
 "Wygląda na to, że captcha nie została poprawnie załadowana. Może to być "
 "spowodowane ustawieniami Twojej przeglądarki. Spróbuj ponownie po usunięciu "
 "problemu. Jeżeli mimo wszystko, ta strona nie będzie działać skontaktuj się "
-"z <a href=\"https://forms.canonical.com/sso-support/\">wsparciem Ubuntu "
-"SSO</a>"
+"z <a href=\"https://forms.canonical.com/sso-support/\">wsparciem Ubuntu SSO</"
+"a>"
 
 #: templates/widgets/trusted_rp.html:7
 #, python-format
@@ -1933,21 +1543,384 @@
 msgstr "Niepoprawne rozwiązanie captcha."
 
 #~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request to validate the email address %(toaddress)s for use "
+#~ "in the Launchpad Login Service.\n"
+#~ "\n"
+#~ "If you made this request, please copy and paste the token below into the "
+#~ "desktop application to complete the process to add %(toaddress)s to your "
+#~ "existing Launchpad Login Service account.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Cześć,\n"
+#~ "\n"
+#~ "Otrzymaliśmy prośbę weryfikacji adresu email %(toaddress)s w serwisie "
+#~ "logowania Launchpad.\n"
+#~ "\n"
+#~ "Jeżeli prośba pochodzi od Ciebie, proszę skopiuj i wklej poniższy ciąg "
+#~ "znaków do aplikacji w celu dokończenia procesu dodawania %(toaddress)s do "
+#~ "Twojego istniejącego konta w serwisie logowania Launchpad.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "Jeżeli prośba nie pochodzi od Ciebie, zignoruj tą wiadomość lub zgłoś "
+#~ "jako możliwa próba naruszenia bezpieczeństwa Twoich danych.\n"
+#~ "\n"
+#~ "Dziękujemy,\n"
+#~ "\n"
+#~ "Zespół serwisu logowania Launchpad"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "You have requested a new password for your Launchpad Login Service "
+#~ "account.\n"
+#~ "\n"
+#~ "To change your password:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone else has entered your "
+#~ "email address at the Launchpad Login Service. Sorry about that. You don't "
+#~ "need to do anything further, just delete this message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Cześć,\n"
+#~ "\n"
+#~ "Wysłałeś prośbę utworzenia nowego hasła do konta w serwisie logowania "
+#~ "Launchpad.\n"
+#~ "\n"
+#~ "Aby zmienić hasło kliknij:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Jeżeli nic Ci o tym nie wiadomo to oznacza, że ktoś inny wprowadził Twój "
+#~ "adres email w serwisie logowania Launchpad. Przepraszamy za zaistniałą "
+#~ "sytuację. W takim wypadku nie musisz nic więcej robić i możesz po prostu "
+#~ "usunąć tą wiadomość\n"
+#~ "\n"
+#~ "Z wyrazami szacunku,\n"
+#~ "\n"
+#~ "Zespół serwisu logowania Launchpad"
+
+#~ msgid ""
+#~ "We've received a request to create a new account with your email "
+#~ "address.\n"
+#~ "\n"
+#~ "If this was you, perhaps you've forgotten your password?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "If not, someone may be trying to impersonate you. If you get more "
+#~ "requests like this, please let us know.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Otrzymaliśmy prośbę utworzenia nowego konta związanego z tym adresem "
+#~ "email.\n"
+#~ "\n"
+#~ "Jeżeli prośba pochodziła od Ciebie, może chodzi o zapomniane hasło?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"
+#~ "\n"
+#~ "Jeżeli nie, ktoś inny próbował się podszyć za Ciebie. Jeżeli nadejdzie "
+#~ "więcej takich wiadomości, prosimy, daj nam znać.\n"
+#~ "\n"
+#~ "Z wyrazami szacunku,\n"
+#~ "\n"
+#~ "Zespół serwisu logowania Launchpad"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "Thank you for registering with the Launchpad Login Service.\n"
+#~ "\n"
+#~ "To complete your registration:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone has probably entered "
+#~ "your email address by mistake at the Launchpad Login Service web site. "
+#~ "Sorry about that. You don't need to do anything further, just delete this "
+#~ "message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Cześć,\n"
+#~ "\n"
+#~ "Dziękujemy za rejestrację w serwisie logowania Launchpad.\n"
+#~ "\n"
+#~ "Aby zakończyć rejestrację kliknij:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Jeżeli nie wiesz o co chodzi to prawdopodobnie ktoś przez pomyłkę "
+#~ "wprowadził Twój adres email na stronie serwisu logowania Launchpad. "
+#~ "Przepraszamy za to. Nie musisz nic więcej robić, po prostu usuń tą "
+#~ "wiadomość.\n"
+#~ "\n"
+#~ "Z wyrazami szacunku,\n"
+#~ "\n"
+#~ "Zespół serwisu logowania Launchpad"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request from %(requester)s using email address %"
+#~ "(requester_email)s, trying to validate the email address %(toaddress)s "
+#~ "for use in the Launchpad Login Service.\n"
+#~ "\n"
+#~ "If you made this request, please click on the link below and complete the "
+#~ "process to add %(toaddress)s to your existing Launchpad Login Service "
+#~ "account.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "on\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Launchpad Login Service team"
+#~ msgstr ""
+#~ "Cześć\n"
+#~ "\n"
+#~ "Otrzymaliśmy prośbę od %(requester)s (%(requester_email)s), w celu "
+#~ "weryfikacji adresu email %(toaddress)s w serwisie logowania Launchpad.\n"
+#~ "\n"
+#~ "Jeżeli prośba pochodzi od Ciebie, kliknij na poniższy link i zakończ "
+#~ "proces dodawania adresu %(toaddress)s do Twojego konta w serwisie "
+#~ "logowania Launchpad.\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Zignoruj tą wiadomość, jeżeli prośba ta nie pochodzi od Ciebie. "
+#~ "Alternatywnie możesz zgłosić ten fakt pod adresem:\n"
+#~ "\n"
+#~ "    %(support_form_url)s\n"
+#~ "\n"
+#~ "jako możliwa próba ataku na bezpieczeństwo Twoich danych.\n"
+#~ "\n"
+#~ "Dziękujemy,\n"
+#~ "\n"
+#~ "Zespół serwisu logowania Launchpad"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "We received a request to validate the email address %(toaddress)s for use "
+#~ "in the Ubuntu Single Sign On service.\n"
+#~ "\n"
+#~ "If you made this request, please copy and paste the token below into the "
+#~ "desktop application to complete the process to add %(toaddress)s to your "
+#~ "existing Ubuntu Single Sign On service account.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "If you did not make this request, please ignore this message or report it "
+#~ "as a possible attempt at a security attack on your data.\n"
+#~ "\n"
+#~ "Thank you,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Cześć,\n"
+#~ "\n"
+#~ "Otrzymaliśmy prośbę weryfikacji adresu email %(toaddress)s w serwisie "
+#~ "Ubuntu Single Sign On.\n"
+#~ "\n"
+#~ "Jeżeli prośba pochodzi od Ciebie, proszę skopiuj i wklej poniższy ciąg "
+#~ "znaków do aplikacji w celu dokończenia procesu dodawania %(toaddress)s do "
+#~ "Twojego istniejącego konta w serwisie Ubuntu Single Sign On.\n"
+#~ "\n"
+#~ "    %(token)s\n"
+#~ "\n"
+#~ "Jeżeli prośba nie pochodzi od Ciebie, zignoruj tą wiadomość lub zgłoś "
+#~ "jako możliwa próba naruszenia bezpieczeństwa Twoich danych.\n"
+#~ "\n"
+#~ "Dziękujemy,\n"
+#~ "\n"
+#~ "Zespół serwisu Ubuntu Single Sign On"
+
+#~ msgid ""
+#~ "Hello\n"
+#~ "\n"
+#~ "You have requested a new password for your Ubuntu Single Sign On "
+#~ "account.\n"
+#~ "\n"
+#~ "To change your password:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "If you don't know what this is about, then someone else has entered your "
+#~ "email address at the Ubuntu Single Sign On service. Sorry about that. You "
+#~ "don't need to do anything further, just delete this message.\n"
+#~ "\n"
+#~ "Regards,\n"
+#~ "\n"
+#~ "The Ubuntu Single Sign On team"
+#~ msgstr ""
+#~ "Cześć,\n"
+#~ "\n"
+#~ "Wysłałeś prośbę utworzenia nowego hasła do konta w serwisie Ubuntu Single "
+#~ "Sign On.\n"
+#~ "\n"
+#~ "Aby zmienić hasło kliknij:\n"
+#~ "\n"
+#~ "    %(token_url)s\n"
+#~ "\n"
+#~ "Jeżeli nic Ci o tym nie wiadomo to oznacza, że ktoś inny wprowadził Twój "
+#~ "adres email w serwisie Ubuntu Single Sign On. Przepraszamy za zaistniałą "
+#~ "sytuację. W takim wypadku nie musisz nic więcej robić i możesz po prostu "
+#~ "usunąć tą wiadomość\n"
+#~ "\n"
+#~ "Z wyrazami szacunku,\n"
+#~ "\n"
+#~ "Zespół serwisu Ubuntu Single Sign On"
+
+#~ msgid ""
+#~ "We've received a request to create a new account with your email "
+#~ "address.\n"
+#~ "\n"
+#~ "If this was you, perhaps you've forgotten your password?\n"
+#~ "\n"
+#~ "    %(forgotten_password_url)s\n"