diff options
| author | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
| commit | f95637178671b1aa0648fa506231717229a6cd8f (patch) | |
| tree | fbaa725bcdb88220c5d1e299b338b196822460e5 /config/locales/activerecord.zh-TW.yml | |
| parent | 2c6fcb9cf8fbb09e900fc3625837529155f98f4f (diff) | |
| parent | db5baf3d1a93cbf6961f721205cff0beaf71bffd (diff) | |
Merge branch 'glitch'
Conflicts: yarn.lock: caniuse-lite has been outdated in upstream for awhile, and we fixed it a few weeks ago in our fork
Diffstat (limited to 'config/locales/activerecord.zh-TW.yml')
| -rw-r--r-- | config/locales/activerecord.zh-TW.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/activerecord.zh-TW.yml b/config/locales/activerecord.zh-TW.yml index 2e685868d..c6856c386 100644 --- a/config/locales/activerecord.zh-TW.yml +++ b/config/locales/activerecord.zh-TW.yml @@ -7,7 +7,7 @@ zh-TW: options: 選擇 user: agreement: 服務同意書 - email: 電子信箱位址 + email: 電子信箱地址 locale: 地區 password: 密碼 user/account: |