diff --git a/share/qtcreator/translations/qtcreator_de.ts b/share/qtcreator/translations/qtcreator_de.ts index 3f4f385b3b8f670c32b726fec6d43632cffde3c4..7f507b65a6d0a19555a873f6a9a7ad70134bb1b1 100644 --- a/share/qtcreator/translations/qtcreator_de.ts +++ b/share/qtcreator/translations/qtcreator_de.ts @@ -16457,7 +16457,7 @@ Sie können die Änderungen in einem Stash ablegen oder rücksetzen.</translatio <location line="+1"/> <source>Resources</source> <comment>Title of library resources view</comment> - <translation>Ressourcendateien</translation> + <translation>Ressourcen</translation> </message> <message> <location line="+5"/> diff --git a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp index 732a3baaf3ec3feb47b1ade7eba15badb3ea2ad5..eb43b07aa7b51a6e084109235071f02c97360134 100644 --- a/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp +++ b/src/plugins/qmldesigner/components/formeditor/formeditorwidget.cpp @@ -165,19 +165,19 @@ FormEditorWidget::FormEditorWidget(FormEditorView *view) QActionGroup *layoutMarginActionGroup = new QActionGroup(this); m_snappingMarginAction = new NumberSeriesAction(layoutMarginActionGroup); - m_snappingMarginAction->addEntry("no margins (0)", 0); - m_snappingMarginAction->addEntry("small margin (2)", 2); - m_snappingMarginAction->addEntry("medium margin (6)", 6); - m_snappingMarginAction->addEntry("large margin (10)", 10); + m_snappingMarginAction->addEntry(tr("no margins (0)"), 0); + m_snappingMarginAction->addEntry(tr("small margin (2)"), 2); + m_snappingMarginAction->addEntry(tr("medium margin (6)"), 6); + m_snappingMarginAction->addEntry(tr("large margin (10)"), 10); m_snappingMarginAction->setCurrentEntryIndex(2); layoutMarginActionGroup->addAction(m_snappingMarginAction.data()); m_snappingSpacingAction = new NumberSeriesAction(layoutMarginActionGroup); - m_snappingSpacingAction->addEntry("no spacing (0)", 0); - m_snappingSpacingAction->addEntry("small spacing (2)", 2); - m_snappingSpacingAction->addEntry("medium spacing (4)", 4); - m_snappingSpacingAction->addEntry("large spacing (6)", 6); + m_snappingSpacingAction->addEntry(tr("no spacing (0)"), 0); + m_snappingSpacingAction->addEntry(tr("small spacing (2)"), 2); + m_snappingSpacingAction->addEntry(tr("medium spacing (4)"), 4); + m_snappingSpacingAction->addEntry(tr("large spacing (6)"), 6); m_snappingSpacingAction->setCurrentEntryIndex(1); layoutMarginActionGroup->addAction(m_snappingSpacingAction.data()); diff --git a/src/plugins/qmldesigner/components/integration/componentview.cpp b/src/plugins/qmldesigner/components/integration/componentview.cpp index 2d5f6b189963b37e610305ce431643dcc825717e..943895b01a44ff381b7c2212a71041038bb33540 100644 --- a/src/plugins/qmldesigner/components/integration/componentview.cpp +++ b/src/plugins/qmldesigner/components/integration/componentview.cpp @@ -72,7 +72,7 @@ ModelNode ComponentView::modelNode(int index) const void ComponentView::appendWholeDocumentAsComponent() { - QStandardItem *item = new QStandardItem("Whole Document"); + QStandardItem *item = new QStandardItem(tr("whole document")); item->setData(QVariant::fromValue(rootModelNode()), ModelNodeRole); item->setEditable(false); m_standardItemModel->appendRow(item); diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp index 5fef38fd6a64705b0877c5a8bc29a600ec7ad3aa..8c5b5ac47672012d35dc46b203c3b2503d64551b 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditormodel.cpp @@ -73,7 +73,7 @@ QVariant StatesEditorModel::data(const QModelIndex &index, int role) const switch (role) { case StateNameRole: { if (index.row()==0) - result = QString("base state"); + result = QString(tr("base state", "Implicit default state")); else result = m_stateNames.at(index.row()); break; diff --git a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp index faeb4fd21b4c3d2a11f1f93bac208a5822893a16..937af6e900acabb175c554fecb029b307a0e7251 100644 --- a/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp +++ b/src/plugins/qmldesigner/components/stateseditor/stateseditorwidget.cpp @@ -130,7 +130,7 @@ void StatesEditorWidgetPrivate::addState() QString newStateName; int index = 1; while (1) { - newStateName = tr("State%1").arg(index++); + newStateName = tr("State%1", "Default name for newly created states").arg(index++); if (!modelStateNames.contains(newStateName)) break; }