diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-10-29 14:00:41 +0100 |
| commit | a942ad3062285b6b4984fe92f9bd610829f04456 (patch) | |
| tree | 2476b65436959dda09871ee96edca53b53201b96 /config/locales/th.yml | |
| parent | 7f22ed0fc912ffbd94e0df4e0d40750dae542b97 (diff) | |
| parent | 32f950a7a8d3acfed43d76cb21d0fc06a471bafe (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - config/locales/simple_form.ja.yml Not a real conflict, one new string was introduced in glitch and one in upstream.
Diffstat (limited to 'config/locales/th.yml')
| -rw-r--r-- | config/locales/th.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/th.yml b/config/locales/th.yml index 44ed5b99e..b0b8e9ba0 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -224,6 +224,7 @@ th: too_many: แนบมากกว่า 4 ไฟล์ไม่ได้ notification_mailer: digest: + body: Here is a brief summary of the messages you missed since your last visit on %{since} mention: "%{name} ส่งข้อความถึงคุณ:" new_followers_summary: one: ยินดีด้วยคุณได้ผู้ติดตามคนใหม่! Yay! |