diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:45:18 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:53 +0100 |
commit | 571d219bb917cefcca7419a0ad4e3889689d5f6a (patch) | |
tree | 6ab91adcb2c164fd027708e58f5fb96c52474007 /config/locales/nl.yml | |
parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
parent | 66436d08959998be20c6c6bf631177d8c1f3e0d1 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
Diffstat (limited to 'config/locales/nl.yml')
-rw-r--r-- | config/locales/nl.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 43a57424b..84d8099bc 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -104,6 +104,7 @@ nl: followers: Volgers followers_url: Volgers-URL follows: Volgt + header: Omslagfoto inbox_url: Inbox-URL ip: IP location: @@ -134,6 +135,7 @@ nl: push_subscription_expires: PuSH-abonnement verloopt op redownload: Avatar vernieuwen remove_avatar: Avatar verwijderen + remove_header: Omslagfoto verwijderen resend_confirmation: already_confirmed: Deze gebruiker is al bevestigd send: Verzend bevestigingsmail opnieuw @@ -152,7 +154,6 @@ nl: shared_inbox_url: Gedeelde inbox-URL show: created_reports: Door dit account aangemaakte rapportages - report: gerapporteerd targeted_reports: Over dit account aangemaakte rapportages silence: Negeren silenced: Genegeerd |