diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2017-06-15 11:05:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 11:05:43 -0400 |
| commit | 528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c (patch) | |
| tree | 71fa9b677ce72050dca3abc3c9243e6cf39e0278 /i18n/de.json | |
| parent | c0a0065472c199166d32b052dd328b0212f5b693 (diff) | |
| download | chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.gz chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.tar.bz2 chat-528f2dc6c3b7c7a100d9022f4f50dfe337e92f0c.zip | |
Merge release-3.10 into master (#6654)
* PLT-6787 Fixed being able to send a post before files finished uploading (#6617)
* Fix quick switcher for channels/users not stored locally (#6610)
* Fix button text on confirm mention modal (#6609)
* fix post delete permission of channel admin (#6608)
* open comment thread for the most recent reply-able message (#6605)
* Use mutex flag with yarn to prevent concurrent builds interfering (#6619)
* Use mutex flag with yarn to prevent concurrent builds interfering
* Remove yarn mutex file with clean
* Minor bug fixes (#6615)
* PLT-6774 - Fixing color for offline icon
* PLT-6784 - Fixing status icon
* Fixing icon margin
* Updating caret position
* PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620)
* Fixing JS error (#6623)
* Minor bug fixes (#6622)
* PLT-6808 - Updating channel switcher on mobile
* PLT-6743 - Updating scrollbar styling
* Login instead of failing if user exists in OAuth sign-up flow (#6627)
* PLT-6802 Disable team switcher (#6626)
* Disable team switcher
* Fix ESLint errors
* PLT-6807 Ensured select teams page can scroll on iOS (#6630)
* Do not redirect from account switch pages on 401 (#6631)
* Fixing loadtest command and renaming to /test (#6624)
* PLT-6820 Update mattermost-redux dependency (#6632)
* translations PR 20170612 (#6629)
* Bump HTTP client timeout to 30 seconds (#6633)
* For team unreads return empty array instead of null (#6636)
* PLT-6831 Fix status modal localization IDs (#6637)
* Fix status modal localization IDs
* Update test snapshot
Diffstat (limited to 'i18n/de.json')
| -rw-r--r-- | i18n/de.json | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/i18n/de.json b/i18n/de.json index 5c3664561..df1e65a73 100644 --- a/i18n/de.json +++ b/i18n/de.json @@ -225,7 +225,7 @@ }, { "id": "api.channel.create_group.bad_size.app_error", - "translation": "Gruppennachrichtenkanäle müssen aus mindestens 3 und nicht mehr als 8 Benutzer bestehen" + "translation": "Gruppennachrichtenkanäle müssen aus mindestens 3 und nicht mehr als 8 Benutzern bestehen" }, { "id": "api.channel.create_group.bad_user.app_error", @@ -2345,7 +2345,7 @@ }, { "id": "api.templates.welcome_body.app_download_info", - "translation": "Für das beste Erlebnis laden Sie die Anwendungen für PC, macOS, iOS und Android herunter:" + "translation": "Für das beste Erlebnis laden Sie die Apps für PC, macOS, iOS und Android herunter:" }, { "id": "api.templates.welcome_body.button", @@ -5217,7 +5217,7 @@ }, { "id": "store.sql_oauth.save_app.existing.app_error", - "translation": "Es muss Update für existierende Anwendung aufgerufen werden" + "translation": "Es muss Update für existierende App aufgerufen werden" }, { "id": "store.sql_oauth.save_app.save.app_error", |