diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-08-26 13:52:12 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-26 14:23:24 +0200 |
commit | 36393e1d2b1ce82916bd43ca1068e34cea6f6e39 (patch) | |
tree | a18d7f5e7753ff40355d2a6d4ab9fb765ad4c263 /config/locales/cs.yml | |
parent | 2903f8f36b7c41b77de4ad6c8c5b0a6c0b2a7ace (diff) | |
parent | f37fafe30b5f6ff85ebf87fb622293a855877ee1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/views/layouts/application.html.haml Edited: app/helpers/application_helper.rb app/views/admin/domain_blocks/new.html.haml Conflict wasn't really one, just two changes too close to one another. Edition was to adapt the class names for themes to class names for skins and flavours. Also edited app/views/admin/domain_blocks/new.html.haml to strip the duplicate admin pack inclusion thing.
Diffstat (limited to 'config/locales/cs.yml')
-rw-r--r-- | config/locales/cs.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 9ae9c259c..5f1f415ec 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -414,6 +414,9 @@ cs: last_delivery: Poslední doručení title: WebSub topic: Téma + suspensions: + proceed: Pokračovat + title: Suspendovat účet %{acct} title: Administrace admin_mailer: new_report: |