diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-26 16:02:54 +0100 |
| commit | b9f314bba754074c7ac7dad37cdd35a0cbf1d1b5 (patch) | |
| tree | 987f8ceff468686d7f4185cf2312e56aed45ecd1 /config/locales/activerecord.th.yml | |
| parent | 648cf8bfd51913929b7d0d3a637de496d6e40f89 (diff) | |
| parent | 0c1a05b281c2665b52a644d51b9b06c2756479a7 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml
Diffstat (limited to 'config/locales/activerecord.th.yml')
| -rw-r--r-- | config/locales/activerecord.th.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/activerecord.th.yml b/config/locales/activerecord.th.yml index 2a41f4bce..7890ed80c 100644 --- a/config/locales/activerecord.th.yml +++ b/config/locales/activerecord.th.yml @@ -6,8 +6,8 @@ th: account: attributes: username: - invalid: only letters, numbers and underscores + invalid: ตัวอักษร, ตัวเลข และขีดล่างเท่านั้น status: attributes: reblog: - taken: of status already exists + taken: มีสถานะอยู่แล้ว |