From e86e7f960d4314571e80ff103cf992444d257c6d Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 16 Jun 2009 12:34:23 +0200 Subject: [PATCH] Fixed tr()-glitches, updated German translation. Acked-by: dt --- 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 924a6591a2..6c27a1b962 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -3064,7 +3064,7 @@ p { Der Debugger konnte sich nicht an den Prozess %1 anhängen: %2 - + Unable to assign the value '%1' to '%2': %3 Der Wert '%1' konnte nicht an '%2' zugewiesen werden: %3 @@ -6169,7 +6169,7 @@ Grund: %3 Das Kommando 'show' konnte nicht ausgeführt werden: %1: %2 - + Changes Änderungen @@ -7227,7 +7227,7 @@ Make sure you use something like SOURCES *= .../ide/main/bin/gdbmacros/gdbmacros.cpp in your .pro file. - g + g @@ -8086,6 +8086,10 @@ Basisname der Bibliothek: %1 ProjectExplorer::EnvironmentModel + + <UNSET> + <NICHT GESETZT> + Variable @@ -8096,6 +8100,37 @@ Basisname der Bibliothek: %1 Value Wert + + <VARIABLE> + <VARIABLE> + + + <VALUE> + <WERT> + + + + ProjectExplorer::EnvironmentWidget + + + &Edit + &Bearbeiten + + + + &Add + Hinzu&fügen + + + + &Reset + &Rücksetzen + + + + &Unset + &Leeren + ProjectExplorer::Internal::AllProjectsFilter @@ -9064,7 +9099,7 @@ Basisname der Bibliothek: %1 Build Project "%1" - Projekt '%1" erstellen + Projekt '%1" erstellen @@ -9259,7 +9294,7 @@ unter Versionsverwaltung (%2) gestellt werden? Unknown error - Unbekannter Fehler + Unbekannter Fehler @@ -11914,7 +11949,7 @@ Um es abzurufen, tippen Sie das Kürzel im Locator, gefolgt von einem Leerzeich TextEditor::FontSettingsPage - + Font & Colors Zeichensatz und Farben diff --git a/src/plugins/projectexplorer/environmenteditmodel.cpp b/src/plugins/projectexplorer/environmenteditmodel.cpp index 36cb7a3aa6..0a2ceb20fd 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, ""); + m_resultEnvironment.set(item.name, QLatin1String("")); } } } @@ -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 ""; + return QLatin1String(""); 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 = ""; + const QString &name = QLatin1String(""); 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, "")); + return addVariable(EnvironmentItem(name, QLatin1String(""))); } 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