Hello community,
here is the log from the commit of package rubygem-devise-i18n for
openSUSE:Factory checked in at 2018-02-10 17:59:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/rubygem-devise-i18n (Old)
and /work/SRC/openSUSE:Factory/.rubygem-devise-i18n.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-devise-i18n"
Sat Feb 10 17:59:52 2018 rev:30 rq:574928 version:1.5.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/rubygem-devise-i18n/rubygem-devise-i18n.changes
2018-01-13 21:45:19.292580496 +0100
+++
/work/SRC/openSUSE:Factory/.rubygem-devise-i18n.new/rubygem-devise-i18n.changes
2018-02-10 17:59:55.772304381 +0100
@@ -1,0 +2,6 @@
+Thu Feb 8 05:59:27 UTC 2018 - [email protected]
+
+- updated to version 1.5.1
+ no changelog found
+
+-------------------------------------------------------------------
Old:
----
devise-i18n-1.5.0.gem
New:
----
devise-i18n-1.5.1.gem
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ rubygem-devise-i18n.spec ++++++
--- /var/tmp/diff_new_pack.oYACE3/_old 2018-02-10 17:59:56.440280200 +0100
+++ /var/tmp/diff_new_pack.oYACE3/_new 2018-02-10 17:59:56.444280055 +0100
@@ -1,7 +1,7 @@
#
# spec file for package rubygem-devise-i18n
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -24,7 +24,7 @@
#
Name: rubygem-devise-i18n
-Version: 1.5.0
+Version: 1.5.1
Release: 0
%define mod_name devise-i18n
%define mod_full_name %{mod_name}-%{version}
++++++ devise-i18n-1.5.0.gem -> devise-i18n-1.5.1.gem ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/README.md new/README.md
--- old/README.md 2017-12-08 23:55:40.000000000 +0100
+++ new/README.md 2018-02-01 03:27:29.000000000 +0100
@@ -26,6 +26,14 @@
```
You should only do this if you really need to, though, because doing this will
make it so that you won't get the updated views should they change in a future
version of devise-i18n. To "uncustomize" the views, just delete them, and your
app will go back to grabbing devise-i18n's default views.
+## Scoped views
+
+If you need to use scoped views (for example, if you have different ones for
users and admins), you can include the scope in this command.
+``` sh
+rails g devise:i18n:views user
+```
+
+You will additionally need to generate the the translations into your app per
the following section and then add keys in each file for the scope you are
using.
## Customizing translations
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/VERSION new/VERSION
--- old/VERSION 2017-12-08 23:55:40.000000000 +0100
+++ new/VERSION 2018-02-01 03:27:29.000000000 +0100
@@ -1 +1 @@
-1.5.0
+1.5.1
Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/metadata new/metadata
--- old/metadata 2017-12-08 23:55:40.000000000 +0100
+++ new/metadata 2018-02-01 03:27:29.000000000 +0100
@@ -1,7 +1,7 @@
--- !ruby/object:Gem::Specification
name: devise-i18n
version: !ruby/object:Gem::Version
- version: 1.5.0
+ version: 1.5.1
platform: ruby
authors:
- Christopher Dell
@@ -10,7 +10,7 @@
autorequire:
bindir: bin
cert_chain: []
-date: 2017-12-08 00:00:00.000000000 Z
+date: 2018-02-01 00:00:00.000000000 Z
dependencies:
- !ruby/object:Gem::Dependency
name: devise
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/de.yml new/rails/locales/de.yml
--- old/rails/locales/de.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/de.yml 2018-02-01 03:27:29.000000000 +0100
@@ -37,10 +37,10 @@
failure:
already_authenticated: Sie sind bereits angemeldet.
inactive: Ihr Account ist nicht aktiv.
- invalid:
+ invalid: "%{authentication_keys} oder Passwort ungültig."
last_attempt: Sie haben noch einen Versuch, bis Ihr Account gesperrt
wird.
locked: Ihr Account ist gesperrt.
- not_found_in_database:
+ not_found_in_database: "%{authentication_keys} oder Passwort ungültig."
timeout: Ihre Sitzung ist abgelaufen, bitte melden Sie sich erneut an.
unauthenticated: Sie müssen sich anmelden oder registrieren, bevor Sie
fortfahren können.
unconfirmed: Sie müssen Ihren Account bestätigen, bevor Sie fortfahren
können.
@@ -92,7 +92,7 @@
currently_waiting_confirmation_for_email: Warte auf Bestätigung von
%{email}.
leave_blank_if_you_don_t_want_to_change_it: freilassen, wenn Sie das
nicht ändern wollen
title: "%{resource} bearbeiten"
- unhappy: Unglücklich
+ unhappy: Unglücklich?
update: Aktualisieren
we_need_your_current_password_to_confirm_your_changes: wir benötigen
Ihr aktuelles Passwort, um die Änderung zu bestätigen
new:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/el.yml new/rails/locales/el.yml
--- old/rails/locales/el.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/el.yml 2018-02-01 03:27:29.000000000 +0100
@@ -40,7 +40,7 @@
invalid: "Άκυρο %{authentication_keys} ή κωδικός πρόσβασης."
last_attempt: "Έχετε μία ακόμη προσπάθεια πριν κλειδωθεί ο λογαριασμός
σας."
locked: "Ο λογαριασμός σας είναι κλειδωμένος."
- not_found_in_database: "Άκυρο %{authentication_keys} διεύθυνση ή κωδικός
πρόσβασης."
+ not_found_in_database: "Άκυρο %{authentication_keys} ή κωδικός
πρόσβασης."
timeout: "Η συνεδρία σας έληξε. Παρακαλώ συνδεθείτε ξανά για να
συνεχίσετε."
unauthenticated: "Πρέπει να συνδεθείτε ή να εγγραφείτε πριν συνεχίσετε."
unconfirmed: "Πρέπει να επιβεβαιώσετε τη διεύθυνση email σας πριν
συνεχίσετε."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/en.yml new/rails/locales/en.yml
--- old/rails/locales/en.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/en.yml 2018-02-01 03:27:29.000000000 +0100
@@ -40,7 +40,7 @@
invalid: Invalid %{authentication_keys} or password.
last_attempt: You have one more attempt before your account is locked.
locked: Your account is locked.
- not_found_in_database: Invalid %{authentication_keys} address or
password.
+ not_found_in_database: Invalid %{authentication_keys} or password.
timeout: Your session expired. Please sign in again to continue.
unauthenticated: You need to sign in or sign up before continuing.
unconfirmed: You have to confirm your email address before continuing.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/es.yml new/rails/locales/es.yml
--- old/rails/locales/es.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/es.yml 2018-02-01 03:27:29.000000000 +0100
@@ -37,10 +37,10 @@
failure:
already_authenticated: Ya has iniciado sesión.
inactive: Tu cuenta aún no ha sido activada.
- invalid:
+ invalid: "%{authentication_keys} o contraseña inválida."
last_attempt: Tienes un intento más antes de que tu cuenta sea bloqueada.
locked: Tu cuenta está bloqueada.
- not_found_in_database:
+ not_found_in_database: "%{authentication_keys} o contraseña inválida."
timeout: Tu sesión expiró. Por favor, inicia sesión nuevamente para
continuar.
unauthenticated: Tienes que iniciar sesión o registrarte para poder
continuar.
unconfirmed: Tienes que confirmar tu cuenta para poder continuar.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/et.yml new/rails/locales/et.yml
--- old/rails/locales/et.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/et.yml 2018-02-01 03:27:29.000000000 +0100
@@ -2,29 +2,29 @@
activerecord:
attributes:
user:
- confirmation_sent_at:
- confirmation_token:
- confirmed_at:
- created_at:
+ confirmation_sent_at: Kinnitus saadetud
+ confirmation_token: Kinnitamise tähis
+ confirmed_at: Kinnitatud
+ created_at: Loodud
current_password: Praegune parool
- current_sign_in_at:
- current_sign_in_ip:
+ current_sign_in_at: Sisselogimise aeg
+ current_sign_in_ip: Sisselogimise IP
email: E-post
- encrypted_password:
- failed_attempts:
- last_sign_in_at:
- last_sign_in_ip:
- locked_at:
+ encrypted_password: Krüpteeritud salasõna
+ failed_attempts: Ebaõnnestunud katsed
+ last_sign_in_at: Viimati sisselogitud
+ last_sign_in_ip: Viimase sisselogimise IP
+ locked_at: Lukustatud
password: Parool
password_confirmation: Parooli kinnitus
- remember_created_at:
+ remember_created_at: Hoia loomisaeg meeles
remember_me: Hoia mind meeles
- reset_password_sent_at:
+ reset_password_sent_at: Lähtesta salasõna saatmise aeg
reset_password_token: Parooli ennistamise tähis
- sign_in_count:
- unconfirmed_email:
+ sign_in_count: Sisselogimiste arv
+ unconfirmed_email: Kinnitamata e-posti aadress
unlock_token: Avamise tähis
- updated_at:
+ updated_at: Uuendatud
models:
user: Kasutaja
devise:
@@ -37,10 +37,10 @@
failure:
already_authenticated: Oled juba sisse loginud.
inactive: Sinu konto polnud veel aktiveeritud.
- invalid:
+ invalid: Vale %{authentication_keys} või salasõna
last_attempt: Sinul on jäänud veel üks katse enne kui su konto
lukustatakse.
locked: Sinu konto lukustati.
- not_found_in_database:
+ not_found_in_database: Vale %{authentication_keys} või salasõna
timeout: Sinu sessioon on aegunud, jätkamiseks logi palun sisse.
unauthenticated: Sa pead sisse logima või registreeruma enne jätkamist.
unconfirmed: Sa pead oma konto kinnitama, enne jätkamist.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/fa.yml new/rails/locales/fa.yml
--- old/rails/locales/fa.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/fa.yml 2018-02-01 03:27:29.000000000 +0100
@@ -37,7 +37,7 @@
failure:
already_authenticated: "وارد سیستم هستید."
inactive: "حساب شما هنوز فعال نشده است."
- invalid: "ایمیل یا رمز عبور غیر معتبر."
+ invalid:
last_attempt: "شما تنها یک فرصت دیگر دارید قبل از اینکه حسابتان غیرفعال
شود."
locked: "حسابتان قفل شده است."
not_found_in_database:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/ja.yml new/rails/locales/ja.yml
--- old/rails/locales/ja.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/ja.yml 2018-02-01 03:27:29.000000000 +0100
@@ -37,10 +37,10 @@
failure:
already_authenticated: "すでにログインしています。"
inactive: "アカウントが有効化されていません。メールに記載された手順にしたがって、アカウントを有効化してください。"
- invalid:
+ invalid: "%{authentication_keys}またはパスワードが違います。"
last_attempt: "もう一回誤るとアカウントがロックされます。"
locked: "アカウントは凍結されています。"
- not_found_in_database:
+ not_found_in_database: "%{authentication_keys}またはパスワードが違います。"
timeout: "セッションがタイムアウトしました。もう一度ログインしてください。"
unauthenticated: "アカウント登録もしくはログインしてください。"
unconfirmed: "メールアドレスの本人確認が必要です。"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/nl.yml new/rails/locales/nl.yml
--- old/rails/locales/nl.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/nl.yml 2018-02-01 03:27:29.000000000 +0100
@@ -37,10 +37,10 @@
failure:
already_authenticated: Je bent reeds aangemeld.
inactive: Je account is nog niet geactiveerd.
- invalid:
+ invalid: Ongeldige %{authentication_keys} of wachtwoord.
last_attempt: Je hebt nog één poging voordat je account vergrendeld
wordt.
locked: Je account is vergrendeld.
- not_found_in_database:
+ not_found_in_database: Ongeldige %{authentication_keys} of wachtwoord.
timeout: Je sessie is verlopen, meld je opnieuw aan om door te gaan.
unauthenticated: Je dient je aan te melden of in te schrijven om door te
gaan.
unconfirmed: Je dient eerst je account te bevestigen.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/pl.yml new/rails/locales/pl.yml
--- old/rails/locales/pl.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/pl.yml 2018-02-01 03:27:29.000000000 +0100
@@ -37,7 +37,7 @@
failure:
already_authenticated: Jesteś już zalogowany.
inactive: Konto nie zostało jeszcze aktywowane.
- invalid:
+ invalid: Błędny adres %{authentication_keys} lub hasło.
last_attempt: Masz jeszcze jedną próbę nim Twoje konto zostanie
zablokowane.
locked: Twoje konto jest zablokowane.
not_found_in_database: Błędny adres %{authentication_keys} lub hasło.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/pt-BR.yml new/rails/locales/pt-BR.yml
--- old/rails/locales/pt-BR.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/pt-BR.yml 2018-02-01 03:27:29.000000000 +0100
@@ -40,7 +40,7 @@
invalid: Invalido %{authentication_keys} ou senha.
last_attempt: Você tem mais uma única tentativa antes de sua conta ser
bloqueada.
locked: A sua conta está bloqueada.
- not_found_in_database: Invalido %{authentication_keys} endereço ou senha.
+ not_found_in_database: Invalido %{authentication_keys} ou senha.
timeout: A sua sessão expirou, por favor, faça login novamente para
continuar.
unauthenticated: Para continuar, faça login ou registre-se.
unconfirmed: Antes de continuar, confirme a sua conta.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/ru.yml new/rails/locales/ru.yml
--- old/rails/locales/ru.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/ru.yml 2018-02-01 03:27:29.000000000 +0100
@@ -2,29 +2,29 @@
activerecord:
attributes:
user:
- confirmation_sent_at:
- confirmation_token:
- confirmed_at:
- created_at:
+ confirmation_sent_at: "Дата отправки подтверждения"
+ confirmation_token: "Токен подтверждения"
+ confirmed_at: "Дата подтверждения"
+ created_at: "Дата создания"
current_password: "Текущий пароль"
- current_sign_in_at:
- current_sign_in_ip:
+ current_sign_in_at: "Дата текущего входа"
+ current_sign_in_ip: IP текущего входа
email: Email
- encrypted_password:
- failed_attempts:
- last_sign_in_at:
- last_sign_in_ip:
- locked_at:
+ encrypted_password: "Зашифрованный пароль"
+ failed_attempts: "Неудачные попытки"
+ last_sign_in_at: "Дата последнего входа"
+ last_sign_in_ip: IP последнего входа
+ locked_at: "Дата блокировки"
password: "Пароль"
password_confirmation: "Подтверждение пароля"
- remember_created_at:
+ remember_created_at: "Дата создания запоминания"
remember_me: "Запомнить меня"
- reset_password_sent_at:
- reset_password_token: "Ссылка сброса пароля"
- sign_in_count:
- unconfirmed_email:
+ reset_password_sent_at: "Дата отправки сброса пароля"
+ reset_password_token: "Токен сброса пароля"
+ sign_in_count: "Количество входов"
+ unconfirmed_email: "Неподтвержденный email"
unlock_token: "Токен разблокировки"
- updated_at:
+ updated_at: "Дата обновления"
models:
user: "Пользователь"
devise:
@@ -37,10 +37,10 @@
failure:
already_authenticated: "Вы уже вошли в систему."
inactive: "Ваша учетная запись еще не активирована."
- invalid:
+ invalid: "Неправильный %{authentication_keys} или пароль."
last_attempt: "У вас осталась последняя попытка ввода пароля до
блокировки учетной записи."
locked: "Ваша учетная запись заблокирована."
- not_found_in_database:
+ not_found_in_database: "Неправильный %{authentication_keys} или пароль."
timeout: "Ваш сеанс закончился. Пожалуйста, войдите в систему снова."
unauthenticated: "Вам необходимо войти в систему или зарегистрироваться."
unconfirmed: "Вы должны подтвердить вашу учетную запись."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/si.yml new/rails/locales/si.yml
--- old/rails/locales/si.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/si.yml 2018-02-01 03:27:29.000000000 +0100
@@ -40,7 +40,7 @@
invalid: "අවලංගු %{authentication_keys} හෝ මුරපදයකි."
last_attempt: "ඔබගේ ගිණුම අගුළු දැමීමට පෙර තවත් එක් උත්සාහයක් ඔබ සතුව
ඇත."
locked: "ඔබගේ ගිණුම අගුලු දමා ඇත."
- not_found_in_database: "අවලංගු %{authentication_keys} ලිපිනය හෝ
මුරපදයකි."
+ not_found_in_database: "අවලංගු %{authentication_keys} හෝ මුරපදයකි."
timeout: "ඔබගේ සැසිය කල් ඉකුත් විය. දිගටම කරගෙන යාමට කරුණාකර පුරනය වන්න."
unauthenticated: "දිගටම කරගෙන යෑමට පෙර ඔබ පුරනය වීමට හෝ ලියාපදිංචි විය
යුතුය."
unconfirmed: "දිගටම කරගෙන යාමට පෙර ඔබගේ ඊමේල් ලිපිනය තහවුරු කිරීමට සිදු
වේ."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/sv.yml new/rails/locales/sv.yml
--- old/rails/locales/sv.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/sv.yml 2018-02-01 03:27:29.000000000 +0100
@@ -2,29 +2,29 @@
activerecord:
attributes:
user:
- confirmation_sent_at:
- confirmation_token:
- confirmed_at:
- created_at:
+ confirmation_sent_at: Bekräftelse skickad
+ confirmation_token: Bekräftelse-token
+ confirmed_at: Bekräftat
+ created_at: Skapad
current_password: Nuvarande lösenord
- current_sign_in_at:
- current_sign_in_ip:
+ current_sign_in_at: Nuvarande inloggning vid
+ current_sign_in_ip: Nuvarande inloggnings-IP
email: Email
- encrypted_password:
- failed_attempts:
- last_sign_in_at:
- last_sign_in_ip:
- locked_at:
+ encrypted_password: Krypterat lösenord
+ failed_attempts: Misslyckade försök
+ last_sign_in_at: Senaste inloggning vid
+ last_sign_in_ip: Senaste inloggnings-IP
+ locked_at: Låst vid
password: Lösenord
password_confirmation: Bekräfta lösenord
- remember_created_at:
+ remember_created_at: Kom ihåg skapades vid
remember_me: Kom ihåg mig
- reset_password_sent_at:
+ reset_password_sent_at: "Återställ lösenord skickat vid"
reset_password_token: "Återställ token för lösenord"
- sign_in_count:
- unconfirmed_email:
+ sign_in_count: Antal inloggningar
+ unconfirmed_email: Obekräftad email
unlock_token: Token för återaktivering
- updated_at:
+ updated_at: Uppdaterad
models:
user: Användare
devise:
@@ -37,10 +37,10 @@
failure:
already_authenticated: Du är redan inloggad.
inactive: Ditt konto har inte aktiverats ännu.
- invalid:
+ invalid: Ogiltig %{authentication_keys} eller lösenord
last_attempt: Du har ett försök kvar, sen låser vi ditt konto.
locked: Ditt konto är låst.
- not_found_in_database:
+ not_found_in_database: Ogiltig %{authentication_keys} eller lösenord
timeout: Din session är inte längre giltig, vänligen logga in igen för
att fortsätta.
unauthenticated: Du måste logga in eller skapa ett konto innan du kan
fortsätta.
unconfirmed: Du måste bekräfta ditt konto innan du kan fortsätta.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/vi.yml new/rails/locales/vi.yml
--- old/rails/locales/vi.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/vi.yml 2018-02-01 03:27:29.000000000 +0100
@@ -2,29 +2,29 @@
activerecord:
attributes:
user:
- confirmation_sent_at:
- confirmation_token:
- confirmed_at:
- created_at:
+ confirmation_sent_at: Xác nhận gửi lúc
+ confirmation_token: Mã xác nhận
+ confirmed_at: Xác nhận lúc
+ created_at: "Được tạo lúc"
current_password: Mật khẩu hiện tại
- current_sign_in_at:
- current_sign_in_ip:
+ current_sign_in_at: "Đăng nhập lúc"
+ current_sign_in_ip: "Địa chỉ IP đăng nhập"
email: Email
- encrypted_password:
- failed_attempts:
- last_sign_in_at:
- last_sign_in_ip:
- locked_at:
+ encrypted_password: Mật khẩu mã hoá
+ failed_attempts: Số lần đăng nhập thất bại
+ last_sign_in_at: "Đăng nhập lần cuối"
+ last_sign_in_ip: "Địa chỉ IP đăng nhập lần cuối"
+ locked_at: Khoá lúc
password: Mật khẩu
password_confirmation: Xác nhận mật khẩu
- remember_created_at:
+ remember_created_at: Ghi nhớ được lưu lúc
remember_me: Ghi nhớ đăng nhập
- reset_password_sent_at:
- reset_password_token:
- sign_in_count:
- unconfirmed_email:
- unlock_token:
- updated_at:
+ reset_password_sent_at: Yêu cầu đặt lại mật khẩu gửi lúc
+ reset_password_token: Mã đặt lại mật khẩu
+ sign_in_count: Số lần đăng nhập
+ unconfirmed_email: Email chưa xác nhận
+ unlock_token: Mã mở khoá
+ updated_at: "Được cập nhật lúc"
models:
user: Người dùng
devise:
@@ -37,10 +37,10 @@
failure:
already_authenticated: Bạn đã đăng nhập.
inactive: Tài khoản của bạn chưa được kích hoạt.
- invalid:
+ invalid: Tài khoản hay mật khẩu %{authentication_keys} không hợp lệ
last_attempt: Bạn còn một lần thử đăng nhập nữa trước khi tài khoản của
bạn bị khóa.
locked: Tài khoản của bạn đã bị khóa.
- not_found_in_database:
+ not_found_in_database: Tài khoản hay mật khẩu %{authentication_keys}
không hợp lệ
timeout: Phiên làm việc của bạn đã kết thúc, bạn cần đăng nhập lại để
tiếp tục.
unauthenticated: Bạn cần phải đăng nhập hoặc đăng ký trước khi tiếp tục.
unconfirmed: Bạn cần phải xác nhận tài khoản trước khi tiếp tục.
@@ -51,9 +51,9 @@
instruction: 'Bạn có thể xác nhận tài khoản email bằng liên kết dưới
đây:'
subject: Hướng dẫn xác nhận tài khoản
password_change:
- greeting:
- message:
- subject:
+ greeting: Xin chào %{recipient}!
+ message: 'Chúng tôi thông báo với bạn là mật khẩu của bạn đã được thay
đổi. '
+ subject: 'Mật khẩu đã được thay đổi. '
reset_password_instructions:
action: Thay đổi mật khẩu
greeting: Xin chào %{recipient}!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/rails/locales/zh-CN.yml new/rails/locales/zh-CN.yml
--- old/rails/locales/zh-CN.yml 2017-12-08 23:55:40.000000000 +0100
+++ new/rails/locales/zh-CN.yml 2018-02-01 03:27:29.000000000 +0100
@@ -40,7 +40,7 @@
invalid: "%{authentication_keys}或密码错误。"
last_attempt: "您还有最后一次尝试机会，再次失败您的帐户将被锁定。"
locked: "您的帐户正被锁定。"
- not_found_in_database: "%{authentication_keys}地址或密码错误。"
+ not_found_in_database: "%{authentication_keys}或密码错误。"
timeout: "登录超时，请重新登录。"
unauthenticated: "继续操作前请确保您已登录。"
unconfirmed: "继续操作前请先确认您的帐户。"
