diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 09:50:41 +0100 |
| commit | 0ad919b19257b7d8eb447f7955030927d26cdbe6 (patch) | |
| tree | d78bd5ba447da166bb7d97a3df3e6d97902a5cdb /config/locales/activerecord.de.yml | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 5187e4e758b0636432d984d1a95a310cac536205 (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/javascript/mastodon/features/compose/components/poll_form.js`: glitch-soc change because of having changed the default number of available poll options. Applied upstream's changes while keeping glitch-soc's default number of poll options. - `public/oops.png`: We had a minor graphics change, probably not worth diverging from upstream. Took upstream version.
Diffstat (limited to 'config/locales/activerecord.de.yml')
| -rw-r--r-- | config/locales/activerecord.de.yml | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/locales/activerecord.de.yml b/config/locales/activerecord.de.yml index d3c013dc0..53a04e700 100644 --- a/config/locales/activerecord.de.yml +++ b/config/locales/activerecord.de.yml @@ -3,7 +3,7 @@ de: activerecord: attributes: poll: - expires_at: Frist + expires_at: Abstimmungsende options: Wahlmöglichkeiten user: agreement: Service-Vereinbarung @@ -20,7 +20,7 @@ de: attributes: username: invalid: nur Buchstaben, Ziffern und Unterstriche - reserved: ist reserviert + reserved: ist bereits vergeben admin/webhook: attributes: url: @@ -29,6 +29,10 @@ de: attributes: website: invalid: ist keine gültige URL + import: + attributes: + data: + malformed: ist fehlerhaft status: attributes: reblog: |