git.iko.soy/unity8
on xenial help sign in
address review comments
commit38c96a3e3078d37589e9f77b71fd55501c2e25d0 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateThu 28 Jul 2016, 14:13 (10 years ago) parentbc75a12
3 files changed+6−8
compare with xenial
unifiedsplit
plugins/Ubuntu/SystemImage/SystemImage.cpp+1−2 plugins/Ubuntu/SystemImage/SystemImage.h−1 qml/Wizard/Pages/77-system-update.qml+5−5
plugins/Ubuntu/SystemImage/SystemImage.cpp+1−2
@@ -96,9 +96,8 @@ void SystemImage::onUpdateDownloaded()
9696 Q_EMIT updateDownloadedChanged();
9797}
9898
99−void SystemImage::onUpdateFailed(int consecutive_failure_count, const QString &last_reason)
99+void SystemImage::onUpdateFailed(int /*consecutive_failure_count*/, const QString &last_reason)
100100{
101− Q_UNUSED(consecutive_failure_count)
102101 qWarning() << Q_FUNC_INFO << "System Update failed:" << last_reason;
103102 setUpdateApplying(false);
104103}
plugins/Ubuntu/SystemImage/SystemImage.h−1
@@ -18,7 +18,6 @@
1818#define SYSTEMIMAGE_H
1919
2020#include <QObject>
21−#include <QMap>
2221
2322class SystemImage : public QObject
2423{
qml/Wizard/Pages/77-system-update.qml+5−5
@@ -34,9 +34,9 @@ LocalComponents.Page {
3434 id: column
3535 anchors {
3636 fill: content
37− leftMargin: leftMargin
38− rightMargin: rightMargin
39− topMargin: customMargin
37+ leftMargin: systemUpdatePage.leftMargin
38+ rightMargin: systemUpdatePage.rightMargin
39+ topMargin: systemUpdatePage.customMargin
4040 }
4141 spacing: units.gu(3)
4242 opacity: spinner.running ? 0.5 : 1
@@ -76,14 +76,14 @@ LocalComponents.Page {
7676 color: textColor
7777 font.weight: Font.Normal
7878 fontSize: "small"
79− text: i18n.tr("Ubuntu system")
79+ text: i18n.ctr("string identifying name of the update", "Ubuntu system")
8080 }
8181
8282 Label {
8383 font.weight: Font.Light
8484 fontSize: "small"
8585 color: textColor
86− text: i18n.tr("Version %1").arg(SystemImage.availableVersion)
86+ text: i18n.ctr("version of the system update", "Version %1").arg(SystemImage.availableVersion)
8787 }
8888
8989 Label {