diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-01-09 13:07:57 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-01-09 13:13:00 +0100 |
| commit | cff2cc90e21c7ef4d363d459be9ad6cf17b9b494 (patch) | |
| tree | fc37439466f7ccf6a8bbfc4bb64e1ab21bfa4c21 /share | |
| parent | b1239d6c4c77814c62598469bc1588b43c690acc (diff) | |
| parent | 32786ea9cadb4329b09dae2f825e61dcbd9fcc75 (diff) | |
Merge remote-tracking branch 'origin/4.5'
Conflicts:
src/plugins/cpptools/clangcompileroptionsbuilder.cpp
src/plugins/cpptools/clangcompileroptionsbuilder.h
src/plugins/cpptools/compileroptionsbuilder.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
src/plugins/qmlprofiler/qmlprofilerclientmanager.h
src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
src/plugins/qmlprofiler/qmlprofilertraceclient.h
src/shared/qbs
Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010
Diffstat (limited to 'share')
| -rw-r--r-- | share/qtcreator/themes/dark.creatortheme | 2 | ||||
| -rw-r--r-- | share/qtcreator/translations/qtcreator_ru.ts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qtcreator/themes/dark.creatortheme b/share/qtcreator/themes/dark.creatortheme index 1b15cd2db5..545d662548 100644 --- a/share/qtcreator/themes/dark.creatortheme +++ b/share/qtcreator/themes/dark.creatortheme @@ -176,7 +176,7 @@ Timeline_RangeColor=selectedBackground VcsBase_FileStatusUnknown_TextColor=text VcsBase_FileAdded_TextColor=ff00ff00 VcsBase_FileModified_TextColor=ff8ee0ff -VcsBase_FileDeleted_TextColor=fffff6c6c +VcsBase_FileDeleted_TextColor=ffff6c6c VcsBase_FileRenamed_TextColor=ffffa500 VcsBase_FileUnmerged_TextColor=ffff4040 diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index c215f4ba9d..7c0d2dfd5e 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -35841,7 +35841,7 @@ For more details, see /etc/sysctl.d/10-ptrace.conf </message> <message> <source>No compiler can produce code for this Qt version. Please define one or more compilers for: %1</source> - <translation>Компилятор не может создавть код для этого профиля Qt. Задайте минимум один компилятор для: %1</translation> + <translation>Компилятор не может создавать код для этого профиля Qt. Задайте минимум один компилятор для: %1</translation> </message> <message> <source>The following ABIs are currently not supported: %1</source> |