Merge remote-tracking branch 'origin/14.0'

Change-Id: If26b4607afe758e81feb334b7628797f8fd9c016

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> <TYPE>:<VALUE>} 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}

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)

share/qtcreator/translations/qtcreator_en.ts

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  This file is created by hand and should only be used to fix
+  spelling errors in the default english texts.
+  Do NOT use this file to change the meaning of strings,
+  because changes made in this file are NOT visible to translators
+  into other languages, which would result in the wrong meaning
+  still being translated into other languages.
+
+  The changes done in this file should be transferred to the tr()
+  calls before the string freeze for the next version of Qt Creator.
+  The source tags in existing translations should be adapted accordingly
+  to not loose the translation.
+-->
+<!DOCTYPE TS>
+<TS version="2.1" language="en">
+
+<!-- test entry
+<context>
+    <name>QtC::Core</name>
+    <message>
+        <source>Edit</source>
+        <translation>TEST!!!</translation>
+    </message>
+</context>
+-->
+
+<context>
+    <name>QtC::Lua</name>
+    <message>
+        <source>Allow the extension &quot;%1&quot; to fetch datafrom the following URL:
+
+</source>
+        <translation>Allow the extension &quot;%1&quot; to fetch data from the following URL:
+
+</translation>
+    </message>
+</context>
+<context>
+    <name>QtC::RemoteLinux</name>
+    <message>
+        <source>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.</source>
+        <translation>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.</translation>
+    </message>
+</context>
+</TS>

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" */) {
+        } else if (
-            // use built-in
+            locale == QLatin1String("C") /* overrideLanguage == "English" */
-            break;
+            || locale.startsWith(QLatin1String("en")) /* "English" is built-in */) {
-        } else if (locale.startsWith(QLatin1String("en")) /* "English" is built-in */) {
+            // Load any spelling fixes that might have been done temporarily after string freeze,
-            // use built-in
+            // for the rest use the built-in source text
+            if (translator.load("qtcreator_en", creatorTrPath))
+                app.installTranslator(&translator);
             break;
         }
     }