git.iko.soy/unity8
on xenial help sign in
Merge remote-tracking branch 'origin/xenial_-_qt-5-12' into xenial_-_qt-5-12_-_wayland
447317fRodney Dawes
po/unity8.pot−12
compare with xenial
unifiedsplit
@@ -218,18 +218,6 @@ msgstr ""
218msgid "Opens the Application Drawer."
218msgid "Opens the Application Drawer."
219msgstr ""
219msgstr ""
220
220
221−#: qml/Components/KeyboardShortcutsOverlay.qml:207
222−msgid "Scopes"
223−msgstr ""
224−
225−#: qml/Components/KeyboardShortcutsOverlay.qml:214
226−msgid "Super (Tap)"
227−msgstr ""
228−
229−#: qml/Components/KeyboardShortcutsOverlay.qml:219
230−msgid "Opens the Scopes home."
231−msgstr ""
232−
233#: qml/Components/KeyboardShortcutsOverlay.qml:235
221#: qml/Components/KeyboardShortcutsOverlay.qml:235
234msgid "Switching"
222msgid "Switching"
235msgstr ""
223msgstr ""
qml/Components/KeyboardShortcutsOverlay.qml−24
@@ -198,30 +198,6 @@ Rectangle {
198 wrapMode: Text.Wrap
198 wrapMode: Text.Wrap
199 Layout.maximumWidth: maxTextSize
199 Layout.maximumWidth: maxTextSize
200 }
200 }
201−
202−
203− // Scopes section
204− Item { Layout.columnSpan: 2; height: units.gu(2) }
205− Label {
206− Layout.columnSpan: 2
207− text: i18n.tr("Scopes")
208− font.weight: Font.Light
209− color: theme.palette.normal.baseText
210− lineHeight: 1.3
211− }
212−
213− Label {
214− text: i18n.tr("Super (Tap)")
215− fontSize: "small"
216− font.weight: Font.Medium
217− }
218− Label {
219− text: i18n.tr("Opens the Scopes home.")
220− fontSize: "small"
221− font.weight: Font.Light
222− wrapMode: Text.Wrap
223− Layout.maximumWidth: maxTextSize
224− }
225 }
201 }
226
202
227 GridLayout {
203 GridLayout {
qml/Stage/Splash.qml+1−1
@@ -87,7 +87,7 @@ Item {
87
87
88 Image {
88 Image {
89 id: overlaidImage
89 id: overlaidImage
90− anchors.centerIn: parent
90+ anchors.fill: parent
91 anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
91 anchors.verticalCenterOffset: header.visible ? header.height / 2 : 0
92 asynchronous: true
92 asynchronous: true
93 fillMode: Image.PreserveAspectFit
93 fillMode: Image.PreserveAspectFit