diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-11-06 18:49:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-06 18:49:46 +0100 |
| commit | 54101563bbadbfafd9291a867d7fbea6df3a8b7b (patch) | |
| tree | fcf9a125f6ebc3ad4182fa0edcbd7101b33aebb0 /config/locales/activerecord.de.yml | |
| parent | 2f8fb49d1314db931385089bc9004a48700161ad (diff) | |
| parent | 21d6bc16893a9dd24c5ef54cf2f554846c8eca5b (diff) | |
Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
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: |