Use <br /> everywhere and not a mix of <br>, <br/> and <br /> so as to

not confuse translators.

I don't know if this gets sanitized in rails. Maybe this makes us more
XHTML compliant too.

diff --git a/config/locales/be.yml b/config/locales/be.yml
index b380eff51fad5b3c5a977bc8fd6c5c47622c122b..0cc03759439fcdbd1e18a88f5ee27b34bde05922 100644 (file)
--- a/config/locales/be.yml
+++ b/config/locales/be.yml
@@ -637,7 +637,7 @@ be:
       password: "Пароль:"
       lost password link: "Згубліл пароль?"
       login_button: "Увайсці"
       password: "Пароль:"
       lost password link: "Згубліл пароль?"
       login_button: "Увайсці"

-      account not active: "Прабачце, ваш рахунак пакуль не актывізаваны.<br>Калі ласка, націсніце на адпаведную спасылку ў лісце пацверджання рахунку, каб актывізаваць яго."
+      account not active: "Прабачце, ваш рахунак пакуль не актывізаваны.<br />Калі ласка, націсніце на адпаведную спасылку ў лісце пацверджання рахунку, каб актывізаваць яго."

       auth failure: "Прабачце, немагчыма увайсці з такім адрасам і паролем."
     lost_password:
       title: "згублены пароль"
       auth failure: "Прабачце, немагчыма увайсці з такім адрасам і паролем."
     lost_password:
       title: "згублены пароль"

diff --git a/config/locales/de.yml b/config/locales/de.yml
index fc730576af242838adb45ef31e2caf554bc92675..37ba9922e7e43edc7c6864c001db07ba58022d60 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -873,7 +873,7 @@ de:
       password: "Passwort:"
       lost password link: "Passwort vergessen?"
       login_button: "Anmelden"
       password: "Passwort:"
       lost password link: "Passwort vergessen?"
       login_button: "Anmelden"

-      account not active: "Leider ist dein Benutzerkonto noch nicht aktiv.<br>Bitte aktivierte dein Benutzerkonto, indem du auf den Link in deiner Bestätigungs-E-Mail klickst."
+      account not active: "Leider ist dein Benutzerkonto noch nicht aktiv.<br />Bitte aktivierte dein Benutzerkonto, indem du auf den Link in deiner Bestätigungs-E-Mail klickst."

       auth failure: "Sorry, Anmelden mit diesen Daten nicht möglich."
     lost_password:
       title: "Passwort vergessen"
       auth failure: "Sorry, Anmelden mit diesen Daten nicht möglich."
     lost_password:
       title: "Passwort vergessen"

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 560f9e3d87871e667ad8002f71e2cc1f495ac1c4..c2dbe0b58caca541d832bfeb13343f6ac111c645 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -875,7 +875,7 @@ en:
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"

-      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."

       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "Lost password"
       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "Lost password"

diff --git a/config/locales/he.yml b/config/locales/he.yml
index c647ff807d025442ad3da1b2c6f32452dfe25508..6c8c270e198f077b413e87affccca1237fe35961 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -519,7 +519,7 @@ he:
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"

-      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."

       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "lost password"
       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "lost password"

diff --git a/config/locales/hi.yml b/config/locales/hi.yml
index b4f5100cbe461cf2a6e7c20c42500f01a359ac9b..44d1acc5f6cbad270730db559962bbba4897d838 100644 (file)
--- a/config/locales/hi.yml
+++ b/config/locales/hi.yml
@@ -575,7 +575,7 @@ hi:
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"

-      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."

       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "lost password"
       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "lost password"

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 4871242344f71929f04c4bde01e59f9ca6c0b020..c933c95fe1d75d35bd6ff454a1acb1f0eb817242 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -873,7 +873,7 @@ hu:
       password: "Jelszó:"
       lost password link: "Elfelejtetted a jelszavad?"
       login_button: "Bejelentkezés"
       password: "Jelszó:"
       lost password link: "Elfelejtetted a jelszavad?"
       login_button: "Bejelentkezés"

