diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 03:34:58 +0100 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-22 03:34:58 +0100 |
| commit | acfee0945cb2b552be71e7c33b437ca6e8e8d988 (patch) | |
| tree | 3231f9e1a226ecaaa1de531cfae4f91ca320c0b7 /app/assets/javascripts | |
| parent | 05cf086766396745219582951f9b792ac5ed2bfb (diff) | |
| parent | 8aae42f3d8033d4a71774127a3e1a60013a54196 (diff) | |
Merge branch 'master' into feature-omnisearch
this merge is necessary,
Diffstat (limited to 'app/assets/javascripts')
| -rw-r--r-- | app/assets/javascripts/components/locales/de.jsx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/components/locales/de.jsx b/app/assets/javascripts/components/locales/de.jsx index 7d32824f1..882c31fa7 100644 --- a/app/assets/javascripts/components/locales/de.jsx +++ b/app/assets/javascripts/components/locales/de.jsx @@ -39,7 +39,7 @@ const en = { "tabs_bar.public": "Gesamtes Netz", "tabs_bar.notifications": "Mitteilungen", "compose_form.placeholder": "Worüber möchstest du schreiben?", - "compose_form.publish": "Veröffentlichen", + "compose_form.publish": "Tröt", "compose_form.sensitive": "Medien als sensitiv markieren", "compose_form.unlisted": "Öffentlich nicht auflisten", "compose_form.private": "Als privat markieren", |