diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
tree | 766214b52ed217903ae821285391f8e2d4b5f545 /config/locales/nl.yml | |
parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'config/locales/nl.yml')
-rw-r--r-- | config/locales/nl.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 692a298e2..190cbee66 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -514,6 +514,7 @@ nl: '86400': 1 dag expires_in_prompt: Nooit generate: Genereren + invited_by: 'Jij bent uitgenodigd door:' max_uses: one: 1 keer other: "%{count} keer" @@ -674,6 +675,7 @@ nl: disallowed_hashtags: one: 'bevatte een niet toegestane hashtag: %{tags}' other: 'bevatte niet toegestane hashtags: %{tags}' + language_detection: Taal automatisch detecteren open_in_web: In de webapp openen over_character_limit: Limiet van %{max} tekens overschreden pin_errors: |