diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-04-01 21:28:31 +0200 |
| commit | 12dae9d58316bec32adaac016998ab1cf69d2b45 (patch) | |
| tree | 4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46 /config/locales/activerecord.ja.yml | |
| parent | 925830d11bb5c132e282f82bdb2ca893d87c9c24 (diff) | |
| parent | 120544067fcca4bf6e71ba1ffb276c451c17c656 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml
Diffstat (limited to 'config/locales/activerecord.ja.yml')
| -rw-r--r-- | config/locales/activerecord.ja.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/config/locales/activerecord.ja.yml b/config/locales/activerecord.ja.yml index 7bc4fc308..c3b4b7484 100644 --- a/config/locales/activerecord.ja.yml +++ b/config/locales/activerecord.ja.yml @@ -2,6 +2,9 @@ ja: activerecord: attributes: + poll: + expires_at: 期限 + options: 選択肢 user: email: メールアドレス errors: @@ -9,8 +12,8 @@ ja: account: attributes: username: - invalid: アルファベット・数値・アンダーバー(_)で入力してください + invalid: アルファベット・数字・アンダーバーの組み合わせで入力してください status: attributes: reblog: - taken: のブーストはすでに存在します + taken: は既にブーストされています |