diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-22 12:46:10 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-22 12:46:10 +0100 |
| commit | 8921888ce37494ff74716394f5187034b2d7cffd (patch) | |
| tree | 3518b62ee63deedd3bc50d9b7069d35836201536 /share | |
| parent | cf94a15379ad72d0892c76bbdeff1a117e49cf31 (diff) | |
| parent | fdb95299c67b195d46cd3b7a37ed5118809e9a57 (diff) | |
Merge remote-tracking branch 'origin/4.5' into 4.6
Conflicts:
src/shared/qbs
Change-Id: I5314559cbf188e4c339de44052c6e0c89d3c2aa6
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/translations/qtcreator_de.ts | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 56727a69ec7..3ff19d57aef 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -10840,7 +10840,7 @@ Dies ist unabhängig vom Wert der Eigenschaft "visible" in QML.</trans <name>TextEditor</name> <message> <source>Text Editor</source> - <translation>Text Editor</translation> + <translation>Texteditor</translation> </message> </context> <context> @@ -43079,7 +43079,7 @@ Bitte aktualisieren Sie Ihr Kit oder wählen Sie eine mkspec für qmake, die bes </message> <message> <source>Text Editor</source> - <translation>Text Editor</translation> + <translation>Texteditor</translation> </message> </context> <context> |