diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
| commit | 7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch) | |
| tree | ef366f436ed5180489cc9377268e10328fe9a932 /config/locales/simple_form.sk.yml | |
| parent | 02f1c04fabab221130de8dfb5611be81825b193b (diff) | |
| parent | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.
Diffstat (limited to 'config/locales/simple_form.sk.yml')
| -rw-r--r-- | config/locales/simple_form.sk.yml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/config/locales/simple_form.sk.yml b/config/locales/simple_form.sk.yml index c10df08d0..b8d3dd7a9 100644 --- a/config/locales/simple_form.sk.yml +++ b/config/locales/simple_form.sk.yml @@ -72,6 +72,7 @@ sk: acct: Adresa nového účtu account_warning_preset: text: Text predlohy + title: Názov admin_account_action: include_statuses: Zahrnúť nahlásené príspevky v emaile send_email_notification: Oznam užívateľovi cez email @@ -83,6 +84,11 @@ sk: silence: Utíš suspend: Vylúč a nenávratne vymaž dáta na účte warning_preset_id: Použi varovnú predlohu + announcement: + all_day: Celodenná udalosť + ends_at: Koniec udalosti + starts_at: Začiatok udalosti + text: Oboznámenie defaults: autofollow: Pozvi k následovaniu tvojho profilu avatar: Maskot |