diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
| commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
| tree | a8a0df2129a863a739dda6399352d64af811110e /config/locales/simple_form.nl.yml | |
| parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
| parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'config/locales/simple_form.nl.yml')
| -rw-r--r-- | config/locales/simple_form.nl.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/config/locales/simple_form.nl.yml b/config/locales/simple_form.nl.yml index 77445b0cb..5c417c84e 100644 --- a/config/locales/simple_form.nl.yml +++ b/config/locales/simple_form.nl.yml @@ -78,7 +78,7 @@ nl: text: Aangepaste waarschuwing type: Actie types: - disable: Uitschakelen + disable: Inloggen uitschakelen none: Niets doen silence: Negeren suspend: Opschorten en onomkeerbaar accountgegevens verwijderen @@ -113,6 +113,7 @@ nl: setting_aggregate_reblogs: Boosts in tijdlijnen groeperen setting_auto_play_gif: Speel geanimeerde GIF's automatisch af setting_boost_modal: Vraag voor het boosten van een toot een bevestiging + setting_crop_images: Afbeeldingen tot 16x9 besnijden in niet uitgebreide toots setting_default_language: Taal van jouw toots setting_default_privacy: Standaardzichtbaarheid van jouw toots setting_default_sensitive: Media altijd als gevoelig markeren |