Merge lp:~ubuntu-clock-dev/ubuntu-clock-app/night-mode into lp:ubuntu-clock-app
- night-mode
- Merge into trunk
Proposed by
Victor Thompson
Status: | Work in progress | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~ubuntu-clock-dev/ubuntu-clock-app/night-mode | ||||
Merge into: | lp:ubuntu-clock-app | ||||
Diff against target: |
510 lines (+133/-42) 15 files modified
app/alarm/AlarmPage.qml (+2/-0) app/alarm/AlarmSettingsPage.qml (+44/-0) app/alarm/EditAlarmPage.qml (+2/-0) app/clock/ClockPage.qml (+2/-2) app/components/Background.qml (+1/-1) app/components/Clock.qml (+3/-3) app/components/ClockCircle.qml (+1/-1) app/components/DigitalMode.qml (+2/-2) app/components/LightBackground.qml (+32/-0) app/ubuntu-clock-app.qml (+3/-1) app/upstreamcomponents/PageWithBottomEdge.qml (+2/-1) app/worldclock/AddWorldCityButton.qml (+3/-3) app/worldclock/UserWorldCityDelegate.qml (+3/-1) app/worldclock/WorldCityList.qml (+2/-0) po/com.ubuntu.clock.pot (+31/-27) |
||||
To merge this branch: | bzr merge lp:~ubuntu-clock-dev/ubuntu-clock-app/night-mode | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Bartosz Kosiorek | Needs Information | ||
Review via email: mp+250543@code.launchpad.net |
Commit message
Introduce Night mode user setting
Description of the change
This MP is just to get a diff of the this WIP prototype
To post a comment you must log in.
- 203. By Victor Thompson
-
Merge of trunk
- 204. By Victor Thompson
-
Update some colors, update new component to QTQ 2.4 and UC 1.2.
- 205. By Victor Thompson
-
Merge of trunk
Unmerged revisions
- 205. By Victor Thompson
-
Merge of trunk
- 204. By Victor Thompson
-
Update some colors, update new component to QTQ 2.4 and UC 1.2.
- 203. By Victor Thompson
-
Merge of trunk
- 202. By Victor Thompson
-
* Prototype initial Night mode
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'app/alarm/AlarmPage.qml' | |||
2 | --- app/alarm/AlarmPage.qml 2015-07-16 21:02:18 +0000 | |||
3 | +++ app/alarm/AlarmPage.qml 2015-07-17 21:47:41 +0000 | |||
4 | @@ -139,6 +139,8 @@ | |||
5 | 139 | } | 139 | } |
6 | 140 | } | 140 | } |
7 | 141 | 141 | ||
8 | 142 | LightBackground {} | ||
9 | 143 | |||
10 | 142 | AlarmList { | 144 | AlarmList { |
11 | 143 | id: alarmListView | 145 | id: alarmListView |
12 | 144 | listModel: alarmModel | 146 | listModel: alarmModel |
13 | 145 | 147 | ||
14 | === modified file 'app/alarm/AlarmSettingsPage.qml' | |||
15 | --- app/alarm/AlarmSettingsPage.qml 2015-07-15 22:31:52 +0000 | |||
16 | +++ app/alarm/AlarmSettingsPage.qml 2015-07-17 21:47:41 +0000 | |||
17 | @@ -45,6 +45,8 @@ | |||
18 | 45 | id: alarmSettings | 45 | id: alarmSettings |
19 | 46 | } | 46 | } |
20 | 47 | 47 | ||
21 | 48 | LightBackground {} | ||
22 | 49 | |||
23 | 48 | ListModel { | 50 | ListModel { |
24 | 49 | id: durationModel | 51 | id: durationModel |
25 | 50 | Component.onCompleted: initialise() | 52 | Component.onCompleted: initialise() |
26 | @@ -209,6 +211,48 @@ | |||
27 | 209 | } | 211 | } |
28 | 210 | } | 212 | } |
29 | 211 | 213 | ||
30 | 214 | ListItem.Empty { | ||
31 | 215 | Label { | ||
32 | 216 | text: i18n.tr("Night mode") | ||
33 | 217 | color: UbuntuColors.midAubergine | ||
34 | 218 | anchors { | ||
35 | 219 | left: parent.left | ||
36 | 220 | leftMargin: units.gu(2) | ||
37 | 221 | verticalCenter: parent.verticalCenter | ||
38 | 222 | } | ||
39 | 223 | } | ||
40 | 224 | |||
41 | 225 | Switch { | ||
42 | 226 | id: nightModeSwitch | ||
43 | 227 | |||
44 | 228 | anchors { | ||
45 | 229 | right: parent.right | ||
46 | 230 | rightMargin: units.gu(2) | ||
47 | 231 | verticalCenter: parent.verticalCenter | ||
48 | 232 | } | ||
49 | 233 | |||
50 | 234 | checked: isNightMode === true | ||
51 | 235 | |||
52 | 236 | onCheckedChanged: { | ||
53 | 237 | isNightMode = checked | ||
54 | 238 | checked: isNightMode === true | ||
55 | 239 | var appSettings = JSON.parse | ||
56 | 240 | (JSON.stringify(clockModeDocument.contents)) | ||
57 | 241 | appSettings.nightMode = isNightMode | ||
58 | 242 | |||
59 | 243 | if(checked) { | ||
60 | 244 | clockModeDocument.contents = appSettings | ||
61 | 245 | } else { | ||
62 | 246 | clockModeDocument.contents = appSettings | ||
63 | 247 | } | ||
64 | 248 | } | ||
65 | 249 | } | ||
66 | 250 | |||
67 | 251 | onClicked: { | ||
68 | 252 | nightModeSwitch.checked = !nightModeSwitch.checked | ||
69 | 253 | } | ||
70 | 254 | } | ||
71 | 255 | |||
72 | 212 | SubtitledListItem { | 256 | SubtitledListItem { |
73 | 213 | text: i18n.tr("Change time and date") | 257 | text: i18n.tr("Change time and date") |
74 | 214 | subText: { | 258 | subText: { |
75 | 215 | 259 | ||
76 | === modified file 'app/alarm/EditAlarmPage.qml' | |||
77 | --- app/alarm/EditAlarmPage.qml 2015-05-27 16:03:23 +0000 | |||
78 | +++ app/alarm/EditAlarmPage.qml 2015-07-17 21:47:41 +0000 | |||
79 | @@ -153,6 +153,8 @@ | |||
80 | 153 | } | 153 | } |
81 | 154 | } | 154 | } |
82 | 155 | 155 | ||
83 | 156 | LightBackground {} | ||
84 | 157 | |||
85 | 156 | Alarm { | 158 | Alarm { |
86 | 157 | id: _alarm | 159 | id: _alarm |
87 | 158 | 160 | ||
88 | 159 | 161 | ||
89 | === modified file 'app/clock/ClockPage.qml' | |||
90 | --- app/clock/ClockPage.qml 2015-05-27 16:03:23 +0000 | |||
91 | +++ app/clock/ClockPage.qml 2015-07-17 21:47:41 +0000 | |||
92 | @@ -244,7 +244,7 @@ | |||
93 | 244 | 244 | ||
94 | 245 | text: clock.analogTime.toLocaleDateString() | 245 | text: clock.analogTime.toLocaleDateString() |
95 | 246 | opacity: settingsIcon.opacity | 246 | opacity: settingsIcon.opacity |
97 | 247 | color: locationRow.visible ? Theme.palette.baseText : UbuntuColors.midAubergine | 247 | color: isNightMode ? UbuntuColors.warmGrey : (locationRow.visible ? Theme.palette.baseText : UbuntuColors.midAubergine) |
98 | 248 | fontSize: "medium" | 248 | fontSize: "medium" |
99 | 249 | } | 249 | } |
100 | 250 | 250 | ||
101 | @@ -275,7 +275,7 @@ | |||
102 | 275 | 275 | ||
103 | 276 | fontSize: "medium" | 276 | fontSize: "medium" |
104 | 277 | anchors.verticalCenter: locationIcon.verticalCenter | 277 | anchors.verticalCenter: locationIcon.verticalCenter |
106 | 278 | color: UbuntuColors.midAubergine | 278 | color: isNightMode ? UbuntuColors.warmGrey : UbuntuColors.midAubergine |
107 | 279 | 279 | ||
108 | 280 | text: { | 280 | text: { |
109 | 281 | if (userLocationDocument.contents.location === "Null" | 281 | if (userLocationDocument.contents.location === "Null" |
110 | 282 | 282 | ||
111 | === modified file 'app/components/Background.qml' | |||
112 | --- app/components/Background.qml 2015-05-27 16:03:23 +0000 | |||
113 | +++ app/components/Background.qml 2015-07-17 21:47:41 +0000 | |||
114 | @@ -28,5 +28,5 @@ | |||
115 | 28 | 28 | ||
116 | 29 | asynchronous: true | 29 | asynchronous: true |
117 | 30 | anchors.fill: parent | 30 | anchors.fill: parent |
119 | 31 | source: "../graphics/Background_Texture.jpg" | 31 | source: isNightMode ? "../graphics/Background_Texture_Dark.jpg" : "../graphics/Background_Texture.jpg" |
120 | 32 | } | 32 | } |
121 | 33 | 33 | ||
122 | === modified file 'app/components/Clock.qml' | |||
123 | --- app/components/Clock.qml 2015-05-27 16:03:23 +0000 | |||
124 | +++ app/components/Clock.qml 2015-07-17 21:47:41 +0000 | |||
125 | @@ -243,10 +243,10 @@ | |||
126 | 243 | analogShadow.source = digitalShadow.source = "" | 243 | analogShadow.source = digitalShadow.source = "" |
127 | 244 | 244 | ||
128 | 245 | if(isMainClock) { | 245 | if(isMainClock) { |
130 | 246 | var isDigitalSetting = JSON.parse | 246 | var appSettings = JSON.parse |
131 | 247 | (JSON.stringify(clockModeDocument.contents)) | 247 | (JSON.stringify(clockModeDocument.contents)) |
134 | 248 | isDigitalSetting.digitalMode = isDigital | 248 | appSettings.digitalMode = isDigital |
135 | 249 | clockModeDocument.contents = isDigitalSetting | 249 | clockModeDocument.contents = appSettings |
136 | 250 | } | 250 | } |
137 | 251 | } | 251 | } |
138 | 252 | } | 252 | } |
139 | 253 | 253 | ||
140 | === modified file 'app/components/ClockCircle.qml' | |||
141 | --- app/components/ClockCircle.qml 2015-05-27 16:03:23 +0000 | |||
142 | +++ app/components/ClockCircle.qml 2015-07-17 21:47:41 +0000 | |||
143 | @@ -89,7 +89,7 @@ | |||
144 | 89 | Image { | 89 | Image { |
145 | 90 | smooth: false | 90 | smooth: false |
146 | 91 | fillMode: Image.PreserveAspectFit | 91 | fillMode: Image.PreserveAspectFit |
148 | 92 | source: "../graphics/Inner_Clock_Texture.png" | 92 | source: isNightMode ? "../graphics/Inner_Clock_Texture_Dark.png" : "../graphics/Inner_Clock_Texture.png" |
149 | 93 | } | 93 | } |
150 | 94 | } | 94 | } |
151 | 95 | 95 | ||
152 | 96 | 96 | ||
153 | === modified file 'app/components/DigitalMode.qml' | |||
154 | --- app/components/DigitalMode.qml 2015-05-27 16:03:23 +0000 | |||
155 | +++ app/components/DigitalMode.qml 2015-07-17 21:47:41 +0000 | |||
156 | @@ -53,7 +53,7 @@ | |||
157 | 53 | 53 | ||
158 | 54 | anchors.centerIn: parent | 54 | anchors.centerIn: parent |
159 | 55 | 55 | ||
161 | 56 | color: UbuntuColors.midAubergine | 56 | color: isNightMode ? UbuntuColors.warmGrey : UbuntuColors.midAubergine |
162 | 57 | font.pixelSize: units.dp(1) | 57 | font.pixelSize: units.dp(1) |
163 | 58 | text: { | 58 | text: { |
164 | 59 | if (time.search(Qt.locale().amText) !== -1) { | 59 | if (time.search(Qt.locale().amText) !== -1) { |
165 | @@ -77,7 +77,7 @@ | |||
166 | 77 | anchors.top: _digitalTime.bottom | 77 | anchors.top: _digitalTime.bottom |
167 | 78 | anchors.horizontalCenter: parent.horizontalCenter | 78 | anchors.horizontalCenter: parent.horizontalCenter |
168 | 79 | 79 | ||
170 | 80 | color: UbuntuColors.midAubergine | 80 | color: isNightMode ? UbuntuColors.warmGrey : UbuntuColors.midAubergine |
171 | 81 | font.pixelSize: units.dp(1) | 81 | font.pixelSize: units.dp(1) |
172 | 82 | visible: text !== "" | 82 | visible: text !== "" |
173 | 83 | text: { | 83 | text: { |
174 | 84 | 84 | ||
175 | === added file 'app/components/LightBackground.qml' | |||
176 | --- app/components/LightBackground.qml 1970-01-01 00:00:00 +0000 | |||
177 | +++ app/components/LightBackground.qml 2015-07-17 21:47:41 +0000 | |||
178 | @@ -0,0 +1,32 @@ | |||
179 | 1 | /* | ||
180 | 2 | * Copyright (C) 2014-2015 Canonical Ltd | ||
181 | 3 | * | ||
182 | 4 | * This file is part of Ubuntu Clock App | ||
183 | 5 | * | ||
184 | 6 | * Ubuntu Clock App is free software: you can redistribute it and/or modify | ||
185 | 7 | * it under the terms of the GNU General Public License version 3 as | ||
186 | 8 | * published by the Free Software Foundation. | ||
187 | 9 | * | ||
188 | 10 | * Ubuntu Clock App is distributed in the hope that it will be useful, | ||
189 | 11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
190 | 12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
191 | 13 | * GNU General Public License for more details. | ||
192 | 14 | * | ||
193 | 15 | * You should have received a copy of the GNU General Public License | ||
194 | 16 | * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
195 | 17 | */ | ||
196 | 18 | |||
197 | 19 | import QtQuick 2.4 | ||
198 | 20 | import Ubuntu.Components 1.2 | ||
199 | 21 | |||
200 | 22 | /* | ||
201 | 23 | Component to set the background of the app | ||
202 | 24 | */ | ||
203 | 25 | |||
204 | 26 | Image { | ||
205 | 27 | id: _background | ||
206 | 28 | |||
207 | 29 | asynchronous: true | ||
208 | 30 | anchors.fill: parent | ||
209 | 31 | source: "../graphics/Background_Texture.jpg" | ||
210 | 32 | } | ||
211 | 0 | 33 | ||
212 | === added file 'app/graphics/Background_Texture_Dark.jpg' | |||
213 | 1 | Binary files app/graphics/Background_Texture_Dark.jpg 1970-01-01 00:00:00 +0000 and app/graphics/Background_Texture_Dark.jpg 2015-07-17 21:47:41 +0000 differ | 34 | Binary files app/graphics/Background_Texture_Dark.jpg 1970-01-01 00:00:00 +0000 and app/graphics/Background_Texture_Dark.jpg 2015-07-17 21:47:41 +0000 differ |
214 | === added file 'app/graphics/Inner_Clock_Texture_Dark.png' | |||
215 | 2 | Binary files app/graphics/Inner_Clock_Texture_Dark.png 1970-01-01 00:00:00 +0000 and app/graphics/Inner_Clock_Texture_Dark.png 2015-07-17 21:47:41 +0000 differ | 35 | Binary files app/graphics/Inner_Clock_Texture_Dark.png 1970-01-01 00:00:00 +0000 and app/graphics/Inner_Clock_Texture_Dark.png 2015-07-17 21:47:41 +0000 differ |
216 | === modified file 'app/ubuntu-clock-app.qml' | |||
217 | --- app/ubuntu-clock-app.qml 2015-07-15 22:31:52 +0000 | |||
218 | +++ app/ubuntu-clock-app.qml 2015-07-17 21:47:41 +0000 | |||
219 | @@ -42,6 +42,8 @@ | |||
220 | 42 | */ | 42 | */ |
221 | 43 | automaticOrientation: false | 43 | automaticOrientation: false |
222 | 44 | 44 | ||
223 | 45 | property bool isNightMode: clockModeDocument.contents.nightMode | ||
224 | 46 | |||
225 | 45 | /* | 47 | /* |
226 | 46 | The width and height defined below are the same dimension used by the | 48 | The width and height defined below are the same dimension used by the |
227 | 47 | designers in the clock visual spec. | 49 | designers in the clock visual spec. |
228 | @@ -67,7 +69,7 @@ | |||
229 | 67 | create: true | 69 | create: true |
230 | 68 | database: clockDB | 70 | database: clockDB |
231 | 69 | docId: "clockModeDocument" | 71 | docId: "clockModeDocument" |
233 | 70 | defaults: { "digitalMode": false } | 72 | defaults: { "digitalMode": false, "nightMode": false } |
234 | 71 | } | 73 | } |
235 | 72 | 74 | ||
236 | 73 | U1db.Document { | 75 | U1db.Document { |
237 | 74 | 76 | ||
238 | === modified file 'app/upstreamcomponents/PageWithBottomEdge.qml' | |||
239 | --- app/upstreamcomponents/PageWithBottomEdge.qml 2015-05-27 16:03:23 +0000 | |||
240 | +++ app/upstreamcomponents/PageWithBottomEdge.qml 2015-07-17 21:47:41 +0000 | |||
241 | @@ -175,7 +175,7 @@ | |||
242 | 175 | z: 1 | 175 | z: 1 |
243 | 176 | width: tipLabel.paintedWidth + units.gu(6) | 176 | width: tipLabel.paintedWidth + units.gu(6) |
244 | 177 | height: bottomEdge.tipHeight + units.gu(1) | 177 | height: bottomEdge.tipHeight + units.gu(1) |
246 | 178 | color: Theme.palette.normal.overlay | 178 | color: isNightMode ? "black" : Theme.palette.normal.overlay // CUSTOM |
247 | 179 | Label { | 179 | Label { |
248 | 180 | id: tipLabel | 180 | id: tipLabel |
249 | 181 | 181 | ||
250 | @@ -184,6 +184,7 @@ | |||
251 | 184 | left: parent.left | 184 | left: parent.left |
252 | 185 | right: parent.right | 185 | right: parent.right |
253 | 186 | } | 186 | } |
254 | 187 | color: isNightMode ? UbuntuColors.warmGrey : "black" // CUSTOM | ||
255 | 187 | height: bottomEdge.tipHeight | 188 | height: bottomEdge.tipHeight |
256 | 188 | verticalAlignment: Text.AlignVCenter | 189 | verticalAlignment: Text.AlignVCenter |
257 | 189 | horizontalAlignment: Text.AlignHCenter | 190 | horizontalAlignment: Text.AlignHCenter |
258 | 190 | 191 | ||
259 | === modified file 'app/worldclock/AddWorldCityButton.qml' | |||
260 | --- app/worldclock/AddWorldCityButton.qml 2015-05-27 16:03:23 +0000 | |||
261 | +++ app/worldclock/AddWorldCityButton.qml 2015-07-17 21:47:41 +0000 | |||
262 | @@ -28,7 +28,7 @@ | |||
263 | 28 | 28 | ||
264 | 29 | Label { | 29 | Label { |
265 | 30 | text: i18n.tr("Add") | 30 | text: i18n.tr("Add") |
267 | 31 | color: UbuntuColors.midAubergine | 31 | color: isNightMode ? UbuntuColors.warmGrey : UbuntuColors.midAubergine |
268 | 32 | anchors { | 32 | anchors { |
269 | 33 | right: _addButton.left | 33 | right: _addButton.left |
270 | 34 | rightMargin: units.gu(1) | 34 | rightMargin: units.gu(1) |
271 | @@ -49,7 +49,7 @@ | |||
272 | 49 | 49 | ||
273 | 50 | Icon { | 50 | Icon { |
274 | 51 | anchors.centerIn: parent | 51 | anchors.centerIn: parent |
276 | 52 | color: UbuntuColors.coolGrey | 52 | color: isNightMode ? UbuntuColors.warmGrey : UbuntuColors.coolGrey |
277 | 53 | name: "add" | 53 | name: "add" |
278 | 54 | height: units.gu(2) | 54 | height: units.gu(2) |
279 | 55 | width: height | 55 | width: height |
280 | @@ -59,7 +59,7 @@ | |||
281 | 59 | 59 | ||
282 | 60 | Label { | 60 | Label { |
283 | 61 | text: i18n.tr("City") | 61 | text: i18n.tr("City") |
285 | 62 | color: UbuntuColors.midAubergine | 62 | color: isNightMode ? UbuntuColors.warmGrey : UbuntuColors.midAubergine |
286 | 63 | anchors { | 63 | anchors { |
287 | 64 | left: _addButton.right | 64 | left: _addButton.right |
288 | 65 | leftMargin: units.gu(1) | 65 | leftMargin: units.gu(1) |
289 | 66 | 66 | ||
290 | === modified file 'app/worldclock/UserWorldCityDelegate.qml' | |||
291 | --- app/worldclock/UserWorldCityDelegate.qml 2015-05-27 16:03:23 +0000 | |||
292 | +++ app/worldclock/UserWorldCityDelegate.qml 2015-07-17 21:47:41 +0000 | |||
293 | @@ -56,7 +56,7 @@ | |||
294 | 56 | objectName: "userCityNameText" | 56 | objectName: "userCityNameText" |
295 | 57 | width: parent.width | 57 | width: parent.width |
296 | 58 | elide: Text.ElideRight | 58 | elide: Text.ElideRight |
298 | 59 | color: UbuntuColors.midAubergine | 59 | color: isNightMode ? UbuntuColors.warmGrey : UbuntuColors.midAubergine |
299 | 60 | } | 60 | } |
300 | 61 | 61 | ||
301 | 62 | Label { | 62 | Label { |
302 | @@ -65,6 +65,7 @@ | |||
303 | 65 | fontSize: "xx-small" | 65 | fontSize: "xx-small" |
304 | 66 | width: parent.width | 66 | width: parent.width |
305 | 67 | elide: Text.ElideRight | 67 | elide: Text.ElideRight |
306 | 68 | color: isNightMode ? UbuntuColors.warmGrey : UbuntuColors.coolGrey | ||
307 | 68 | } | 69 | } |
308 | 69 | } | 70 | } |
309 | 70 | 71 | ||
310 | @@ -138,6 +139,7 @@ | |||
311 | 138 | maximumLineCount: 2 | 139 | maximumLineCount: 2 |
312 | 139 | elide: Text.ElideRight | 140 | elide: Text.ElideRight |
313 | 140 | horizontalAlignment: Text.AlignRight | 141 | horizontalAlignment: Text.AlignRight |
314 | 142 | color: isNightMode ? UbuntuColors.warmGrey : UbuntuColors.coolGrey | ||
315 | 141 | text: { | 143 | text: { |
316 | 142 | var day; | 144 | var day; |
317 | 143 | 145 | ||
318 | 144 | 146 | ||
319 | === modified file 'app/worldclock/WorldCityList.qml' | |||
320 | --- app/worldclock/WorldCityList.qml 2015-06-18 22:57:49 +0000 | |||
321 | +++ app/worldclock/WorldCityList.qml 2015-07-17 21:47:41 +0000 | |||
322 | @@ -152,6 +152,8 @@ | |||
323 | 152 | } | 152 | } |
324 | 153 | } | 153 | } |
325 | 154 | 154 | ||
326 | 155 | LightBackground {} | ||
327 | 156 | |||
328 | 155 | /* | 157 | /* |
329 | 156 | Loader to allow for dynamic loading/unloading of the json model only when | 158 | Loader to allow for dynamic loading/unloading of the json model only when |
330 | 157 | necessary. | 159 | necessary. |
331 | 158 | 160 | ||
332 | === modified file 'po/com.ubuntu.clock.pot' | |||
333 | --- po/com.ubuntu.clock.pot 2015-07-15 23:50:07 +0000 | |||
334 | +++ po/com.ubuntu.clock.pot 2015-07-17 21:47:41 +0000 | |||
335 | @@ -8,7 +8,7 @@ | |||
336 | 8 | msgstr "" | 8 | msgstr "" |
337 | 9 | "Project-Id-Version: \n" | 9 | "Project-Id-Version: \n" |
338 | 10 | "Report-Msgid-Bugs-To: \n" | 10 | "Report-Msgid-Bugs-To: \n" |
340 | 11 | "POT-Creation-Date: 2015-07-16 01:36+0200\n" | 11 | "POT-Creation-Date: 2015-07-17 16:44-0500\n" |
341 | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" | 12 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
342 | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" | 13 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
343 | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" | 14 | "Language-Team: LANGUAGE <LL@li.org>\n" |
344 | @@ -19,7 +19,7 @@ | |||
345 | 19 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" | 19 | "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" |
346 | 20 | 20 | ||
347 | 21 | #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56 | 21 | #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56 |
349 | 22 | #: ../app/alarm/EditAlarmPage.qml:291 | 22 | #: ../app/alarm/EditAlarmPage.qml:293 |
350 | 23 | msgid "Label" | 23 | msgid "Label" |
351 | 24 | msgstr "" | 24 | msgstr "" |
352 | 25 | 25 | ||
353 | @@ -38,7 +38,7 @@ | |||
354 | 38 | msgstr "" | 38 | msgstr "" |
355 | 39 | 39 | ||
356 | 40 | #: ../app/alarm/AlarmPage.qml:51 ../app/alarm/EditAlarmPage.qml:44 | 40 | #: ../app/alarm/AlarmPage.qml:51 ../app/alarm/EditAlarmPage.qml:44 |
358 | 41 | #: ../app/alarm/EditAlarmPage.qml:166 | 41 | #: ../app/alarm/EditAlarmPage.qml:168 |
359 | 42 | msgid "Alarm" | 42 | msgid "Alarm" |
360 | 43 | msgstr "" | 43 | msgstr "" |
361 | 44 | 44 | ||
362 | @@ -50,15 +50,15 @@ | |||
363 | 50 | msgid "Select All" | 50 | msgid "Select All" |
364 | 51 | msgstr "" | 51 | msgstr "" |
365 | 52 | 52 | ||
367 | 53 | #: ../app/alarm/AlarmPage.qml:162 | 53 | #: ../app/alarm/AlarmPage.qml:164 |
368 | 54 | msgid "No saved alarms" | 54 | msgid "No saved alarms" |
369 | 55 | msgstr "" | 55 | msgstr "" |
370 | 56 | 56 | ||
372 | 57 | #: ../app/alarm/AlarmPage.qml:163 | 57 | #: ../app/alarm/AlarmPage.qml:165 |
373 | 58 | msgid "Tap the + icon to add an alarm" | 58 | msgid "Tap the + icon to add an alarm" |
374 | 59 | msgstr "" | 59 | msgstr "" |
375 | 60 | 60 | ||
377 | 61 | #: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:281 | 61 | #: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:283 |
378 | 62 | msgid "Repeat" | 62 | msgid "Repeat" |
379 | 63 | msgstr "" | 63 | msgstr "" |
380 | 64 | 64 | ||
381 | @@ -68,39 +68,43 @@ | |||
382 | 68 | 68 | ||
383 | 69 | #. TRANSLATORS: Silence after | 69 | #. TRANSLATORS: Silence after |
384 | 70 | #. TRANSLATORS: Snooze for | 70 | #. TRANSLATORS: Snooze for |
385 | 71 | #: ../app/alarm/AlarmSettingsPage.qml:54 ../app/alarm/AlarmSettingsPage.qml:55 | ||
386 | 72 | #: ../app/alarm/AlarmSettingsPage.qml:56 ../app/alarm/AlarmSettingsPage.qml:57 | 71 | #: ../app/alarm/AlarmSettingsPage.qml:56 ../app/alarm/AlarmSettingsPage.qml:57 |
388 | 73 | #: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68 | 72 | #: ../app/alarm/AlarmSettingsPage.qml:58 ../app/alarm/AlarmSettingsPage.qml:59 |
389 | 74 | #: ../app/alarm/AlarmSettingsPage.qml:69 ../app/alarm/AlarmSettingsPage.qml:70 | 73 | #: ../app/alarm/AlarmSettingsPage.qml:69 ../app/alarm/AlarmSettingsPage.qml:70 |
392 | 75 | #: ../app/alarm/AlarmSettingsPage.qml:126 | 74 | #: ../app/alarm/AlarmSettingsPage.qml:71 ../app/alarm/AlarmSettingsPage.qml:72 |
393 | 76 | #: ../app/alarm/AlarmSettingsPage.qml:154 | 75 | #: ../app/alarm/AlarmSettingsPage.qml:128 |
394 | 76 | #: ../app/alarm/AlarmSettingsPage.qml:156 | ||
395 | 77 | #, qt-format | 77 | #, qt-format |
396 | 78 | msgid "%1 minute" | 78 | msgid "%1 minute" |
397 | 79 | msgid_plural "%1 minutes" | 79 | msgid_plural "%1 minutes" |
398 | 80 | msgstr[0] "" | 80 | msgstr[0] "" |
399 | 81 | msgstr[1] "" | 81 | msgstr[1] "" |
400 | 82 | 82 | ||
402 | 83 | #: ../app/alarm/AlarmSettingsPage.qml:94 | 83 | #: ../app/alarm/AlarmSettingsPage.qml:96 |
403 | 84 | msgid "Alarm volume" | 84 | msgid "Alarm volume" |
404 | 85 | msgstr "" | 85 | msgstr "" |
405 | 86 | 86 | ||
407 | 87 | #: ../app/alarm/AlarmSettingsPage.qml:125 | 87 | #: ../app/alarm/AlarmSettingsPage.qml:127 |
408 | 88 | msgid "Silence after" | 88 | msgid "Silence after" |
409 | 89 | msgstr "" | 89 | msgstr "" |
410 | 90 | 90 | ||
412 | 91 | #: ../app/alarm/AlarmSettingsPage.qml:153 | 91 | #: ../app/alarm/AlarmSettingsPage.qml:155 |
413 | 92 | msgid "Snooze for" | 92 | msgid "Snooze for" |
414 | 93 | msgstr "" | 93 | msgstr "" |
415 | 94 | 94 | ||
417 | 95 | #: ../app/alarm/AlarmSettingsPage.qml:179 | 95 | #: ../app/alarm/AlarmSettingsPage.qml:181 |
418 | 96 | msgid "Vibration" | 96 | msgid "Vibration" |
419 | 97 | msgstr "" | 97 | msgstr "" |
420 | 98 | 98 | ||
422 | 99 | #: ../app/alarm/AlarmSettingsPage.qml:213 | 99 | #: ../app/alarm/AlarmSettingsPage.qml:216 |
423 | 100 | msgid "Night mode" | ||
424 | 101 | msgstr "" | ||
425 | 102 | |||
426 | 103 | #: ../app/alarm/AlarmSettingsPage.qml:257 | ||
427 | 100 | msgid "Change time and date" | 104 | msgid "Change time and date" |
428 | 101 | msgstr "" | 105 | msgstr "" |
429 | 102 | 106 | ||
431 | 103 | #: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:304 | 107 | #: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:306 |
432 | 104 | msgid "Sound" | 108 | msgid "Sound" |
433 | 105 | msgstr "" | 109 | msgstr "" |
434 | 106 | 110 | ||
435 | @@ -156,7 +160,7 @@ | |||
436 | 156 | msgid "Edit alarm" | 160 | msgid "Edit alarm" |
437 | 157 | msgstr "" | 161 | msgstr "" |
438 | 158 | 162 | ||
440 | 159 | #: ../app/alarm/EditAlarmPage.qml:325 | 163 | #: ../app/alarm/EditAlarmPage.qml:327 |
441 | 160 | msgid "Delete alarm" | 164 | msgid "Delete alarm" |
442 | 161 | msgstr "" | 165 | msgstr "" |
443 | 162 | 166 | ||
444 | @@ -175,37 +179,37 @@ | |||
445 | 175 | 179 | ||
446 | 176 | #. TRANSLATORS: this indicates if the time in a world clock | 180 | #. TRANSLATORS: this indicates if the time in a world clock |
447 | 177 | #. is behind or ahead of the time at the current location | 181 | #. is behind or ahead of the time at the current location |
449 | 178 | #: ../app/worldclock/UserWorldCityDelegate.qml:146 | 182 | #: ../app/worldclock/UserWorldCityDelegate.qml:148 |
450 | 179 | msgid "behind" | 183 | msgid "behind" |
451 | 180 | msgstr "" | 184 | msgstr "" |
452 | 181 | 185 | ||
454 | 182 | #: ../app/worldclock/UserWorldCityDelegate.qml:147 | 186 | #: ../app/worldclock/UserWorldCityDelegate.qml:149 |
455 | 183 | msgid "ahead" | 187 | msgid "ahead" |
456 | 184 | msgstr "" | 188 | msgstr "" |
457 | 185 | 189 | ||
458 | 186 | #. TRANSLATORS: the first argument is hour, followed by | 190 | #. TRANSLATORS: the first argument is hour, followed by |
459 | 187 | #. minute, and the translation for either 'behind' or | 191 | #. minute, and the translation for either 'behind' or |
460 | 188 | #. 'ahead' | 192 | #. 'ahead' |
462 | 189 | #: ../app/worldclock/UserWorldCityDelegate.qml:157 | 193 | #: ../app/worldclock/UserWorldCityDelegate.qml:159 |
463 | 190 | #, qt-format | 194 | #, qt-format |
464 | 191 | msgid "%1h %2m %3" | 195 | msgid "%1h %2m %3" |
465 | 192 | msgstr "" | 196 | msgstr "" |
466 | 193 | 197 | ||
467 | 194 | #. TRANSLATORS: the first argument is hour, followed by the | 198 | #. TRANSLATORS: the first argument is hour, followed by the |
468 | 195 | #. translation for either 'behind' or 'ahead' | 199 | #. translation for either 'behind' or 'ahead' |
470 | 196 | #: ../app/worldclock/UserWorldCityDelegate.qml:166 | 200 | #: ../app/worldclock/UserWorldCityDelegate.qml:168 |
471 | 197 | #, qt-format | 201 | #, qt-format |
472 | 198 | msgid "%1h %2" | 202 | msgid "%1h %2" |
473 | 199 | msgstr "" | 203 | msgstr "" |
474 | 200 | 204 | ||
475 | 201 | #. TRANSLATORS: the first argument is minute, followed by the | 205 | #. TRANSLATORS: the first argument is minute, followed by the |
476 | 202 | #. translation for either 'behind' or 'ahead' | 206 | #. translation for either 'behind' or 'ahead' |
478 | 203 | #: ../app/worldclock/UserWorldCityDelegate.qml:174 | 207 | #: ../app/worldclock/UserWorldCityDelegate.qml:176 |
479 | 204 | #, qt-format | 208 | #, qt-format |
480 | 205 | msgid "%1m %2" | 209 | msgid "%1m %2" |
481 | 206 | msgstr "" | 210 | msgstr "" |
482 | 207 | 211 | ||
484 | 208 | #: ../app/worldclock/UserWorldCityDelegate.qml:180 | 212 | #: ../app/worldclock/UserWorldCityDelegate.qml:182 |
485 | 209 | msgid "Same time" | 213 | msgid "Same time" |
486 | 210 | msgstr "" | 214 | msgstr "" |
487 | 211 | 215 | ||
488 | @@ -217,19 +221,19 @@ | |||
489 | 217 | msgid "Search..." | 221 | msgid "Search..." |
490 | 218 | msgstr "" | 222 | msgstr "" |
491 | 219 | 223 | ||
493 | 220 | #: ../app/worldclock/WorldCityList.qml:213 | 224 | #: ../app/worldclock/WorldCityList.qml:215 |
494 | 221 | msgid "Searching for a city" | 225 | msgid "Searching for a city" |
495 | 222 | msgstr "" | 226 | msgstr "" |
496 | 223 | 227 | ||
498 | 224 | #: ../app/worldclock/WorldCityList.qml:218 | 228 | #: ../app/worldclock/WorldCityList.qml:220 |
499 | 225 | msgid "No City Found" | 229 | msgid "No City Found" |
500 | 226 | msgstr "" | 230 | msgstr "" |
501 | 227 | 231 | ||
503 | 228 | #: ../app/worldclock/WorldCityList.qml:224 | 232 | #: ../app/worldclock/WorldCityList.qml:226 |
504 | 229 | msgid "Unable to connect." | 233 | msgid "Unable to connect." |
505 | 230 | msgstr "" | 234 | msgstr "" |
506 | 231 | 235 | ||
508 | 232 | #: ../app/worldclock/WorldCityList.qml:225 | 236 | #: ../app/worldclock/WorldCityList.qml:227 |
509 | 233 | msgid "Please check your network connection and try again" | 237 | msgid "Please check your network connection and try again" |
510 | 234 | msgstr "" | 238 | msgstr "" |
511 | 235 | 239 |
Wow. Awensome work.
I wish I could approve that MR. Could you please ask ~raecontreras, if he has spare time to approve UX design for that?