aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--share/qtcreator/translations/qtcreator_de.ts4
-rw-r--r--share/qtcreator/translations/qtcreator_es.ts4
-rw-r--r--share/qtcreator/translations/qtcreator_fr.ts2
-rw-r--r--share/qtcreator/translations/qtcreator_it.ts4
-rw-r--r--share/qtcreator/translations/qtcreator_ja.ts4
-rw-r--r--share/qtcreator/translations/qtcreator_pl.ts2
-rw-r--r--share/qtcreator/translations/qtcreator_ru.ts4
-rw-r--r--share/qtcreator/translations/qtcreator_sl.ts2
-rw-r--r--src/plugins/projectexplorer/toolchain.cpp2
-rw-r--r--src/plugins/qt4projectmanager/qtversionmanager.ui2
10 files changed, 15 insertions, 15 deletions
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index caa3800c81..a5241007a0 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -11926,8 +11926,8 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
</message>
<message>
<location/>
- <source>MinGw Directory:</source>
- <translation>MinGw-Verzeichnis:</translation>
+ <source>MinGW Directory:</source>
+ <translation>MinGW-Verzeichnis:</translation>
</message>
<message>
<location/>
diff --git a/share/qtcreator/translations/qtcreator_es.ts b/share/qtcreator/translations/qtcreator_es.ts
index d8b3243651..06a78c52d7 100644
--- a/share/qtcreator/translations/qtcreator_es.ts
+++ b/share/qtcreator/translations/qtcreator_es.ts
@@ -11067,8 +11067,8 @@ al control de versiones (%2)?</translation>
</message>
<message>
<location/>
- <source>MinGw Directory:</source>
- <translation>Directorio de MinGw:</translation>
+ <source>MinGW Directory:</source>
+ <translation>Directorio de MinGW:</translation>
</message>
<message>
<location/>
diff --git a/share/qtcreator/translations/qtcreator_fr.ts b/share/qtcreator/translations/qtcreator_fr.ts
index 60d3782051..9144b67c1e 100644
--- a/share/qtcreator/translations/qtcreator_fr.ts
+++ b/share/qtcreator/translations/qtcreator_fr.ts
@@ -10356,7 +10356,7 @@ to version control (%2)?</source>
</message>
<message>
<location/>
- <source>MinGw Directory:</source>
+ <source>MinGW Directory:</source>
<translation type="unfinished"></translation>
</message>
<message>
diff --git a/share/qtcreator/translations/qtcreator_it.ts b/share/qtcreator/translations/qtcreator_it.ts
index 9448a8bbab..6e9d078121 100644
--- a/share/qtcreator/translations/qtcreator_it.ts
+++ b/share/qtcreator/translations/qtcreator_it.ts
@@ -11037,8 +11037,8 @@ al VCS (%2)?</translation>
</message>
<message>
<location/>
- <source>MinGw Directory:</source>
- <translation>Cartella MinGw:</translation>
+ <source>MinGW Directory:</source>
+ <translation>Cartella MinGW:</translation>
</message>
<message>
<location/>
diff --git a/share/qtcreator/translations/qtcreator_ja.ts b/share/qtcreator/translations/qtcreator_ja.ts
index 504eecda75..8500b11a9d 100644
--- a/share/qtcreator/translations/qtcreator_ja.ts
+++ b/share/qtcreator/translations/qtcreator_ja.ts
@@ -11041,8 +11041,8 @@ to version control (%2)?</source>
</message>
<message>
<location/>
- <source>MinGw Directory:</source>
- <translation>MinGw ディレクトリ:</translation>
+ <source>MinGW Directory:</source>
+ <translation>MinGW ディレクトリ:</translation>
</message>
<message>
<location/>
diff --git a/share/qtcreator/translations/qtcreator_pl.ts b/share/qtcreator/translations/qtcreator_pl.ts
index 327192d7a8..f45b49cf79 100644
--- a/share/qtcreator/translations/qtcreator_pl.ts
+++ b/share/qtcreator/translations/qtcreator_pl.ts
@@ -2803,7 +2803,7 @@ p, li { white-space: pre-wrap; }
</message>
<message>
<location/>
- <source>MinGw Directory:</source>
+ <source>MinGW Directory:</source>
<translation>Katalog MinGW:</translation>
</message>
<message>
diff --git a/share/qtcreator/translations/qtcreator_ru.ts b/share/qtcreator/translations/qtcreator_ru.ts
index 4f9df2aac0..f90641eda2 100644
--- a/share/qtcreator/translations/qtcreator_ru.ts
+++ b/share/qtcreator/translations/qtcreator_ru.ts
@@ -12389,8 +12389,8 @@ to version control (%2)?</source>
</message>
<message>
<location/>
- <source>MinGw Directory:</source>
- <translation>Каталог MinGw:</translation>
+ <source>MinGW Directory:</source>
+ <translation>Каталог MinGW:</translation>
</message>
<message>
<location/>
diff --git a/share/qtcreator/translations/qtcreator_sl.ts b/share/qtcreator/translations/qtcreator_sl.ts
index 46217312b6..196b3d4641 100644
--- a/share/qtcreator/translations/qtcreator_sl.ts
+++ b/share/qtcreator/translations/qtcreator_sl.ts
@@ -10770,7 +10770,7 @@ v sistem za nadzor različic (%2)?</translation>
</message>
<message>
<location/>
- <source>MinGw Directory:</source>
+ <source>MinGW Directory:</source>
<translation>Mapa z MinGW:</translation>
</message>
<message>
diff --git a/src/plugins/projectexplorer/toolchain.cpp b/src/plugins/projectexplorer/toolchain.cpp
index 7626445a8d..6c3236d28f 100644
--- a/src/plugins/projectexplorer/toolchain.cpp
+++ b/src/plugins/projectexplorer/toolchain.cpp
@@ -114,7 +114,7 @@ QString ToolChain::toolChainName(ToolChainType tc)
case LinuxICC:
return QCoreApplication::translate("ToolChain", "Intel C++ Compiler (Linux)");
case MinGW:
- return QCoreApplication::translate("ToolChain", "MinGW");
+ return QString::fromLatin1("MinGW");
case MSVC:
return QCoreApplication::translate("ToolChain", "Microsoft Visual C++");
case WINCE:
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.ui b/src/plugins/qt4projectmanager/qtversionmanager.ui
index 898125fa11..4c5f6acf25 100644
--- a/src/plugins/qt4projectmanager/qtversionmanager.ui
+++ b/src/plugins/qt4projectmanager/qtversionmanager.ui
@@ -179,7 +179,7 @@ p, li { white-space: pre-wrap; }
<item row="3" column="0">
<widget class="QLabel" name="mingwLabel">
<property name="text">
- <string>MinGw Directory:</string>
+ <string>MinGW Directory:</string>
</property>
</widget>
</item>