diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts index b9bd7645749129341119019fe4a1bb8f5f83852f..64f22731eb29bdc0137d8d6ddcf5a537abb7b37e 100644 --- a/share/qtcreator/translations/qtcreator_ru.ts +++ b/share/qtcreator/translations/qtcreator_ru.ts @@ -25181,22 +25181,22 @@ Reason: %2</source> <message> <source>%1 Debug</source> <extracomment>Debug build configuration. We recommend not translating it.</extracomment> - <translation>%1 Отладка</translation> + <translation>%1 Debug</translation> </message> <message> <source>%1 Release</source> <extracomment>Release build configuration. We recommend not translating it.</extracomment> - <translation>%1 ВыпуÑк</translation> + <translation>%1 Release</translation> </message> <message> <source>Debug</source> <extracomment>Name of a debug build configuration to created by a project wizard. We recommend not translating it.</extracomment> - <translation>Отладка</translation> + <translation>Debug</translation> </message> <message> <source>Release</source> <extracomment>Name of a release build configuration to be created by a project wizard. We recommend not translating it.</extracomment> - <translation>ВыпуÑк</translation> + <translation>Release</translation> </message> </context> <context> diff --git a/share/qtcreator/translations/translations.pro b/share/qtcreator/translations/translations.pro index d73fe3b4b4d97e6384f57c2d7f90c389c38fa1e2..1fef3d013e11664691bca5ef5868d105a187dd80 100644 --- a/share/qtcreator/translations/translations.pro +++ b/share/qtcreator/translations/translations.pro @@ -70,6 +70,7 @@ QMAKE_EXTRA_TARGETS += check-ts isEqual(QMAKE_DIR_SEP, /) { commit-ts.commands = \ cd $$wd; \ + git add -N share/qtcreator/translations/*_??.ts && \ for f in `git diff-files --name-only share/qtcreator/translations/*_??.ts`; do \ $$LCONVERT -locations none -i \$\$f -o \$\$f; \ done; \ @@ -77,6 +78,7 @@ isEqual(QMAKE_DIR_SEP, /) { } else { commit-ts.commands = \ cd $$wd && \ + git add -N share/qtcreator/translations/*_??.ts && \ for /f usebackq %%f in (`git diff-files --name-only share/qtcreator/translations/*_??.ts`) do \ $$LCONVERT -locations none -i %%f -o %%f $$escape_expand(\\n\\t) \ cd $$wd && git add share/qtcreator/translations/*_??.ts && git commit diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 24ead38f09794263fe6de074f2700ed8d79cc16b..647fb54956cb5e502ccfd5db1f75b1c1122775b8 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -440,7 +440,8 @@ void ExamplesWelcomePage::openProject(const QString &projectFile, const QStringL if (project->needsConfiguration()) project->configureAsExampleProject(platforms); Core::ModeManager::activateModeType(Core::Constants::MODE_EDIT_TYPE); - Core::ICore::helpManager()->handleHelpRequest(help.toString()+QLatin1String("?view=split")); + if (help.isValid()) + Core::ICore::helpManager()->handleHelpRequest(help.toString() + QLatin1String("?view=split")); } if (!errorMessage.isEmpty()) QMessageBox::critical(Core::ICore::mainWindow(), tr("Failed to Open Project"), errorMessage);