aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@nokia.com>2011-08-15 12:51:16 +0200
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-08-15 16:37:14 +0200
commit47f6cb398ac6d73d015cdcf2f5757c889b454732 (patch)
tree2636708f388813e01202446aae570c03fad54ee7 /src
parent6958fbbe6880e5c14702bc578b0523dddff245b3 (diff)
Fix translation of external tools.
Change-Id: I21541c579f3be75537763ad65b63f6804c329e50 Reviewed-on: http://codereview.qt.nokia.com/2951 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/coreplugin/externaltool.cpp4
-rw-r--r--src/share/qtcreator/externaltools/lrelease.xml3
-rw-r--r--src/share/qtcreator/externaltools/lupdate.xml3
-rw-r--r--src/share/qtcreator/externaltools/notepad_win.xml3
-rw-r--r--src/share/qtcreator/externaltools/sort.xml3
-rw-r--r--src/share/qtcreator/externaltools/vi.xml3
-rw-r--r--src/share/qtcreator/externaltools/vi_mac.xml3
7 files changed, 3 insertions, 19 deletions
diff --git a/src/plugins/coreplugin/externaltool.cpp b/src/plugins/coreplugin/externaltool.cpp
index eba664430c..2681ebb2f0 100644
--- a/src/plugins/coreplugin/externaltool.cpp
+++ b/src/plugins/coreplugin/externaltool.cpp
@@ -45,6 +45,7 @@
#include <utils/environment.h>
#include <utils/fileutils.h>
+#include <QtCore/QCoreApplication>
#include <QtCore/QXmlStreamReader>
#include <QtCore/QXmlStreamWriter>
#include <QtCore/QDir>
@@ -316,7 +317,8 @@ static void localizedText(const QStringList &locales, QXmlStreamReader *reader,
}
} else {
if (*currentLocale < 0 && currentText->isEmpty()) {
- *currentText = reader->readElementText();
+ *currentText = QCoreApplication::translate("Core::Internal::ExternalTool",
+ reader->readElementText().toLatin1().constData());
} else {
reader->skipCurrentElement();
}
diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml
index 6f36e39e25..d7159c496f 100644
--- a/src/share/qtcreator/externaltools/lrelease.xml
+++ b/src/share/qtcreator/externaltools/lrelease.xml
@@ -31,11 +31,8 @@
-->
<externaltool id="lrelease">
<description>Creates qm translation files that can be used by an application from the translator's ts files</description>
- <description xml:lang="de">Erstellt die von Anwendungen nutzbaren qm-Dateien aus ts-Dateien von Übersetzern</description>
<displayname>Release Translations (lrelease)</displayname>
- <displayname xml:lang="de">Übersetzungen veröffentlichen (lrelease)</displayname>
<category>Linguist</category>
- <category xml:lang="de">Linguist</category>
<order>2</order>
<executable>
<path>%{CurrentProject:QT_INSTALL_BINS}/lrelease</path>
diff --git a/src/share/qtcreator/externaltools/lupdate.xml b/src/share/qtcreator/externaltools/lupdate.xml
index 483e4e4ed0..aa4081cb08 100644
--- a/src/share/qtcreator/externaltools/lupdate.xml
+++ b/src/share/qtcreator/externaltools/lupdate.xml
@@ -31,11 +31,8 @@
-->
<externaltool id="lupdate">
<description>Synchronizes translator's ts files with the program code</description>
- <description xml:lang="de">Synchronisiert die ts-Übersetzungsdateien mit dem Programmcode</description>
<displayname>Update Translations (lupdate)</displayname>
- <displayname xml:lang="de">Übersetzungen aktualisieren (lupdate)</displayname>
<category>Linguist</category>
- <category xml:lang="de">Linguist</category>
<order>1</order>
<executable>
<path>%{CurrentProject:QT_INSTALL_BINS}/lupdate</path>
diff --git a/src/share/qtcreator/externaltools/notepad_win.xml b/src/share/qtcreator/externaltools/notepad_win.xml
index d6723999f4..fd25d00789 100644
--- a/src/share/qtcreator/externaltools/notepad_win.xml
+++ b/src/share/qtcreator/externaltools/notepad_win.xml
@@ -31,11 +31,8 @@
-->
<externaltool id="notepad">
<description>Opens the current file in Notepad</description>
- <description xml:lang="de">Öffnet die aktuelle Datei in Notepad</description>
<displayname>Edit with Notepad</displayname>
- <displayname xml:lang="de">In Notepad öffnen</displayname>
<category>Text</category>
- <category xml:lang="de">Text</category>
<executable modifiesdocument="yes">
<path>notepad</path>
<arguments>"%{CurrentDocument:FilePath}"</arguments>
diff --git a/src/share/qtcreator/externaltools/sort.xml b/src/share/qtcreator/externaltools/sort.xml
index f73f4b1563..6b5d7d82ca 100644
--- a/src/share/qtcreator/externaltools/sort.xml
+++ b/src/share/qtcreator/externaltools/sort.xml
@@ -31,11 +31,8 @@
-->
<externaltool id="sort">
<description>Sorts the selected text</description>
- <description xml:lang="de">Sortiert den ausgewählten Text</description>
<displayname>Sort Selection</displayname>
- <displayname xml:lang="de">Auswahl Sortieren</displayname>
<category>Text</category>
- <category xml:lang="de">Text</category>
<executable output="replaceselection" error="ignore">
<path>sort</path>
<input>%{CurrentDocument:Selection}</input>
diff --git a/src/share/qtcreator/externaltools/vi.xml b/src/share/qtcreator/externaltools/vi.xml
index 8bbb55ae49..57fc2dbaec 100644
--- a/src/share/qtcreator/externaltools/vi.xml
+++ b/src/share/qtcreator/externaltools/vi.xml
@@ -31,11 +31,8 @@
-->
<externaltool id="vi">
<description>Opens the current file in vi</description>
- <description xml:lang="de">Öffnet die aktuelle Datei in vi</description>
<displayname>Edit with vi</displayname>
- <displayname xml:lang="de">In vi öffnen</displayname>
<category>Text</category>
- <category xml:lang="de">Text</category>
<executable modifiesdocument="yes">
<path>xterm</path>
<arguments>-geom %{CurrentDocument:ColumnCount}x%{CurrentDocument:RowCount}+%{CurrentDocument:XPos}+%{CurrentDocument:YPos} -e vi "%{CurrentDocument:FilePath}" +%{CurrentDocument:Row}</arguments>
diff --git a/src/share/qtcreator/externaltools/vi_mac.xml b/src/share/qtcreator/externaltools/vi_mac.xml
index 50c3533c20..0533e8bf54 100644
--- a/src/share/qtcreator/externaltools/vi_mac.xml
+++ b/src/share/qtcreator/externaltools/vi_mac.xml
@@ -31,11 +31,8 @@
-->
<externaltool id="vi">
<description>Opens the current file in vi</description>
- <description xml:lang="de">Öffnet die aktuelle Datei in vi</description>
<displayname>Edit with vi</displayname>
- <displayname xml:lang="de">In vi öffnen</displayname>
<category>Text</category>
- <category xml:lang="de">Text</category>
<executable modifiesdocument="yes">
<path>osascript</path>
<input>