diff --git a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui index d3c34b0391cdc5e9d7bd8c6eba55531e42cda7ee..7515271a3159df86f1f6306b844c1a3a2f8568fe 100644 --- a/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui +++ b/src/plugins/qmldesigner/components/propertyeditor/behaviordialog.ui @@ -6,8 +6,8 @@ <rect> <x>0</x> <y>0</y> - <width>247</width> - <height>311</height> + <width>267</width> + <height>333</height> </rect> </property> <property name="sizePolicy"> @@ -122,7 +122,7 @@ qlineargradient(spread:pad, x1:0.585, y1:0.0284091, x2:0.517, y2:1, stop:0 rgba( <item row="0" column="0"> <widget class="QStackedWidget" name="stackedWidget"> <property name="currentIndex"> - <number>1</number> + <number>0</number> </property> <widget class="QWidget" name="page"> <layout class="QGridLayout" name="gridLayout_2"> @@ -171,162 +171,162 @@ qlineargradient(spread:pad, x1:0.585, y1:0.0284091, x2:0.517, y2:1, stop:0 rgba( </item> <item> <property name="text"> - <string>easeInQuad</string> + <string notr="true">easeInQuad</string> </property> </item> <item> <property name="text"> - <string>easeOutQuad</string> + <string notr="true">easeOutQuad</string> </property> </item> <item> <property name="text"> - <string>easeInOutQuad</string> + <string notr="true">easeInOutQuad</string> </property> </item> <item> <property name="text"> - <string>easeOutInQuad</string> + <string notr="true">easeOutInQuad</string> </property> </item> <item> <property name="text"> - <string>easeInCubic</string> + <string notr="true">easeInCubic</string> </property> </item> <item> <property name="text"> - <string>easeOutCubic</string> + <string notr="true">easeOutCubic</string> </property> </item> <item> <property name="text"> - <string>easeInOutCubic</string> + <string notr="true">easeInOutCubic</string> </property> </item> <item> <property name="text"> - <string>easeOutInCubic</string> + <string notr="true">easeOutInCubic</string> </property> </item> <item> <property name="text"> - <string>easeOutInBounce</string> + <string notr="true">easeOutInBounce</string> </property> </item> <item> <property name="text"> - <string>easeInOutBounce</string> + <string notr="true">easeInOutBounce</string> </property> </item> <item> <property name="text"> - <string>easeOutBounce</string> + <string notr="true">easeOutBounce</string> </property> </item> <item> <property name="text"> - <string>easeInBounce</string> + <string notr="true">easeInBounce</string> </property> </item> <item> <property name="text"> - <string>easeOutInBack</string> + <string notr="true">easeOutInBack</string> </property> </item> <item> <property name="text"> - <string>easeInOutBack</string> + <string notr="true">easeInOutBack</string> </property> </item> <item> <property name="text"> - <string>easeOutBack</string> + <string notr="true">easeOutBack</string> </property> </item> <item> <property name="text"> - <string>easeInBack</string> + <string notr="true">easeInBack</string> </property> </item> <item> <property name="text"> - <string>easeOutInElastic</string> + <string notr="true">easeOutInElastic</string> </property> </item> <item> <property name="text"> - <string>easeInOutElastic</string> + <string notr="true">easeInOutElastic</string> </property> </item> <item> <property name="text"> - <string>easeOutElastic</string> + <string notr="true">easeOutElastic</string> </property> </item> <item> <property name="text"> - <string>easeInElastic</string> + <string notr="true">easeInElastic</string> </property> </item> <item> <property name="text"> - <string>easeOutInCirc</string> + <string notr="true">easeOutInCirc</string> </property> </item> <item> <property name="text"> - <string>easeInOutCirc</string> + <string notr="true">easeInOutCirc</string> </property> </item> <item> <property name="text"> - <string>easeOutCirc</string> + <string notr="true">easeOutCirc</string> </property> </item> <item> <property name="text"> - <string>easeInCirc</string> + <string notr="true">easeInCirc</string> </property> </item> <item> <property name="text"> - <string>easeOutInExpo</string> + <string notr="true">easeOutInExpo</string> </property> </item> <item> <property name="text"> - <string>easeInOutExpo</string> + <string notr="true">easeInOutExpo</string> </property> </item> <item> <property name="text"> - <string>easeOutExpo</string> + <string notr="true">easeOutExpo</string> </property> </item> <item> <property name="text"> - <string>easeInExpo</string> + <string notr="true">easeInExpo</string> </property> </item> <item> <property name="text"> - <string>easeOutInSine</string> + <string notr="true">easeOutInSine</string> </property> </item> <item> <property name="text"> - <string>easeInOutSine</string> + <string notr="true">easeInOutSine</string> </property> </item> <item> <property name="text"> - <string>easeOutSine</string> + <string notr="true">easeOutSine</string> </property> </item> <item> <property name="text"> - <string>easeInSine</string> + <string notr="true">easeInSine</string> </property> </item> </widget> diff --git a/src/plugins/qmlinspector/components/expressionquerywidget.cpp b/src/plugins/qmlinspector/components/expressionquerywidget.cpp index c57e914952c9329c1f456199239d6ce7fde245b3..62f6ebcad77e9d7823e422e5383fde80090f1fef 100644 --- a/src/plugins/qmlinspector/components/expressionquerywidget.cpp +++ b/src/plugins/qmlinspector/components/expressionquerywidget.cpp @@ -272,7 +272,7 @@ void ExpressionQueryWidget::showResult() QString result; if (value.type() == QVariant::List || value.type() == QVariant::StringList) { - result = tr("<%1 items>", "%1 = number of items").arg(value.toList().count()); + result = tr("<%n items>", 0, value.toList().count()); } else if (value.isNull()) { result = QLatin1String("<no value>"); } else { diff --git a/src/plugins/qmlinspector/components/objectpropertiesview.cpp b/src/plugins/qmlinspector/components/objectpropertiesview.cpp index ace3432a825999bd852c992c49169c1eb0209438..8c618227216653aa3b4ee9d14f415392426effcb 100644 --- a/src/plugins/qmlinspector/components/objectpropertiesview.cpp +++ b/src/plugins/qmlinspector/components/objectpropertiesview.cpp @@ -166,7 +166,7 @@ void ObjectPropertiesView::setPropertyValue(PropertiesViewItem *item, const QVar qDeleteAll(item->takeChildren()); QVariantList variants = value.toList(); - item->setText(1, tr("<%1 items>", "%1 = number of items").arg(variants.count())); + item->setText(1, tr("<%n items>", 0, variants.count())); item->setText(2, QString::fromUtf8(value.typeName())); PropertiesViewItem *child;