From: Ævar Arnfjörð Bjarmason Date: Tue, 22 Sep 2009 12:40:59 +0000 (+0000) Subject: Use
everywhere and not a mix of
,
and
so as to X-Git-Tag: live~6656 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/32a06b9e5b12b359f6cd6ac5f8d495f2d9fc9b73 Use
everywhere and not a mix of
,
and
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 b380eff51..0cc037594 100644 --- a/config/locales/be.yml +++ b/config/locales/be.yml @@ -637,7 +637,7 @@ be: password: "Пароль:" lost password link: "Згубліл пароль?" login_button: "Увайсці" - account not active: "Прабачце, ваш рахунак пакуль не актывізаваны.
Калі ласка, націсніце на адпаведную спасылку ў лісце пацверджання рахунку, каб актывізаваць яго." + account not active: "Прабачце, ваш рахунак пакуль не актывізаваны.
Калі ласка, націсніце на адпаведную спасылку ў лісце пацверджання рахунку, каб актывізаваць яго." auth failure: "Прабачце, немагчыма увайсці з такім адрасам і паролем." lost_password: title: "згублены пароль" diff --git a/config/locales/de.yml b/config/locales/de.yml index fc730576a..37ba9922e 100644 --- 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" - account not active: "Leider ist dein Benutzerkonto noch nicht aktiv.
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.
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" diff --git a/config/locales/en.yml b/config/locales/en.yml index 560f9e3d8..c2dbe0b58 100644 --- 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" - account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." + account not active: "Sorry, your account is not active yet.
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" diff --git a/config/locales/he.yml b/config/locales/he.yml index c647ff807..6c8c270e1 100644 --- 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" - account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." + account not active: "Sorry, your account is not active yet.
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" diff --git a/config/locales/hi.yml b/config/locales/hi.yml index b4f5100cb..44d1acc5f 100644 --- 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" - account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." + account not active: "Sorry, your account is not active yet.
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" diff --git a/config/locales/hu.yml b/config/locales/hu.yml index 487124234..c933c95fe 100644 --- 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" - account not active: "Sajnálom, a felhasználói fiókod még nincs aktiválva.
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.
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ó" diff --git a/config/locales/is.yml b/config/locales/is.yml index 8a1780f78..722b83778 100644 --- 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á" - account not active: "Þessi reikningur er ekki virkur.
Vinsamlegast smelltu á tengilinn í staðfestingarpóstinum sem þú fékkst til að virkja reikninginn." + account not active: "Þessi reikningur er ekki virkur.
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ð" diff --git a/config/locales/it.yml b/config/locales/it.yml index c5ef4c18a..810a70dee 100644 --- 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" - account not active: "Spiacenti, il tuo profilo non è ancora attivo.
Clicca sul collegamento presente nell'email di conferma per attivare il tuo profilo." + account not active: "Spiacenti, il tuo profilo non è ancora attivo.
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" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index 4b477ab5b..2d0e41571 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -649,7 +649,7 @@ ja: password: "パスワード:" lost password link: "パスワードを忘れましたか?" login_button: "ログイン" - account not active: "申し訳ありません。あなたのアカウントはまだ有効ではありません。
アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックしてください。" + account not active: "申し訳ありません。あなたのアカウントはまだ有効ではありません。
アカウント確認メールに記載されている、アカウントを有効にするリンクをクリックしてください。" auth failure: "申し訳ありません、以下の理由によりログインできません。" lost_password: title: "パスワード失念" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index a5e0ac67b..572cba8e1 100644 --- 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" - account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." + account not active: "Sorry, your account is not active yet.
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" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 9e10a4e16..92a842774 100644 --- 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" - account not active: "Sorry, je account is nog niet actief.
Klik op de link in de bevestigingsmail om hem te activeren." + account not active: "Sorry, je account is nog niet actief.
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" diff --git a/config/locales/pl.yml b/config/locales/pl.yml index f7d5ffb8f..785fd4f3a 100644 --- 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" - account not active: "Niestety Twoje konto nie jest jeszcze aktywne.
Otwórz link zawarty w mailu potwierdzenia założenia konta aby je aktywować." + account not active: "Niestety Twoje konto nie jest jeszcze aktywne.
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" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 19671607d..b9579b8d8 100644 --- 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" - account not active: "Desculpe, sua conta não está mais ativa.
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.
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" diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 29a3f2e5d..1f35e1335 100644 --- 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" - account not active: "Sorry, your account is not active yet.
Please click on the link in the account confirmation email to activate your account." + account not active: "Sorry, your account is not active yet.
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" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 2aca72384..24b1f9768 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -640,7 +640,7 @@ ru: password: "Пароль:" lost password link: "Забыли пароль?" login_button: "Войти" - account not active: "Извините, ваша учетная запись ещё не активирована.
Чтобы активировать ее, пожалуйста, проверьте ваш почтовый ящик и нажмите на ссылку в письме с просьбой о подтверждении." + account not active: "Извините, ваша учетная запись ещё не активирована.
Чтобы активировать ее, пожалуйста, проверьте ваш почтовый ящик и нажмите на ссылку в письме с просьбой о подтверждении." auth failure: "Извините, вход с этими именем или паролем невозможен." lost_password: title: "Восстановление пароля" diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 42f36fd1c..40e153eb7 100644 --- 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" - account not active: "Oprostite, vaš uporabniški račun še ni aktiven.
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.
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" diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 6a9e42990..2a36af514 100644 --- 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" - account not active: "Rất tiếc, tài khoản của bạn chưa được kích hoạt.
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.
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" diff --git a/config/locales/yo.yml b/config/locales/yo.yml index 29b3d8ed7..e4c5ffefb 100644 --- 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" - account not active: "Pele, account yin ko wa active .
Jo eh te link ni nu account confirmation email lati tan account eh." + account not active: "Pele, account yin ko wa active .
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" diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml index dd59e7027..ebad737d9 100644 --- a/config/locales/zh-CN.yml +++ b/config/locales/zh-CN.yml @@ -550,7 +550,7 @@ zh-CN: password: "密码:" lost password link: "找回密码?" login_button: "登陆" - account not active: "抱歉,您的账户尚未激活。
请点击在账户确认邮件中的链接来激活您的账户。" + account not active: "抱歉,您的账户尚未激活。
请点击在账户确认邮件中的链接来激活您的账户。" auth failure: "抱歉,凭这些信息您无法登陆。" lost_password: title: "丢失密码" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index ed40a3941..383b0c4c6 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -865,7 +865,7 @@ zh-TW: password: "密碼:" lost password link: "忘記您的密碼?" login_button: "登入" - account not active: "抱歉,您的帳號尚未啟用。
請點選帳號確認電子郵件中的連結來啟用您的帳號。" + account not active: "抱歉,您的帳號尚未啟用。
請點選帳號確認電子郵件中的連結來啟用您的帳號。" auth failure: "抱歉,無法以這些資料登入。" lost_password: title: "遺失密碼"