Merge pull request #1348 from matrix-org/dbkr/fix_forgot_password_percent_encode

Percent encoding isn't a valid thing within _t

src/components/structures/login/ForgotPassword.js

@@ -1,5 +1,6 @@
 /*
 Copyright 2015, 2016 OpenMarket Ltd
+Copyright 2017 New Vector Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -169,7 +170,7 @@ module.exports = React.createClass({
         else if (this.state.progress === "sent_email") {
             resetPasswordJsx = (
                 <div>
-                    { _t('An email has been sent to') } {this.state.email}. { _t('Once you&#39;ve followed the link it contains, click below') }.
+                    { _t('An email has been sent to') } {this.state.email}. { _t("Once you've followed the link it contains, click below") }.
                     <br />
                     <input className="mx_Login_submit" type="button" onClick={this.onVerify}
                         value={ _t('I have verified my email address') } />

src/i18n/strings/de_DE.json

@@ -179,7 +179,7 @@
     "Profile": "Profil",
     "Refer a friend to Riot:": "Freunde zu Riot einladen:",
     "rejected": "abgelehnt",
-    "Once you've followed the link it contains, click below": "Nachdem du dem darin enthaltenen Link gefolgt bist, klicke unten",
+    "Once you've followed the link it contains, click below": "Nachdem du dem darin enthaltenen Link gefolgt bist, klicke unten",
     "rejected the invitation.": "lehnte die Einladung ab.",
     "Reject invitation": "Einladung ablehnen",
     "Remove Contact Information?": "Kontakt-Informationen entfernen?",

src/i18n/strings/el.json

@@ -688,7 +688,7 @@
     "No display name": "Χωρίς όνομα",
     "No users have specific privileges in this room": "Κανένας χρήστης δεν έχει συγκεκριμένα δικαιώματα σε αυτό το δωμάτιο",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Μόλις ενεργοποιηθεί η κρυπτογράφηση για ένα δωμάτιο, δεν μπορεί να απενεργοποιηθεί ξανά (για τώρα)",
-    "Once you've followed the link it contains, click below": "Μόλις ακολουθήσετε τον σύνδεσμο που περιέχει, κάντε κλικ παρακάτω",
+    "Once you've followed the link it contains, click below": "Μόλις ακολουθήσετε τον σύνδεσμο που περιέχει, κάντε κλικ παρακάτω",
     "Only people who have been invited": "Μόνο άτομα που έχουν προσκληθεί",
     "Otherwise, <a>click here</a> to send a bug report.": "Διαφορετικά, κάντε <a>κλικ εδώ</a> για να αποστείλετε μια αναφορά σφάλματος.",
     "%(senderName)s placed a %(callType)s call.": "Ο %(senderName)s πραγματοποίησε μια %(callType)s κλήση.",

src/i18n/strings/en_EN.json

@@ -444,7 +444,7 @@
     "OK": "OK",
     "olm version:": "olm version:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)",
-    "Once you've followed the link it contains, click below": "Once you've followed the link it contains, click below",
+    "Once you've followed the link it contains, click below": "Once you've followed the link it contains, click below",
     "Only people who have been invited": "Only people who have been invited",
     "Operation failed": "Operation failed",
     "Otherwise, <a>click here</a> to send a bug report.": "Otherwise, <a>click here</a> to send a bug report.",

src/i18n/strings/en_US.json

@@ -404,7 +404,7 @@
     "OK": "OK",
     "olm version:": "olm version:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Once encryption is enabled for a room it cannot be turned off again (for now)",
-    "Once you've followed the link it contains, click below": "Once you've followed the link it contains, click below",
+    "Once you've followed the link it contains, click below": "Once you've followed the link it contains, click below",
     "Only people who have been invited": "Only people who have been invited",
     "Operation failed": "Operation failed",
     "Password": "Password",

src/i18n/strings/es.json

@@ -660,7 +660,7 @@
     "Hide join/leave messages (invites/kicks/bans unaffected)": "Ocultar mensajes de entrada/salida (no afecta invitaciones/kicks/bans)",
     "Hide avatar and display name changes": "Ocultar cambios de avatar y nombre visible",
     "Matrix Apps": "Aplicaciones Matrix",
-    "Once you've followed the link it contains, click below": "Cuando haya seguido el enlace que contiene, haga click debajo",
+    "Once you've followed the link it contains, click below": "Cuando haya seguido el enlace que contiene, haga click debajo",
     "Sets the room topic": "Configura el tema de la sala",
     "Show Apps": "Mostrar aplicaciones",
     "To get started, please pick a username!": "Para empezar, ¡por favor elija un nombre de usuario!",

src/i18n/strings/eu.json

@@ -495,7 +495,7 @@
     "No users have specific privileges in this room": "Ez dago gela honetan baimen zehatzik duen erabiltzailerik",
     "olm version:": "olm bertsioa:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Behin gela batean zifratzea gaituta ezin da gero desgaitu (oraingoz)",
-    "Once you've followed the link it contains, click below": "Behin dakarren esteka jarraitu duzula, egin klik azpian",
+    "Once you've followed the link it contains, click below": "Behin dakarren esteka jarraitu duzula, egin klik azpian",
     "Otherwise, <a>click here</a> to send a bug report.": "Bestela, <a>bidali arazte-txosten bat</a>.",
     "Server may be unavailable, overloaded, or you hit a bug.": "Agian zerbitzaria ez dago eskuragarri, edo gainezka dago, edo akats bat aurkitu duzu.",
     "Changing password will currently reset any end-to-end encryption keys on all devices, making encrypted chat history unreadable, unless you first export your room keys and re-import them afterwards. In future this will be improved.": "Oraingoz pasahitza aldatzeak gailu guztietako muturretik muturrerako zifratze-gakoak berrezarriko ditu, eta ezin izango dituzu zifratutako txatetako historialak irakurri ez badituzu aurretik zure gelako gakoak esportatzen eta aldaketa eta gero berriro inportatzen. Etorkizunean hau hobetuko da.",

src/i18n/strings/fa.json

@@ -1 +1 @@
-{}
+{}

src/i18n/strings/fr.json

@@ -395,7 +395,7 @@
     "Mute": "Couper le son",
     "No users have specific privileges in this room": "Aucun utilisateur n’a de privilège spécifique dans ce salon",
     "olm version:": "version de olm :",
-    "Once you've followed the link it contains, click below": "Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous",
+    "Once you've followed the link it contains, click below": "Une fois que vous aurez suivi le lien qu’il contient, cliquez ci-dessous",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s a placé un appel %(callType)s.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Veuillez vérifier vos e-mails et cliquer sur le lien que vous avez reçu. Puis cliquez sur continuer.",
     "Power level must be positive integer.": "Le niveau d'autorité doit être un entier positif.",

src/i18n/strings/hu.json

@@ -443,7 +443,7 @@
     "No users have specific privileges in this room": "Egy felhasználónak sincsenek specifikus jogosultságai ebben a szobában",
     "olm version:": "olm verzió:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Ha egyszer bekapcsolod a titkosítást a szobába utána nem lehet kikapcsolni (egyenlőre)",
-    "Once you've followed the link it contains, click below": "Miután a linket követted, kattints alulra",
+    "Once you've followed the link it contains, click below": "Miután a linket követted, kattints alulra",
     "Only people who have been invited": "Csak akiket meghívtak",
     "Otherwise, <a>click here</a> to send a bug report.": "Különben hiba jelentés küldéséhez <a>kattints ide</a>.",
     "Password": "Jelszó",

src/i18n/strings/ko.json

@@ -452,7 +452,7 @@
     "People": "사람들",
     "Phone": "전화",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "방을 암호화하면 암호화를 도중에 끌 수 없어요. (현재로서는)",
-    "Once you've followed the link it contains, click below": "포함된 주소를 따라가서, 아래를 누르세요",
+    "Once you've followed the link it contains, click below": "포함된 주소를 따라가서, 아래를 누르세요",
     "Only people who have been invited": "초대받은 사람만",
     "Otherwise, <a>click here</a> to send a bug report.": "그 밖에는, <a>여기를 눌러</a> 오류 보고서를 보내주세요.",
     "%(senderName)s placed a %(callType)s call.": "%(senderName)s님이 %(callType)s 전화를 걸었어요.",

src/i18n/strings/lv.json

@@ -427,7 +427,7 @@
     "OK": "LABI",
     "olm version:": "olm versija:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Tiklīdz istabai tiks iespējota šifrēšana, tā vairs nebūs atslēdzama (pašlaik)",
-    "Once you've followed the link it contains, click below": "Tiklīdz sekoji saturā esošajai saitei, noklikšķini zemāk",
+    "Once you've followed the link it contains, click below": "Tiklīdz sekoji saturā esošajai saitei, noklikšķini zemāk",
     "Only people who have been invited": "Vienīgi personas, kuras ir tikušas uzaicinātas",
     "Operation failed": "Darbība neizdevās",
     "Otherwise, <a>click here</a> to send a bug report.": "pretējā gadījumā, <a>klikšķini šeit</a>, lai nosūtītu paziņojumu par kļūdu.",

src/i18n/strings/nb_NO.json

@@ -1 +1 @@
-{}
+{}

src/i18n/strings/nl.json

@@ -504,7 +504,7 @@
     "New passwords don't match": "Nieuwe wachtwoorden komen niet overeen",
     "New passwords must match each other.": "Nieuwe wachtwoorden moeten overeenkomen.",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Zodra versleuteling in een kamer is ingeschakeld kan het niet meer worden uitgeschakeld (voor nu)",
-    "Once you've followed the link it contains, click below": "Zodra je de link dat het bevat hebt gevolgd, klik hieronder",
+    "Once you've followed the link it contains, click below": "Zodra je de link dat het bevat hebt gevolgd, klik hieronder",
     "Only people who have been invited": "Alleen personen die zijn uitgenodigd",
     "Otherwise, <a>click here</a> to send a bug report.": "Klik anders <a>hier</a> om een foutmelding te versturen.",
     "Please check your email and click on the link it contains. Once this is done, click continue.": "Bekijk je e-mail en klik op de link die het bevat. Zodra dit klaar is, klik op verder gaan.",

src/i18n/strings/pt.json

@@ -149,7 +149,7 @@
     "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala",
     "olm version: ": "Versão do olm: ",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela não poderá ser desativada novamente (ainda)",
-    "Once you've followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo",
+    "Once you've followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo",
     "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
     "or": "ou",
     "other": "outro",

src/i18n/strings/pt_BR.json

@@ -149,7 +149,7 @@
     "No users have specific privileges in this room": "Nenhum/a usuário/a possui privilégios específicos nesta sala",
     "olm version: ": "Versão do olm: ",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Assim que a criptografia é ativada para uma sala, ela não poderá ser desativada novamente (ainda)",
-    "Once you've followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo",
+    "Once you've followed the link it contains, click below": "Quando você tiver clicado no link que está no email, clique o botão abaixo",
     "Only people who have been invited": "Apenas pessoas que tenham sido convidadas",
     "or": "ou",
     "other": "outro",

src/i18n/strings/ru.json

@@ -704,7 +704,7 @@
     "Jump to first unread message.": "Перейти к первому непрочитанному сообщению.",
     "Message not sent due to unknown devices being present": "Сообщение не отправлено из-за присутствия неизвестных устройств",
     "Mobile phone number (optional)": "Номер мобильного телефона (не обязательно)",
-    "Once you've followed the link it contains, click below": "После перехода по ссылке, нажмите на кнопку ниже",
+    "Once you've followed the link it contains, click below": "После перехода по ссылке, нажмите на кнопку ниже",
     "Password:": "Пароль:",
     "Privacy warning": "Предупреждение о конфиденциальности",
     "Privileged Users": "Привилегированные пользователи",

src/i18n/strings/sv.json

@@ -429,7 +429,7 @@
     "OK": "OK",
     "olm version:": "olm-version:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "När kryptering aktiveras i ett rum kan det inte deaktiveras (tills vidare)",
-    "Once you've followed the link it contains, click below": "När du har följt länken i meddelandet, klicka här",
+    "Once you've followed the link it contains, click below": "När du har följt länken i meddelandet, klicka här",
     "Only people who have been invited": "Endast inbjudna",
     "Operation failed": "Handlingen misslyckades",
     "Otherwise, <a>click here</a> to send a bug report.": "Annars kan du <a>klicka här</a> för att skicka en buggrapport.",

src/i18n/strings/th.json

@@ -251,7 +251,7 @@
     "NOT verified": "ยังไม่ได้ยืนยัน",
     "No more results": "ไม่มีผลลัพธ์อื่น",
     "No results": "ไม่มีผลลัพธ์",
-    "Once you've followed the link it contains, click below": "หลังจากคุณเปิดลิงก์ข้างในแล้ว คลิกข้างล่าง",
+    "Once you've followed the link it contains, click below": "หลังจากคุณเปิดลิงก์ข้างในแล้ว คลิกข้างล่าง",
     "Passwords can't be empty": "รหัสผ่านต้องไม่ว่าง",
     "People": "บุคคล",
     "Permissions": "สิทธิ์",

src/i18n/strings/tr.json

@@ -424,7 +424,7 @@
     "OK": "Tamam",
     "olm version:": "olm versiyon:",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "Bu oda için şifreleme etkinleştirildikten sonra tekrar kapatılamaz (şimdilik)",
-    "Once you've followed the link it contains, click below": "Bir kere ' içerdiği bağlantıyı takip ettikten sonra , aşağıya tıklayın",
+    "Once you've followed the link it contains, click below": "Bir kere ' içerdiği bağlantıyı takip ettikten sonra , aşağıya tıklayın",
     "Only people who have been invited": "Sadece davet edilmiş insanlar",
     "Operation failed": "Operasyon başarısız oldu",
     "Otherwise, <a>click here</a> to send a bug report.": "Aksi taktirde , bir hata raporu göndermek için <a> buraya tıklayın </a>.",

src/i18n/strings/zh_Hant.json

@@ -556,7 +556,7 @@
     "No users have specific privileges in this room": "此房間中沒有使用者有指定的權限",
     "olm version:": "olm 版本：",
     "Once encryption is enabled for a room it cannot be turned off again (for now)": "這個房間只要啟用加密就不能再關掉了（從現在開始）",
-    "Once you've followed the link it contains, click below": "一旦您跟著它所包含的連結，點選下方",
+    "Once you've followed the link it contains, click below": "一旦您跟著它所包含的連結，點選下方",
     "Only people who have been invited": "僅有被邀請的夥伴",
     "Otherwise, <a>click here</a> to send a bug report.": "否則，請<a>點選此處</a>來傳送錯誤報告。",
     "Password": "密碼",