-      account not active: "Sajnálom, a felhasználói fiókod még nincs aktiválva.<br>Az aktiváláshoz, kattints a fiókodat megerősítő e-mailben lévő hivatkozásra."
+      account not active: "Sajnálom, a felhasználói fiókod még nincs aktiválva.<br />Az aktiváláshoz, kattints a fiókodat megerősítő e-mailben lévő hivatkozásra."

       auth failure: "Sajnálom, ilyen adatokkal nem tudsz bejelentkezni."
     lost_password:
       title: "Elvesztett jelszó"
       auth failure: "Sajnálom, ilyen adatokkal nem tudsz bejelentkezni."
     lost_password:
       title: "Elvesztett jelszó"

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 8a1780f78e759d08cc7c00f21afabd54f40a9a6e..722b83778e713ca0ab1dedd7ccaa943f94fb12bf 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -799,7 +799,7 @@ is:
       password: "Lykilorð:"
       lost password link: "Gleymt lykilorð?"
       login_button: "Innskrá"
       password: "Lykilorð:"
       lost password link: "Gleymt lykilorð?"
       login_button: "Innskrá"

-      account not active: "Þessi reikningur er ekki virkur.<br>Vinsamlegast smelltu á tengilinn í staðfestingarpóstinum sem þú fékkst til að virkja reikninginn."
+      account not active: "Þessi reikningur er ekki virkur.<br />Vinsamlegast smelltu á tengilinn í staðfestingarpóstinum sem þú fékkst til að virkja reikninginn."

       auth failure: "Þetta notandanafn eða lykilorð er rangt."
     lost_password:
       title: "gleymt lykilorð"
       auth failure: "Þetta notandanafn eða lykilorð er rangt."
     lost_password:
       title: "gleymt lykilorð"

diff --git a/config/locales/it.yml b/config/locales/it.yml
index c5ef4c18af0b422c51b92c543e8a2ed40f53896f..810a70dee838d1e3f4b6bcd1f8e122a1d0e579c7 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -525,7 +525,7 @@ it:
       password: "Password:"
       lost password link: "Persa la password?"
       login_button: "Entra"
       password: "Password:"
       lost password link: "Persa la password?"
       login_button: "Entra"

-      account not active: "Spiacenti, il tuo profilo non è ancora attivo.<br>Clicca sul collegamento presente nell'email di conferma per attivare il tuo profilo."
+      account not active: "Spiacenti, il tuo profilo non è ancora attivo.<br />Clicca sul collegamento presente nell'email di conferma per attivare il tuo profilo."

       auth failure: "Spiacenti, non si può accedere con questi dettagli."
     lost_password:
       title: "password persa"
       auth failure: "Spiacenti, non si può accedere con questi dettagli."
     lost_password:
       title: "password persa"

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 4b477ab5b61c437a7c3d034cca10bc78d1053fa3..2d0e41571893469dac6a363a08f52500319a4770 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -649,7 +649,7 @@ ja:
       password: "パスワード:"
       lost password link: "パスワードを忘れましたか?"
       login_button: "ログイン"
       password: "パスワード:"
       lost password link: "パスワードを忘れましたか?"
       login_button: "ログイン"

-      account not active: "申し訳ありません。あなたのアカウントはまだ有効ではありません。<br>アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックしてください。"
+      account not active: "申し訳ありません。あなたのアカウントはまだ有効ではありません。<br />アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックしてください。"

       auth failure: "申し訳ありません、以下の理由によりログインできません。"
     lost_password:
       title: "パスワード失念"
       auth failure: "申し訳ありません、以下の理由によりログインできません。"
     lost_password:
       title: "パスワード失念"

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index a5e0ac67bfba6bdad3c7cc1db3579a1a3f96f7cd..572cba8e14885d138410173c9206fd52ce9d5007 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -637,7 +637,7 @@ ko:
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"

-      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."

       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "lost password"
       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "lost password"

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 9e10a4e164ae2ad29c60670a27ff90e1028a21f1..92a84277473f89449d66a3a84a9c46c7ba63f8a6 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -525,7 +525,7 @@ nl:
       password: "Wachtwoord:"
       lost password link: "Wachtwoord vergeten?"
       login_button: "Inloggen"
       password: "Wachtwoord:"
       lost password link: "Wachtwoord vergeten?"
       login_button: "Inloggen"

