about summary refs log tree commit diff
path: root/config/locales/activerecord.ja.yml
diff options
context:
space:
mode:
authorReverite <github@reverite.sh>2019-04-01 13:28:33 -0700
committerReverite <github@reverite.sh>2019-04-01 13:28:33 -0700
commitff736905fa534f7189e57c1d0c14fbac45f239a1 (patch)
tree4502f6d993ba60bd4ab68f41a53a642901d244fd /config/locales/activerecord.ja.yml
parent4d77314005483e53e320a82c87805c6bcca1c463 (diff)
parent3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (diff)
Merge branch 'glitch' into production
Diffstat (limited to 'config/locales/activerecord.ja.yml')
-rw-r--r--config/locales/activerecord.ja.yml7
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: は既にブーストされています