diff --git a/doc/qtcreator/src/reference/creator-sdk-tool.qdoc b/doc/qtcreator/src/reference/creator-sdk-tool.qdoc index 546b5fdf22c..27f22f1bbce 100644 --- a/doc/qtcreator/src/reference/creator-sdk-tool.qdoc +++ b/doc/qtcreator/src/reference/creator-sdk-tool.qdoc @@ -90,28 +90,28 @@ \li Operation \li Description \row - \li addAbiFlavor + \li \l {addAbiFlavor} \li Add a system architecture (ABI). \row - \li \c {addCMake} + \li \l {addCMake} \li Add the path to a CMake tool. \row - \li \c {addDebugger} + \li \l {addDebugger} \li Add a debugger. \row - \li \c {addDev} + \li \l {addDev} \li Add a device. \row \li \c {addKeys} \li Add settings as \c { :} key-value pairs. \row - \li \c {addKit} + \li \l {addKit} \li Add a build and run kit. \row - \li \c {addQt} + \li \l {addQt} \li Add a Qt version. \row - \li \c {addTC} + \li \l {addTC} \li Add a compiler. \row \li \c {find} diff --git a/share/qtcreator/translations/CMakeLists.txt b/share/qtcreator/translations/CMakeLists.txt index f32138e7791..32152d8cdff 100644 --- a/share/qtcreator/translations/CMakeLists.txt +++ b/share/qtcreator/translations/CMakeLists.txt @@ -1,4 +1,4 @@ -set(languages cs da de fr hr ja pl ru sl uk zh_CN zh_TW) +set(languages cs da de en fr hr ja pl ru sl uk zh_CN zh_TW) set(bad_languages hu) # Fix these before including them in languages! find_package(Python3 COMPONENTS Interpreter) diff --git a/share/qtcreator/translations/qtcreator_en.ts b/share/qtcreator/translations/qtcreator_en.ts new file mode 100644 index 00000000000..3524a5f1146 --- /dev/null +++ b/share/qtcreator/translations/qtcreator_en.ts @@ -0,0 +1,50 @@ + + + + + + + + + QtC::Lua + + Allow the extension "%1" to fetch datafrom the following URL: + + + Allow the extension "%1" to fetch data from the following URL: + + + + + + QtC::RemoteLinux + + Enable debugging on remote targes which cannot expose gdbserver ports. +The ssh tunneling is used to map the remote gdbserver port to localhost. +The local and remote ports are determined automatically. + Enable debugging on remote targets which cannot expose gdbserver ports. +The SSH tunneling is used to map the remote gdbserver port to localhost. +The local and remote ports are determined automatically. + + + diff --git a/src/app/main.cpp b/src/app/main.cpp index 35a18da7ca9..629e3ed98ae 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -785,11 +785,13 @@ int main(int argc, char **argv) break; } Q_UNUSED(translator.load(QString())); // unload() - } else if (locale == QLatin1String("C") /* overrideLanguage == "English" */) { - // use built-in - break; - } else if (locale.startsWith(QLatin1String("en")) /* "English" is built-in */) { - // use built-in + } else if ( + locale == QLatin1String("C") /* overrideLanguage == "English" */ + || locale.startsWith(QLatin1String("en")) /* "English" is built-in */) { + // Load any spelling fixes that might have been done temporarily after string freeze, + // for the rest use the built-in source text + if (translator.load("qtcreator_en", creatorTrPath)) + app.installTranslator(&translator); break; } }