-      account not active: "Sorry, je account is nog niet actief.<br>Klik op de link in de bevestigingsmail om hem te activeren."
+      account not active: "Sorry, je account is nog niet actief.<br />Klik op de link in de bevestigingsmail om hem te activeren."

       auth failure: "Sorry, je kon met deze details niet inloggen."
     lost_password:
       title: "vergeten wachtwoord"
       auth failure: "Sorry, je kon met deze details niet inloggen."
     lost_password:
       title: "vergeten wachtwoord"

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index f7d5ffb8f41e46a4e0c7782b7046fed192b5256f..785fd4f3af3f24a6d7481f9aa9e410dc807fd18d 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -539,7 +539,7 @@ pl:
       password: "Hasło:"
       lost password link: "Zapomniane hasło?"
       login_button: "Zaloguj mnie"
       password: "Hasło:"
       lost password link: "Zapomniane hasło?"
       login_button: "Zaloguj mnie"

-      account not active: "Niestety Twoje konto nie jest jeszcze aktywne.<br>Otwórz link zawarty w mailu potwierdzenia założenia konta aby je aktywować."
+      account not active: "Niestety Twoje konto nie jest jeszcze aktywne.<br />Otwórz link zawarty w mailu potwierdzenia założenia konta aby je aktywować."

       auth failure: "Niestety podane dane nie pozwoliły na zalogowanie Cię."
     lost_password:
       title: "zgubione hasło"
       auth failure: "Niestety podane dane nie pozwoliły na zalogowanie Cię."
     lost_password:
       title: "zgubione hasło"

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 19671607d6d0170f63b5cd989667aed1df5b4197..b9579b8d88138cb230fdcd066c2860700bfd8522 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -785,7 +785,7 @@ pt-BR:
       password: "Senha:"
       lost password link: "Esqueceu sua senha?"
       login_button: "Entrar"
       password: "Senha:"
       lost password link: "Esqueceu sua senha?"
       login_button: "Entrar"

-      account not active: "Desculpe, sua conta não está mais ativa.<br>Por favor clique no link no e-mail de confirmação recebido, para ativar sua conta."
+      account not active: "Desculpe, sua conta não está mais ativa.<br />Por favor clique no link no e-mail de confirmação recebido, para ativar sua conta."

       auth failure: "Desculpe, impossível entrar com estas informações."
     lost_password:
       title: "Senha esquecida"
       auth failure: "Desculpe, impossível entrar com estas informações."
     lost_password:
       title: "Senha esquecida"

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 29a3f2e5d42dfc8b4a5233ac6e2ead4b1e7349da..1f35e133511e034bb1f24dc7147d2f26c03cf8a6 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -768,7 +768,7 @@ ro:
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"
       password: "Password:"
       lost password link: "Lost your password?"
       login_button: "Login"

-      account not active: "Sorry, your account is not active yet.<br>Please click on the link in the account confirmation email to activate your account."
+      account not active: "Sorry, your account is not active yet.<br />Please click on the link in the account confirmation email to activate your account."

       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "lost password"
       auth failure: "Sorry, couldn't log in with those details."
     lost_password:
       title: "lost password"

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 2aca72384ce2244a23385573c397f7332b2f2753..24b1f9768cefc5057c66e468aee3278ae1382b5e 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -640,7 +640,7 @@ ru:
       password: "Пароль:"
       lost password link: "Забыли пароль?"
       login_button: "Войти"
       password: "Пароль:"
       lost password link: "Забыли пароль?"
       login_button: "Войти"

-      account not active: "Извините, ваша учетная запись ещё не активирована.<br>Чтобы активировать ее, пожалуйста, проверьте ваш почтовый ящик и нажмите на ссылку в письме с просьбой о подтверждении."
+      account not active: "Извините, ваша учетная запись ещё не активирована.<br />Чтобы активировать ее, пожалуйста, проверьте ваш почтовый ящик и нажмите на ссылку в письме с просьбой о подтверждении."

       auth failure: "Извините, вход с этими именем или паролем невозможен."
     lost_password:
       title: "Восстановление пароля"
       auth failure: "Извините, вход с этими именем или паролем невозможен."
     lost_password:
       title: "Восстановление пароля"

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 42f36fd1c1d205f1065991886c9e85e86f7c0474..40e153eb71469d89e0912e8c7bf50ad6a52bf760 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -803,7 +803,7 @@ sl:
       password: "Geslo:"
       lost password link: "Ste pozabili geslo?"
       login_button: "Prijava"
       password: "Geslo:"
       lost password link: "Ste pozabili geslo?"
       login_button: "Prijava"

