Commit e86e7f96 authored by Friedemann Kleint's avatar Friedemann Kleint

Fixed tr()-glitches, updated German translation.

Acked-by: default avatardt <qtc-committer@nokia.com>
parent d710333c
...@@ -3064,7 +3064,7 @@ p { ...@@ -3064,7 +3064,7 @@ p {
<translation type="obsolete">Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2</translation> <translation type="obsolete">Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2</translation>
</message> </message>
<message> <message>
<location line="+494"/> <location line="+500"/>
<source>Unable to assign the value &apos;%1&apos; to &apos;%2&apos;: %3</source> <source>Unable to assign the value &apos;%1&apos; to &apos;%2&apos;: %3</source>
<translation>Der Wert &apos;%1&apos; konnte nicht an &apos;%2&apos; zugewiesen werden: %3</translation> <translation>Der Wert &apos;%1&apos; konnte nicht an &apos;%2&apos; zugewiesen werden: %3</translation>
</message> </message>
...@@ -6169,7 +6169,7 @@ Grund: %3</translation> ...@@ -6169,7 +6169,7 @@ Grund: %3</translation>
<translation>Das Kommando &apos;show&apos; konnte nicht ausgeführt werden: %1: %2</translation> <translation>Das Kommando &apos;show&apos; konnte nicht ausgeführt werden: %1: %2</translation>
</message> </message>
<message> <message>
<location line="+143"/> <location line="+149"/>
<source>Changes</source> <source>Changes</source>
<translation>Änderungen</translation> <translation>Änderungen</translation>
</message> </message>
...@@ -7227,7 +7227,7 @@ Make sure you use something like ...@@ -7227,7 +7227,7 @@ Make sure you use something like
SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp
in your .pro file.</source> in your .pro file.</source>
<translation type="unfinished">g</translation> <translation>g</translation>
</message> </message>
<message> <message>
<location filename="../../../src/tools/texteditor/mainwindow.cpp" line="+62"/> <location filename="../../../src/tools/texteditor/mainwindow.cpp" line="+62"/>
...@@ -8086,6 +8086,10 @@ Basisname der Bibliothek: %1</translation> ...@@ -8086,6 +8086,10 @@ Basisname der Bibliothek: %1</translation>
</context> </context>
<context> <context>
<name>ProjectExplorer::EnvironmentModel</name> <name>ProjectExplorer::EnvironmentModel</name>
<message>
<source>&lt;UNSET&gt;</source>
<translation type="obsolete">&lt;NICHT GESETZT&gt;</translation>
</message>
<message> <message>
<location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+169"/> <location filename="../../../src/plugins/projectexplorer/environmenteditmodel.cpp" line="+169"/>
<source>Variable</source> <source>Variable</source>
...@@ -8096,6 +8100,37 @@ Basisname der Bibliothek: %1</translation> ...@@ -8096,6 +8100,37 @@ Basisname der Bibliothek: %1</translation>
<source>Value</source> <source>Value</source>
<translation>Wert</translation> <translation>Wert</translation>
</message> </message>
<message>
<source>&lt;VARIABLE&gt;</source>
<translation type="obsolete">&lt;VARIABLE&gt;</translation>
</message>
<message>
<source>&lt;VALUE&gt;</source>
<translation type="obsolete">&lt;WERT&gt;</translation>
</message>
</context>
<context>
<name>ProjectExplorer::EnvironmentWidget</name>
<message>
<location line="+276"/>
<source>&amp;Edit</source>
<translation>&amp;Bearbeiten</translation>
</message>
<message>
<location line="+4"/>
<source>&amp;Add</source>
<translation>Hinzu&amp;fügen</translation>
</message>
<message>
<location line="+5"/>
<source>&amp;Reset</source>
<translation>&amp;Rücksetzen</translation>
</message>
<message>
<location line="+5"/>
<source>&amp;Unset</source>
<translation>&amp;Leeren</translation>
</message>
</context> </context>
<context> <context>
<name>ProjectExplorer::Internal::AllProjectsFilter</name> <name>ProjectExplorer::Internal::AllProjectsFilter</name>
...@@ -9064,7 +9099,7 @@ Basisname der Bibliothek: %1</translation> ...@@ -9064,7 +9099,7 @@ Basisname der Bibliothek: %1</translation>
<message> <message>
<location line="+61"/> <location line="+61"/>
<source>Build Project &quot;%1&quot;</source> <source>Build Project &quot;%1&quot;</source>
<translation type="unfinished">Projekt &apos;%1&quot; erstellen</translation> <translation>Projekt &apos;%1&quot; erstellen</translation>
</message> </message>
<message> <message>
<location line="+10"/> <location line="+10"/>
...@@ -9259,7 +9294,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation> ...@@ -9259,7 +9294,7 @@ unter Versionsverwaltung (%2) gestellt werden?</translation>
<message> <message>
<location line="+42"/> <location line="+42"/>
<source>Unknown error</source> <source>Unknown error</source>
<translation type="unfinished">Unbekannter Fehler</translation> <translation>Unbekannter Fehler</translation>
</message> </message>
<message> <message>
<location line="+171"/> <location line="+171"/>
...@@ -11914,7 +11949,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich ...@@ -11914,7 +11949,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich
<context> <context>
<name>TextEditor::FontSettingsPage</name> <name>TextEditor::FontSettingsPage</name>
<message> <message>
<location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+199"/> <location filename="../../../src/plugins/texteditor/fontsettingspage.cpp" line="+212"/>
<source>Font &amp; Colors</source> <source>Font &amp; Colors</source>
<translation>Zeichensatz und Farben</translation> <translation>Zeichensatz und Farben</translation>
</message> </message>
......
...@@ -55,7 +55,7 @@ void EnvironmentModel::updateResultEnvironment() ...@@ -55,7 +55,7 @@ void EnvironmentModel::updateResultEnvironment()
m_resultEnvironment.modify(m_items); m_resultEnvironment.modify(m_items);
foreach (const EnvironmentItem &item, m_items) { foreach (const EnvironmentItem &item, m_items) {
if (item.unset) { 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 ...@@ -127,7 +127,7 @@ QVariant EnvironmentModel::data(const QModelIndex &index, int role) const
return m_resultEnvironment.value(m_resultEnvironment.constBegin() + index.row()); return m_resultEnvironment.value(m_resultEnvironment.constBegin() + index.row());
} else { } else {
if (m_items.at(index.row()).unset) if (m_items.at(index.row()).unset)
return "<UNSET>"; return QLatin1String("<UNSET>");
else else
return m_items.at(index.row()).value; return m_items.at(index.row()).value;
} }
...@@ -285,7 +285,7 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value, ...@@ -285,7 +285,7 @@ bool EnvironmentModel::setData(const QModelIndex &index, const QVariant &value,
QModelIndex EnvironmentModel::addVariable() QModelIndex EnvironmentModel::addVariable()
{ {
const QString &name = "<VARIABLE>"; const QString &name = QLatin1String("<VARIABLE>");
if (m_mergedEnvironments) { if (m_mergedEnvironments) {
int i = findInResult(name); int i = findInResult(name);
if (i != -1) if (i != -1)
...@@ -296,7 +296,7 @@ QModelIndex EnvironmentModel::addVariable() ...@@ -296,7 +296,7 @@ QModelIndex EnvironmentModel::addVariable()
return index(i, 0, QModelIndex()); return index(i, 0, QModelIndex());
} }
// Don't exist, really add them // Don't exist, really add them
return addVariable(EnvironmentItem(name, "<VALUE>")); return addVariable(EnvironmentItem(name, QLatin1String("<VALUE>")));
} }
QModelIndex EnvironmentModel::addVariable(const EnvironmentItem &item) QModelIndex EnvironmentModel::addVariable(const EnvironmentItem &item)
...@@ -442,21 +442,21 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent) ...@@ -442,21 +442,21 @@ EnvironmentWidget::EnvironmentWidget(QWidget *parent)
QVBoxLayout *verticalLayout_2 = new QVBoxLayout(); QVBoxLayout *verticalLayout_2 = new QVBoxLayout();
m_editButton = new QPushButton(this); m_editButton = new QPushButton(this);
m_editButton->setText("&Edit"); m_editButton->setText(tr("&Edit"));
verticalLayout_2->addWidget(m_editButton); verticalLayout_2->addWidget(m_editButton);
m_addButton = new QPushButton(this); m_addButton = new QPushButton(this);
m_addButton->setText("&Add"); m_addButton->setText(tr("&Add"));
verticalLayout_2->addWidget(m_addButton); verticalLayout_2->addWidget(m_addButton);
m_removeButton = new QPushButton(this); m_removeButton = new QPushButton(this);
m_removeButton->setEnabled(false); m_removeButton->setEnabled(false);
m_removeButton->setText("&Reset"); m_removeButton->setText(tr("&Reset"));
verticalLayout_2->addWidget(m_removeButton); verticalLayout_2->addWidget(m_removeButton);
m_unsetButton = new QPushButton(this); m_unsetButton = new QPushButton(this);
m_unsetButton->setEnabled(false); m_unsetButton->setEnabled(false);
m_unsetButton->setText("&Unset"); m_unsetButton->setText(tr("&Unset"));
verticalLayout_2->addWidget(m_unsetButton); verticalLayout_2->addWidget(m_unsetButton);
QSpacerItem *verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding); QSpacerItem *verticalSpacer = new QSpacerItem(20, 40, QSizePolicy::Minimum, QSizePolicy::Expanding);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment