diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-16 20:59:33 +0100 |
| commit | 4aa6aba6ee95ba37df7ca1d9c65f360b1b00ec04 (patch) | |
| tree | 7c90513d2576dba9d71ac069ca28ac7e4db72a28 /config/locales/nl.yml | |
| parent | 6af2300454c960ef83f7b7d31e9b829e0d5a8e38 (diff) | |
| parent | 735b8be2042a29fb10077aaab526832b95a041a9 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/services/remove_status_service.rb Conflict because we still handle the direct timeline. Took upstream changes, with that one extra function call. - config/locales/ca.yml Conflict because theme names were updated. Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/oc.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts. - config/locales/pl.yml Decided to *keep* the theme names even if they are useless to avoid future conflicts.
Diffstat (limited to 'config/locales/nl.yml')
| -rw-r--r-- | config/locales/nl.yml | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config/locales/nl.yml b/config/locales/nl.yml index e75d684f1..36a030fa4 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -706,6 +706,16 @@ nl: older: Ouder prev: Vorige truncate: "…" + polls: + errors: + already_voted: Je hebt al op deze poll gestemd + duplicate_options: bevat dubbele items + duration_too_long: ligt te ver in de toekomst + duration_too_short: is te kort van duur + expired: De poll is al beëindigd + over_character_limit: kan stuk voor stuk niet langer zijn dan %{max} tekens + too_few_options: moet meer dan één item bevatten + too_many_options: kan niet meer dan %{max} items bevatten preferences: languages: Talen other: Overig @@ -814,6 +824,11 @@ nl: ownership: Een toot van iemand anders kan niet worden vastgezet private: Alleen openbare toots kunnen worden vastgezet reblog: Een boost kan niet worden vastgezet + poll: + total_votes: + one: "%{count} stem" + other: "%{count} stemmen" + vote: Stemmen show_more: Meer tonen sign_in_to_participate: Meld je aan om aan dit gesprek mee te doen title: '%{name}: "%{quote}"' |