diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-27 20:17:12 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2017-11-27 20:17:12 +0000 |
commit | 63d47e04c4b22fc5caf5e6f4d0156040c91339fe (patch) | |
tree | 49d101afef2356fc40040004142db4f9dedbc82e /config/locales/simple_form.ja.yml | |
parent | e77c3996a513a45e5cad368b0053459f303c60cb (diff) | |
parent | c6b7c772293ed1319dc57741487ce5bc774558a9 (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'config/locales/simple_form.ja.yml')
-rw-r--r-- | config/locales/simple_form.ja.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 48eaf79b2..bdeefa7e5 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -26,10 +26,12 @@ ja: data: データ display_name: 表示名 email: メールアドレス + expires_in: 有効期限 filtered_languages: 除外する言語 header: ヘッダー locale: 言語 locked: 非公開アカウントにする + max_uses: 使用できる回数 new_password: 新しいパスワード note: プロフィール otp_attempt: 二段階認証コード |