From e86e7f960d4314571e80ff103cf992444d257c6d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Tue, 16 Jun 2009 12:34:23 +0200
Subject: [PATCH] Fixed tr()-glitches, updated German translation. Acked-by: dt
<qtc-committer@nokia.com>
---
share/qtcreator/translations/qtcreator_de.ts | 47 ++++++++++++++++---
.../projectexplorer/environmenteditmodel.cpp | 16 +++----
2 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts
index 924a6591a2b..6c27a1b9629 100644
--- a/share/qtcreator/translations/qtcreator_de.ts
+++ b/share/qtcreator/translations/qtcreator_de.ts
@@ -3064,7 +3064,7 @@ p {
<translation type="obsolete">Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2</translation>
</message>
<message>
- <location line="+494"/>
+ <location line="+500"/>
<source>Unable to assign the value '%1' to '%2': %3</source>
<translation>Der Wert '%1' konnte nicht an '%2' zugewiesen werden: %3</translation>
</message>
@@ -6169,7 +6169,7 @@ Grund: %3</translation>
<translation>Das Kommando 'show' konnte nicht ausgeführt werden: %1: %2</translation>
</message>
<message>
- <location line="+143"/>
+ <location line="+149"/>
<source>Changes</source>
<translation>Änderungen</translation>
</message>
@@ -7227,7 +7227,7 @@ Make sure you use something like
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
in your .pro file.</source>
- <translation type="unfinished">g</translation>
+ <translation>g</translation>
</message>
<message>
<location filename="../../../src/tools/texteditor/mainwindow.cpp" line="+62"/>
@@ -8086,6 +8086,10 @@ Basisname der Bibliothek: %1</translation>
</context>
<context>
<name>ProjectExplorer::EnvironmentModel</name>
+ <message>
+ <source><UNSET></source>
+ <translation type="obsolete"><NICHT GESETZT></translation>
+ </message>
<message>
<location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+169"/>
<source>Variable</source>
@@ -8096,6 +8100,37 @@ Basisname der Bibliothek: %1</translation>
<source>Value</source>
<translation>Wert</translation>
</message>
+ <message>
+ <source><VARIABLE></source>
+ <translation type="obsolete"><VARIABLE></translation>
+ </message>
+ <message>
+ <source><VALUE></source>
+ <translation type="obsolete"><WERT></translation>
+ </message>
+</context>
+<context>
+ <name>ProjectExplorer::EnvironmentWidget</name>
+ <message>
+ <location line="+276"/>
+ <source>&Edit</source>
+ <translation>&Bearbeiten</translation>
+ </message>
+ <message>
+ <location line="+4"/>
+ <source>&Add</source>
+ <translation>Hinzu&fügen</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&Reset</source>
+ <translation>&Rücksetzen</translation>
+ </message>
+ <message>
+ <location line="+5"/>
+ <source>&Unset</source>
+ <translation>&Leeren</translation>
+ </message>
</context>
<context>
<name>ProjectExplorer::Internal::AllProjectsFilter</name>
@@ -9064,7 +9099,7 @@ Basisname der Bibliothek: %1</translation>
<message>
<location line="+61"/>
<source>Build Project "%1"</source>
- <translation type="unfinished">Projekt '%1" erstellen</translation>
+ <translation>Projekt '%1" erstellen</translation>
</message>
<message>
<location line="+10"/>
@@ -9259,7 +9294,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message>
<location line="+42"/>
<source>Unknown error</source>
- <translation type="unfinished">Unbekannter Fehler</translation>
+ <translation>Unbekannter Fehler</translation>
</message>
<message>
<location line="+171"/>
@@ -11914,7 +11949,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context>
<name>TextEditor::FontSettingsPage</name>
<message>
- <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+199"/>
+ <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+212"/>
<source>Font & Colors</source>
<translation>Zeichensatz und Farben</translation>
</message>
diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp
index 36cb7a3aa61..0a2ceb20fdd 100644
--- a/src/plugins/projectexplorer/environmenteditmodel.cpp
+++ b/src/plugins/projectexplorer/environmenteditmodel.cpp
@@ -55,7 +55,7 @@ void EnvironmentModel::updateResultEnvironment()
m_resultEnvironment.modify(m_items);
foreach (const EnvironmentItem &item, m_items) {
if (item.unset) {
- m_resultEnvironment.set(item.name, "<UNSET>");
+ m_resultEnvironment.set(item.name, QLatin1String("<UNSET>"));
}
}
}
@@ -127,7 +127,7 @@ QVariant EnvironmentModel::data(const QModelIndex &index, int role) const
return m_resultEnvironment.value(m_resultEnvironment.constBegin() + index.row());
} else {
if (m_items.at(index.row()).unset)
- return "<UNSET>";
+ return QLatin1String("<UNSET>");
else
return m_items.at(index.row()).value;
}
@@ -285,7 +285,7 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
QModelIndex EnvironmentModel::addVariable()
{
- const QString &name = "<VARIABLE>";
+ const QString &name = QLatin1String("<VARIABLE>");
if (m_mergedEnvironments) {
int i = findInResult(name);
if (i != -1)
@@ -296,7 +296,7 @@ QModelIndex EnvironmentModel::addVariable()
return index(i, 0, QModelIndex());
}
// Don't exist, really add them
- return addVariable(EnvironmentItem(name, "<VALUE>"));
+ return addVariable(EnvironmentItem(name, QLatin1String("<VALUE>")));
}
QModelIndex EnvironmentModel::addVariable(const EnvironmentItem &item)
@@ -442,21 +442,21 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent)
QVBoxLayout *verticalLayout_2 = new QVBoxLayout();
m_editButton = new QPushButton(this);
- m_editButton->setText("&Edit");
+ m_editButton->setText(tr("&Edit"));
verticalLayout_2->addWidget(m_editButton);
m_addButton = new QPushButton(this);
- m_addButton->setText("&Add");
+ m_addButton->setText(tr("&Add"));
verticalLayout_2->addWidget(m_addButton);
m_removeButton = new QPushButton(this);
m_removeButton->setEnabled(false);
- m_removeButton->setText("&Reset");
+ m_removeButton->setText(tr("&Reset"));
verticalLayout_2->addWidget(m_removeButton);
m_unsetButton = new QPushButton(this);
m_unsetButton->setEnabled(false);
- m_unsetButton->setText("&Unset");
+ m_unsetButton->setText(tr("&Unset"));
verticalLayout_2->addWidget(m_unsetButton);
QSpacerItem *verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
--
GitLab