diff options
| author | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-03-03 16:10:04 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2016-03-03 16:10:04 +0100 |
| commit | f4e87a7e0cbc62738bc00733a3655486c9a26959 (patch) | |
| tree | 768e41482b57f0b37813b4b5b888c8aae51b230e /share | |
| parent | 0aeb654685c24c528dd482c799cad8e008c130ef (diff) | |
| parent | fc5768212021f7fb9f5af2389b1bdeefed5ca4a6 (diff) | |
| download | qt-creator-f4e87a7e0cbc62738bc00733a3655486c9a26959.tar.gz | |
Merge remote-tracking branch 'origin/3.6' into 4.0
Conflicts:
src/plugins/projectexplorer/applicationlauncher.cpp
src/plugins/projectexplorer/applicationlauncher.h
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
src/plugins/qmlprofiler/qmlprofilertool.cpp
src/plugins/qtsupport/uicodemodelsupport.cpp
src/plugins/qtsupport/uicodemodelsupport.h
Change-Id: I6f6ae77422d99f4f422b108ade6b64273df9dd57
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 97485a8869..87007a4299 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -4556,7 +4556,7 @@ Jetzt Commit durchführen?</translation> </message> <message> <source>Amend Last Commit...</source> - <translation>Letzte Abgabe ändern...</translation> + <translation>Letzten Commit ändern...</translation> </message> <message> <source>Push</source> @@ -30960,7 +30960,7 @@ Bitte erstellen Sie die Anwendung qmldump auf der Einstellungsseite der Qt-Versi </message> <message> <source>Replace All</source> - <translation>Alles ersetzen</translation> + <translation>Alle ersetzen</translation> </message> <message> <source>Case Sensitive</source> |