diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-09-19 21:46:01 +0200 |
commit | 91bef4759f40422b64d7990f9b90db0b493773b1 (patch) | |
tree | 3211b1014a6d0a88737db16c44d210ef96a070e4 /config/locales/simple_form.da.yml | |
parent | 382cdd7f959480d59fee5646be320d6076cb18d8 (diff) | |
parent | 554f659f2aa1eb9c0ca64ec1c9c177538434826c (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: Vagrantfile app/javascript/packs/public.js app/views/admin/settings/edit.html.haml app/views/settings/preferences/show.html.haml app/views/settings/profiles/show.html.haml config/locales/es.yml config/locales/simple_form.en.yml config/webpack/configuration.js config/webpack/loaders/babel.js package.json yarn.lock Split new additions to app/javascript/packs/public.js to app/javascript/core/settings.js
Diffstat (limited to 'config/locales/simple_form.da.yml')
-rw-r--r-- | config/locales/simple_form.da.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/simple_form.da.yml b/config/locales/simple_form.da.yml index a5697220e..dfa440aae 100644 --- a/config/locales/simple_form.da.yml +++ b/config/locales/simple_form.da.yml @@ -67,7 +67,7 @@ da: setting_boost_modal: Vis bekræftelses dialog før du fremhæver setting_default_language: Sprog for opslag setting_default_privacy: Privatliv - setting_default_sensitive: Marker altid multimedia som værende følsomt + setting_default_sensitive: Marker altid medier som værende følsomt setting_delete_modal: Vis bekræftelses dialog før du sletter et trut setting_display_sensitive_media: Vis altid multimedier markeret som værende følsomt setting_hide_network: Skjul dit netværk @@ -92,6 +92,7 @@ da: follow_request: Send email når nogen anmoder om at følge dig mention: Send e-mail når nogen nævner dig reblog: Send email når nogen fremhæver din status + report: Send email når en ny anmeldelse bliver indsendt 'no': Nej required: mark: "*" |