diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-07-31 22:21:15 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-01 00:18:13 +0200 |
| commit | c1c514ca703f3e11adfe41734345b5277e886c50 (patch) | |
| tree | d8e088898292ca6da0f979b9244781b2ce116c7e /config/locales/simple_form.th.yml | |
| parent | 88b593a63ff3d607d6f98553654c46bc7cfc0b7b (diff) | |
| parent | 13ac8ca66ab01c92e4ebcc7221efb3d474c9fd0b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”.
Diffstat (limited to 'config/locales/simple_form.th.yml')
| -rw-r--r-- | config/locales/simple_form.th.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/locales/simple_form.th.yml b/config/locales/simple_form.th.yml index 575b6a9f4..29491de0b 100644 --- a/config/locales/simple_form.th.yml +++ b/config/locales/simple_form.th.yml @@ -3,11 +3,11 @@ th: simple_form: hints: defaults: - avatar: PNG, GIF or JPG. At most 2MB. Will be downscaled to 400x400px + avatar: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px display_name: one: <span class="name-counter">1</span> character left other: <span class="name-counter">%{count}</span> characters left - header: PNG, GIF or JPG. At most 2MB. Will be downscaled to 700x335px + header: PNG, GIF or JPG. At most %{size}. Will be downscaled to %{dimensions}px locked: Requires you to manually approve followers and defaults post privacy to followers-only note: one: <span class="name-counter">1</span> character left |