-      account not active: "Oprostite, vaš uporabniški račun še ni aktiven.<br>Za aktivacijo prosim kliknite na povezavo, ki ste jo prejeli v elektronskem sporočilu za potrditev uporabniškega računa."
+      account not active: "Oprostite, vaš uporabniški račun še ni aktiven.<br />Za aktivacijo prosim kliknite na povezavo, ki ste jo prejeli v elektronskem sporočilu za potrditev uporabniškega računa."

       auth failure: "Oprostite, prijava s temi podatki ni uspela."
     lost_password:
       title: "pozabljeno geslo"
       auth failure: "Oprostite, prijava s temi podatki ni uspela."
     lost_password:
       title: "pozabljeno geslo"

diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 6a9e429903a829006c5ee0d2a6813b4976b1eee0..2a36af5147cf2f6b9fb1c8596622e33ffc92800b 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -876,7 +876,7 @@ vi:
       password: "Mật khẩu:"
       lost password link: "Quên mất Mật khẩu?"
       login_button: "Đăng nhập"
       password: "Mật khẩu:"
       lost password link: "Quên mất Mật khẩu?"
       login_button: "Đăng nhập"

-      account not active: "Rất tiếc, tài khoản của bạn chưa được kích hoạt.<br>Xin hãy nhấn chuột vào liên kết trong thư điện tử xác nhận tài khoản để kích hoạt tài khoản."
+      account not active: "Rất tiếc, tài khoản của bạn chưa được kích hoạt.<br />Xin hãy nhấn chuột vào liên kết trong thư điện tử xác nhận tài khoản để kích hoạt tài khoản."

       auth failure: "Rất tiếc, không thể đăng nhập với những chi tiết đó."
     lost_password:
       title: "Quên mất mật khẩu"
       auth failure: "Rất tiếc, không thể đăng nhập với những chi tiết đó."
     lost_password:
       title: "Quên mất mật khẩu"

diff --git a/config/locales/yo.yml b/config/locales/yo.yml
index 29b3d8ed797ee5ac406492fa0b064c03df27db7b..e4c5ffefb1255640d002003c3a21680eb2b7bab7 100644 (file)
--- a/config/locales/yo.yml
+++ b/config/locales/yo.yml
@@ -637,7 +637,7 @@ yo:
       password: "Password:"
       lost password link: "Se eh ti san password nu?"
       login_button: "Login"
       password: "Password:"
       lost password link: "Se eh ti san password nu?"
       login_button: "Login"

-      account not active: "Pele, account yin ko wa active .<br>Jo eh te link ni nu account confirmation email lati tan account eh."
+      account not active: "Pele, account yin ko wa active .<br />Jo eh te link ni nu account confirmation email lati tan account eh."

       auth failure: "Pele, e le wole pelu details yi."
     lost_password:
       title: "lost password"
       auth failure: "Pele, e le wole pelu details yi."
     lost_password:
       title: "lost password"

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index dd59e70273e0d5104d553b1ec5d41f4eb1b4a781..ebad737d9ac12bd87ae7f6d9f018b48b06f94efe 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -550,7 +550,7 @@ zh-CN:
       password: "密码:"
       lost password link: "找回密码?"
       login_button: "登陆"
       password: "密码:"
       lost password link: "找回密码?"
       login_button: "登陆"

-      account not active: "抱歉，您的账户尚未激活。<br>请点击在账户确认邮件中的链接来激活您的账户。"
+      account not active: "抱歉，您的账户尚未激活。<br />请点击在账户确认邮件中的链接来激活您的账户。"

       auth failure: "抱歉，凭这些信息您无法登陆。"
     lost_password:
       title: "丢失密码"
       auth failure: "抱歉，凭这些信息您无法登陆。"
     lost_password:
       title: "丢失密码"

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index ed40a3941097323efd4c2aad7843646fb31c9316..383b0c4c6071d4be28de02266bb53df4a3833e04 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -865,7 +865,7 @@ zh-TW:
       password: "密碼："
       lost password link: "忘記您的密碼？"
       login_button: "登入"
       password: "密碼："
       lost password link: "忘記您的密碼？"
       login_button: "登入"

-      account not active: "抱歉，您的帳號尚未啟用。<br>請點選帳號確認電子郵件中的連結來啟用您的帳號。"
+      account not active: "抱歉，您的帳號尚未啟用。<br />請點選帳號確認電子郵件中的連結來啟用您的帳號。"

       auth failure: "抱歉，無法以這些資料登入。"
     lost_password:
       title: "遺失密碼"
       auth failure: "抱歉，無法以這些資料登入。"
     lost_password:
       title: "遺失密碼"