Ubuntu Clock App

Merge lp:~nik90/ubuntu-clock-app/resync-trunk into lp:~ubuntu-clock-dev/ubuntu-clock-app/vivid

  1. resync-trunk
  2. Merge into vivid
Proposed by Nekhelesh Ramananthan
Status: Merged
Merged at revision: 182
Proposed branch: lp:~nik90/ubuntu-clock-app/resync-trunk
Merge into: lp:~ubuntu-clock-dev/ubuntu-clock-app/vivid
Diff against target: 3329 lines (+1595/-277)
40 files modified
app/alarm/AlarmDelegate.qml (+18/-1)
app/alarm/AlarmRepeat.qml (+21/-36)
app/alarm/EditAlarmPage.qml (+2/-2)
app/clock/ClockPage.qml (+4/-1)
app/clock/MainClock.qml (+6/-1)
app/ubuntu-clock-app.qml (+9/-1)
app/worldclock/WorldCityList.qml (+1/-1)
debian/changelog (+41/-23)
debian/copyright (+4/-4)
manifest.json.in (+1/-1)
po/am.po (+245/-0)
po/ast.po (+11/-11)
po/br.po (+7/-7)
po/ca.po (+7/-7)
po/ca@valencia.po (+7/-7)
po/com.ubuntu.clock.pot (+5/-5)
po/cs.po (+7/-7)
po/da.po (+7/-7)
po/de.po (+23/-21)
po/en_GB.po (+7/-7)
po/es.po (+10/-10)
po/eu.po (+7/-7)
po/fa.po (+7/-7)
po/fi.po (+7/-7)
po/fr.po (+7/-7)
po/fur.po (+245/-0)
po/gl.po (+7/-7)
po/hu.po (+9/-9)
po/it.po (+7/-7)
po/pa.po (+246/-0)
po/pt.po (+7/-7)
po/pt_BR.po (+247/-0)
po/ru.po (+25/-25)
po/sl.po (+7/-7)
po/sv.po (+7/-7)
po/tr.po (+245/-0)
po/zh_CN.po (+7/-7)
po/zh_TW.po (+7/-7)
tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/alarms.pxu (+48/-0)
tests/unit/tst_alarmRepeat.qml (+10/-6)
To merge this branch: bzr merge lp:~nik90/ubuntu-clock-app/resync-trunk
Reviewer Review Type Date Requested Status
Ubuntu Clock Developers Pending
Review via email: mp+251263@code.launchpad.net

Commit message

Resync trunk bug fixes to vivid.

Description of the change

Resync trunk bug fixes to vivid.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/alarm/AlarmDelegate.qml'
2--- app/alarm/AlarmDelegate.qml 2014-11-19 14:56:42 +0000
3+++ app/alarm/AlarmDelegate.qml 2015-02-27 14:05:26 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright (C) 2014 Canonical Ltd
7+ * Copyright (C) 2014-2015 Canonical Ltd
8 *
9 * This file is part of Ubuntu Clock App
10 *
11@@ -94,6 +94,23 @@
12 if (checked !== model.enabled) {
13 var alarmData = model
14 alarmData.enabled = checked
15+
16+ /*
17+ Calculate the new alarm time if it is a one-time alarm and has
18+ gone-off and the user is re-enabling the alarm. Repeating
19+ alarms do this automatically.
20+ */
21+ if(checked && type === Alarm.OneTime && alarmData.date < new Date()) {
22+ var currentTime = new Date()
23+ alarmData.daysOfWeek = alarmUtils.get_alarm_day(currentTime.getDay())
24+
25+ if (alarmData.date.getTime() <= currentTime.getTime()) {
26+ var tomorrow = currentTime
27+ tomorrow.setDate(tomorrow.getDate() + 1)
28+ alarmData.daysOfWeek = alarmUtils.get_alarm_day(tomorrow.getDay())
29+ }
30+ }
31+
32 alarmData.save()
33 }
34 }
35
36=== modified file 'app/alarm/AlarmRepeat.qml'
37--- app/alarm/AlarmRepeat.qml 2014-09-18 10:23:40 +0000
38+++ app/alarm/AlarmRepeat.qml 2015-02-27 14:05:26 +0000
39@@ -1,5 +1,5 @@
40 /*
41- * Copyright (C) 2014 Canonical Ltd
42+ * Copyright (C) 2014-2015 Canonical Ltd
43 *
44 * This file is part of Ubuntu Clock App
45 *
46@@ -27,6 +27,9 @@
47 // Property to set the alarm days of the week in the edit alarm page
48 property var alarm
49
50+ // Property to hold the alarm utils functions passed from edit alarm page
51+ property var alarmUtils
52+
53 visible: false
54 title: i18n.tr("Repeat")
55
56@@ -76,40 +79,22 @@
57
58 ListModel {
59 id: daysModel
60-
61- ListElement {
62- day: "1"
63- flag: Alarm.Monday
64- }
65-
66- ListElement {
67- day: "2"
68- flag: Alarm.Tuesday
69- }
70-
71- ListElement {
72- day: "3"
73- flag: Alarm.Wednesday
74- }
75-
76- ListElement {
77- day: "4"
78- flag: Alarm.Thursday
79- }
80-
81- ListElement {
82- day: "5"
83- flag: Alarm.Friday
84- }
85-
86- ListElement {
87- day: "6"
88- flag: Alarm.Saturday
89- }
90-
91- ListElement {
92- day: "0"
93- flag: Alarm.Sunday
94+ Component.onCompleted: initialise()
95+
96+ // Function to generate the days of the week based on the user locale
97+ function initialise() {
98+ // Get the first day of the week based on the user locale
99+ var j = Qt.locale().firstDayOfWeek
100+
101+ // Set first item on the list to be the first day of the week
102+ daysModel.append({ "day": Qt.locale().standaloneDayName(j, Locale.LongFormat),
103+ "flag": alarmUtils.get_alarm_day(j) })
104+
105+ // Retrieve the rest of the alarms days of the week
106+ for (var i=1; i<=6; i++) {
107+ daysModel.append({ "day": Qt.locale().standaloneDayName((j+i)%7, Locale.LongFormat),
108+ "flag": alarmUtils.get_alarm_day((j+i)%7) })
109+ }
110 }
111 }
112
113@@ -141,7 +126,7 @@
114 }
115
116 color: UbuntuColors.midAubergine
117- text: Qt.locale().standaloneDayName(day, Locale.LongFormat)
118+ text: day
119 }
120
121 control: CheckBox {
122
123=== modified file 'app/alarm/EditAlarmPage.qml'
124--- app/alarm/EditAlarmPage.qml 2014-10-16 19:03:51 +0000
125+++ app/alarm/EditAlarmPage.qml 2015-02-27 14:05:26 +0000
126@@ -1,5 +1,5 @@
127 /*
128- * Copyright (C) 2014 Canonical Ltd
129+ * Copyright (C) 2014-2015 Canonical Ltd
130 *
131 * This file is part of Ubuntu Clock App
132 *
133@@ -292,7 +292,7 @@
134 text: i18n.tr("Repeat")
135 subText: alarmUtils.format_day_string(_alarm.daysOfWeek, _alarm.type)
136 onClicked: pageStack.push(Qt.resolvedUrl("AlarmRepeat.qml"),
137- {"alarm": _alarm})
138+ {"alarm": _alarm, "alarmUtils": alarmUtils})
139 }
140
141 SubtitledListItem {
142
143=== modified file 'app/clock/ClockPage.qml'
144--- app/clock/ClockPage.qml 2014-11-04 15:58:05 +0000
145+++ app/clock/ClockPage.qml 2015-02-27 14:05:26 +0000
146@@ -1,5 +1,5 @@
147 /*
148- * Copyright (C) 2014 Canonical Ltd
149+ * Copyright (C) 2014-2015 Canonical Ltd
150 *
151 * This file is part of Ubuntu Clock App
152 *
153@@ -36,6 +36,9 @@
154 // Property to keep track of the clock time
155 property var clockTime: new Date()
156
157+ // Property to keep track of app cold start status
158+ property alias isColdStart: clock.isColdStart
159+
160 property var alarmModel
161
162 flickable: null
163
164=== modified file 'app/clock/MainClock.qml'
165--- app/clock/MainClock.qml 2014-10-10 19:58:49 +0000
166+++ app/clock/MainClock.qml 2015-02-27 14:05:26 +0000
167@@ -1,5 +1,5 @@
168 /*
169- * Copyright (C) 2014 Canonical Ltd
170+ * Copyright (C) 2014-2015 Canonical Ltd
171 *
172 * This file is part of Ubuntu Clock App
173 *
174@@ -23,6 +23,9 @@
175 Clock {
176 id: mainClock
177
178+ // Property to keep track of the cold start status of the app
179+ property bool isColdStart: true
180+
181 fontSize: units.dp(62)
182 periodFontSize: units.dp(12)
183 innerCircleWidth: units.gu(23)
184@@ -98,6 +101,7 @@
185 target: digitalModeLoader.item
186 onAnimationComplete: {
187 alarmModelLoader.source = Qt.resolvedUrl("../alarm/AlarmModelComponent.qml")
188+ isColdStart = false
189 }
190 }
191
192@@ -105,6 +109,7 @@
193 target: analogModeLoader.item
194 onAnimationComplete: {
195 alarmModelLoader.source = Qt.resolvedUrl("../alarm/AlarmModelComponent.qml")
196+ isColdStart = false
197 }
198 }
199 }
200
201=== modified file 'app/ubuntu-clock-app.qml'
202--- app/ubuntu-clock-app.qml 2014-10-28 10:54:45 +0000
203+++ app/ubuntu-clock-app.qml 2015-02-27 14:05:26 +0000
204@@ -1,5 +1,5 @@
205 /*
206- * Copyright (C) 2014 Canonical Ltd
207+ * Copyright (C) 2014-2015 Canonical Ltd
208 *
209 * This file is part of Ubuntu Clock App
210 *
211@@ -86,6 +86,14 @@
212
213 onApplicationStateChanged: {
214 localTimeSource.update()
215+ /*
216+ Reload the alarm model when the clock app gains focus to refresh
217+ the alarm page UI in the case of alarm notifications.
218+ */
219+ if(applicationState && !clockPage.isColdStart) {
220+ alarmModelLoader.source = ""
221+ alarmModelLoader.source = Qt.resolvedUrl("alarm/AlarmModelComponent.qml")
222+ }
223 }
224
225 PageStack {
226
227=== modified file 'app/worldclock/WorldCityList.qml'
228--- app/worldclock/WorldCityList.qml 2014-10-16 15:52:23 +0000
229+++ app/worldclock/WorldCityList.qml 2015-02-27 14:05:26 +0000
230@@ -125,7 +125,7 @@
231 var url = String("%1%2%3")
232 .arg("http://geoname-lookup.ubuntu.com/?query=")
233 .arg(searchField.text)
234- .arg("&app=com.ubuntu.clock&version=3.2.x")
235+ .arg("&app=com.ubuntu.clock&version=3.3.x")
236 console.log("Online URL: " + url)
237 if (jsonTimeZoneModelLoader.status === Loader.Ready) {
238 jsonTimeZoneModel.source = Qt.resolvedUrl(url)
239
240=== modified file 'debian/changelog'
241--- debian/changelog 2014-11-19 14:51:35 +0000
242+++ debian/changelog 2015-02-27 14:05:26 +0000
243@@ -1,3 +1,23 @@
244+ubuntu-clock-app (3.3) utopic; urgency=medium
245+
246+ [Nekhelesh Ramananthan]
247+ * Fixed alarm string not being translatable (LP: #1380248)
248+ * Bumped framework version to ubuntu-sdk-14.10
249+ * Fixed the incorrect overriding of alarm delegate model value.
250+ * Fixed qml tests broken in vivid due to listitem behaviour change.
251+ * OneTime alarms are not automatically dismissed after they are triggered (LP: #1362341)
252+ * Fixed Day-of-Week picker in alarms not respecting user locale (LP: #1372545)
253+
254+ [Brendan Donegan]
255+ * Fixed AP failure by waiting for the bottom edge tip visible property to be true
256+ before trying to swipe up the bottom edge.
257+
258+ [Riccardo Padovani]
259+ * Fixed one-time alarms not being able to be re-enabled using the alarm switch
260+ after they have gone off once (LP: #1413027)
261+
262+ -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Wed, 21 Jan 2015 21:05:24 +0100
263+
264 ubuntu-clock-app (3.2) utopic; urgency=medium
265
266 [Nekhelesh Ramananthan]
267@@ -27,8 +47,6 @@
268 now set to false to improve startup animation.
269 * Customised splash screen (white background) (LP: #1377638)
270 * Added manual test to check disabling of alarms.
271- * Fixed alarm string not being translatable (LP: #1380248)
272- * Fixed the incorrect overriding of alarm delegate model value.
273
274 [Akiva Shammai Avraham]
275 * Improved the analog clock performance by updating the clock hands every second
276@@ -59,7 +77,7 @@
277 * Updated pot file name
278 * Added support for user location retrieval using GPS (LP: #1323198)
279 * Added header shortcut to select/deselect all alarm repeat options (LP: #1362089)
280- * Added visual tweaks (80% opacity for disabled alarms) and show time to
281+ * Added visual tweaks (80% opacity for disabled alarms) and show time to
282 next alarm when enabling an alarm.
283 * Enabled one-time alarms in the UI (LP: #1358320)
284 * Fixed the transition animation to alarms to be more smoother (LP: #1362081)
285@@ -106,7 +124,7 @@
286 [ Daniel Holbach ]
287 * Fix debhelper-but-no-misc-depends ubuntu-clock-app-autopilot.
288 * Bump Standards-Version to 3.9.5, no changes required.
289- * Add missing build-depends.
290+ * Add missing build-depends.
291 * Run 'wrap-and-sort'.
292 * Don't try to install files from usr/bin, there are none.
293 * Install files from usr/lib.
294@@ -119,7 +137,7 @@
295 somewhat.
296 * Run tests as autopkgtest. (LP: #1354091)
297 * Don't ignore return code of autopilot test execution. (LP: #1354095)
298- * Fix path in Exec= line of .desktop file. (LP: #1354081)
299+ * Fix path in Exec= line of .desktop file. (LP: #1354081)
300 * Move module files into proper place. (LP: #1354079)
301 * Make pep8 happy.
302 * Add -I argument to Exec line in .desktop file.
303@@ -135,9 +153,9 @@
304 * Used a proper qt_imports_dir (still needs qml import updates).
305 * Moved gnuinstalldirs higher up for better path management.
306 * Removed a bunch of very custom variables and build on top.
307- * Removed the install target for the gallery directory as it was a dup
308+ * Removed the install target for the gallery directory as it was a dup
309 and going to the wrong path.
310- * Not installing icon for deb and just rely on us using the desktop
311+ * Not installing icon for deb and just rely on us using the desktop
312 default (we can depend on the suru icon set, it's there).
313 * Made some rules filter out if not in qtcreator.
314 * Changed the path for a couple of things to use common subpaths in most
315@@ -152,14 +170,14 @@
316 * Fixed a small portion of the listitem behind left behind after
317 deleting it. (LP: #1354617)
318 * Added vibration settings option for alarms (LP: #1350017)
319-
320+
321 [Michael Zanetti]
322 * Improve the performance of the world city list by creating QTimeZone
323 objects only once as they are really slow to create. (LP: #1350433)
324-
325+
326 [Nicholas Skaggs]
327 * Tweak AP setup and launching
328-
329+
330 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Mon, 11 Aug 2014 16:20:00 +0200
331
332 ubuntu-clock-app (2.8) utopic; urgency=medium
333@@ -170,7 +188,7 @@
334 * Added fast scroll to the world city page (LP: #1349877)
335 * Implemented the world clock UI in the main clock page
336 * Added settings option to change system time in the clock app.
337-
338+
339 [Carla Sella]
340 * Setup autopilot infrastructure and added alarm test
341 * Added objectNames required for the AP tests
342@@ -183,14 +201,14 @@
343 [Nekhelesh Ramananthan]
344 * Expanded base TimeZoneModel to also take a u1db query model
345 * Added more cities to the local world city list
346- * Improved the accuracy of the clock hour hand by taking into account the
347+ * Improved the accuracy of the clock hour hand by taking into account the
348 minutes as well.
349 * Improved minute and second hand accuracy
350 * Improved the clock hands movement. It is now more smoother.
351 * Added a delete alarm button in the edit alarm page as per design
352 * Encapsulated the settings icon into an abstract button to provide haptic
353 feedback when pressed.
354-
355+
356 [Victor Thompson]
357 * Resolve build warning related to unused variable in the AlarmSettings plugin
358
359@@ -204,25 +222,25 @@
360 * Updated license headers
361 * Added support to listen to Dbus changes to the alarm settings and update
362 UI automatically.
363-
364+
365 [Victor Thompson]
366 * Update digital time every second instead of every 60 seconds
367
368 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Wed, 30 Jul 2014 10:10:23 +0200
369-
370+
371 ubuntu-clock-app (2.5) utopic; urgency=medium
372
373 [Nekhelesh Ramananthan]
374 * Added a page to select world cities.
375 * World cities are filtered as the user types using the SDK SortFilterModel
376 * Added a XML file with a list of popular cities
377-
378+
379 [Victor Thompson]
380 * Center the plus icon in PullToAdd.qml
381 * Use the ok icon instead of save in the edit alarm page
382
383 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Thu, 24 Jul 2014 15:20:15 +0200
384-
385+
386 ubuntu-clock-app (2.4) utopic; urgency=medium
387
388 [Nekhelesh Ramananthan]
389@@ -264,14 +282,14 @@
390 * Updated the font size of several UI elements according to design.
391
392 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Thu, 03 Jul 2014 10:00:00 +0200
393-
394+
395 ubuntu-clock-app (2.0) utopic; urgency=medium
396
397 [Nekhelesh Ramananthan]
398 * First release of the clock app reboot
399 * Implemented Digital Mode (LP: #1267146)
400 * Fixed scrollable lists on scrollable pages (LP: #1227418)
401- * Added developer guidelines
402+ * Added developer guidelines
403
404 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Thu, 26 Jun 2014 18:57:25 +0200
405
406@@ -291,7 +309,7 @@
407 * Return more fine-grained territorial divisions for city search results (LP: #1230153)
408 * Improve the visual appearance of the clock, timer, stopwatch and alarm
409 * Removed hour support from timer
410-
411+
412 [Sergio Schvezov]
413 * Translation for desktop and debian package
414 * Fix click package confinement issues
415@@ -323,7 +341,7 @@
416 [Paolo Rotolo]
417 * Add error message if no cities were found (LP: #1222235)
418 * Timer label updates before the timer hand reaches destination (LP: #1172869)
419- * Cancel toolbar action needs the correct icon (LP: #1222942)
420+ * Cancel toolbar action needs the correct icon (LP: #1222942)
421
422 -- Nekhelesh Ramananthan <krnekhelesh@gmail.com> Fri, 27 Sep 2013 12:47:21 +0200
423
424@@ -387,7 +405,7 @@
425
426 ubuntu-clock-app (0.3) raring; urgency=low
427
428- * Added translations support
429+ * Added translations support
430
431 -- David Planella <david.planella@ubuntu.com> Tue, 07 May 2013 16:10:25 +0200
432
433@@ -422,7 +440,7 @@
434 * Analog clock markers around 3,6,9,12 should be differentiated from others (LP: #1163852)
435 * Clock app code style does not follow qml, javascript guidelines (LP: #1167040)
436 * No easy way to set timer for an hour or more (LP: #1163854)
437-
438+
439 [ Alessandro Pozzi ]
440 * Timer function requires design for adding and editing presets (LP: #1164443)
441 * Implemented basic stopwatch functionality
442
443=== modified file 'debian/copyright'
444--- debian/copyright 2014-08-01 07:15:48 +0000
445+++ debian/copyright 2015-02-27 14:05:26 +0000
446@@ -3,20 +3,20 @@
447 Source: https://launchpad.net/ubuntu-clock-app
448
449 Files: *
450-Copyright: 2013, 2014 Canonical Ltd.
451+Copyright: 2013-2015 Canonical Ltd.
452 2013 Alessandro Pozzi <signor.hyde@gmail.com>
453 2013 Juha Ristolainen <juha.ristolainen@codemancers.fi>
454 2013 Marco Biscaro <marcobiscaro2112@gmail.com>
455- 2013, 2014 Nekhelesh Ramananthan <krnekhelesh@gmail.com>
456+ 2013-2015 Nekhelesh Ramananthan <krnekhelesh@gmail.com>
457 2013 Nick Leppänen Larsson <frals@frals.se>
458 2013 Omer Akram <om26er@ubuntu.com>
459 2013 Paolo Rotolo <paolorotolo@ubuntu.com>
460- 2013, 2014 Riccardo Padovani <rpadovani@ubuntu.com>
461+ 2013-2015 Riccardo Padovani <rpadovani@ubuntu.com>
462 2014 Bartosz Kosiorek <gang65@poczta.onet.pl>
463 License: GPL-3
464
465 Files: debian/*
466-Copyright: 2013, 2014 Canonical Ltd.
467+Copyright: 2013-2015 Canonical Ltd.
468 License: LGPL-3
469
470 License: GPL-3
471
472=== modified file 'manifest.json.in'
473--- manifest.json.in 2014-11-11 14:17:01 +0000
474+++ manifest.json.in 2015-02-27 14:05:26 +0000
475@@ -12,7 +12,7 @@
476 "urls": "share/url-dispatcher/urls/com.ubuntu.clock_clock.url-dispatcher"
477 }
478 },
479- "version": "3.2.@BZR_REVNO@",
480+ "version": "3.3.@BZR_REVNO@",
481 "maintainer": "Ubuntu App Cats <ubuntu-touch-coreapps@lists.launchpad.net>",
482 "x-test": {
483 "autopilot": "ubuntu_clock_app"
484
485=== added file 'po/am.po'
486--- po/am.po 1970-01-01 00:00:00 +0000
487+++ po/am.po 2015-02-27 14:05:26 +0000
488@@ -0,0 +1,245 @@
489+# Amharic translation for ubuntu-clock-app
490+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
491+# This file is distributed under the same license as the ubuntu-clock-app package.
492+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
493+#
494+msgid ""
495+msgstr ""
496+"Project-Id-Version: ubuntu-clock-app\n"
497+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
498+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
499+"PO-Revision-Date: 2015-01-24 23:52+0000\n"
500+"Last-Translator: samson <Unknown>\n"
501+"Language-Team: Amharic <am@li.org>\n"
502+"MIME-Version: 1.0\n"
503+"Content-Type: text/plain; charset=UTF-8\n"
504+"Content-Transfer-Encoding: 8bit\n"
505+"X-Launchpad-Export-Date: 2015-01-25 06:10+0000\n"
506+"X-Generator: Launchpad (build 17306)\n"
507+
508+#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
509+#: ../app/alarm/EditAlarmPage.qml:302
510+msgid "Label"
511+msgstr "ምልክት"
512+
513+#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:117
514+#: ../app/worldclock/UserWorldCityList.qml:101
515+msgid "Delete"
516+msgstr "ማጥፊያ"
517+
518+#: ../app/alarm/AlarmPage.qml:26
519+msgid "Alarms"
520+msgstr "መቀስቀሻዎች"
521+
522+#: ../app/alarm/AlarmPage.qml:43 ../app/alarm/EditAlarmPage.qml:50
523+#: ../app/alarm/EditAlarmPage.qml:177
524+msgid "Alarm"
525+msgstr "መቀስቀሻ"
526+
527+#: ../app/alarm/AlarmPage.qml:58 ../app/worldclock/WorldCityList.qml:80
528+msgid "Back"
529+msgstr "ወደ ኋላ"
530+
531+#: ../app/alarm/AlarmPage.qml:87
532+msgid "Select None"
533+msgstr "ምንም ይምረጡ"
534+
535+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
536+msgid "Select All"
537+msgstr "ሁሉንም መምረጫ"
538+
539+#: ../app/alarm/AlarmPage.qml:149
540+msgid "No saved alarms"
541+msgstr "ምንም የተቀመጠ መቀስቀሻ የለም"
542+
543+#: ../app/alarm/AlarmPage.qml:150
544+msgid "Tap the + icon to add an alarm"
545+msgstr "መታ ያድርጉ + ምልክቱን መቀስቀሻ ለመጨመር"
546+
547+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
548+msgid "Repeat"
549+msgstr "መድገሚያ"
550+
551+#: ../app/alarm/AlarmSettingsPage.qml:29
552+msgid "Settings"
553+msgstr "ማሰናጃ"
554+
555+#: ../app/alarm/AlarmSettingsPage.qml:53 ../app/alarm/AlarmSettingsPage.qml:54
556+#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
557+#: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:66
558+#: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68
559+#: ../app/alarm/AlarmSettingsPage.qml:146
560+#: ../app/alarm/AlarmSettingsPage.qml:215
561+#, qt-format
562+msgid "%1 minutes"
563+msgstr "%1 ደቂቆች"
564+
565+#: ../app/alarm/AlarmSettingsPage.qml:92
566+msgid "Alarm volume"
567+msgstr "መቀስቀሻ መጠን"
568+
569+#: ../app/alarm/AlarmSettingsPage.qml:145
570+msgid "Silence after"
571+msgstr "በኋላ ማጥፊያ"
572+
573+#: ../app/alarm/AlarmSettingsPage.qml:214
574+msgid "Snooze for"
575+msgstr "መቀስቀሻ ለ"
576+
577+#: ../app/alarm/AlarmSettingsPage.qml:259
578+msgid "Vibration"
579+msgstr "ማንቀጥቀጫ"
580+
581+#: ../app/alarm/AlarmSettingsPage.qml:293
582+msgid "Change time and date"
583+msgstr "ሰአት እና ቀን መቀየሪያ"
584+
585+#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:315
586+msgid "Sound"
587+msgstr "ድምፅ"
588+
589+#: ../app/alarm/AlarmUtils.qml:31
590+msgid "Never"
591+msgstr "በፍጹም"
592+
593+#: ../app/alarm/AlarmUtils.qml:37
594+msgid "Weekdays"
595+msgstr "የ ስራ ቀኖች"
596+
597+#: ../app/alarm/AlarmUtils.qml:41
598+msgid "Weekends"
599+msgstr "የ እረፍት ቀኖች"
600+
601+#: ../app/alarm/AlarmUtils.qml:45
602+msgid "Daily"
603+msgstr "በየቀኑ"
604+
605+#: ../app/alarm/AlarmUtils.qml:55
606+msgid "No active alarms"
607+msgstr "ንቁ መቀስቀሻ አልተገኘም"
608+
609+#: ../app/alarm/AlarmUtils.qml:72
610+#, qt-format
611+msgid "Next Alarm %1"
612+msgstr "የሚቀጥለው መቀስቀሻ %1"
613+
614+#: ../app/alarm/AlarmUtils.qml:79
615+msgid "Alarm Passed"
616+msgstr "መቀስቀሻው አልፏል"
617+
618+#: ../app/alarm/AlarmUtils.qml:89
619+#, no-c-format, qt-format
620+msgid "in %1d %2h %3m"
621+msgstr "በ %1ቀ %2ሰ %3ደ"
622+
623+#: ../app/alarm/AlarmUtils.qml:99
624+#, no-c-format, qt-format
625+msgid "in %1h %2m"
626+msgstr "በ %1ሰ %2ደ"
627+
628+#: ../app/alarm/AlarmUtils.qml:108
629+#, no-c-format, qt-format
630+msgid "in %1m"
631+msgstr "በ %1ደ"
632+
633+#: ../app/alarm/EditAlarmPage.qml:43
634+msgid "New alarm"
635+msgstr "አዲስ መቀስቀሻ"
636+
637+#: ../app/alarm/EditAlarmPage.qml:43
638+msgid "Edit alarm"
639+msgstr "መቀስቀሻውን ማረሚያ"
640+
641+#: ../app/alarm/EditAlarmPage.qml:336
642+msgid "Delete alarm"
643+msgstr "መቀስቀሻውን ማጥፊያ"
644+
645+#: ../app/clock/ClockPage.qml:271
646+msgid "Location Service Error!"
647+msgstr "የ አካባቢ ግልጋሎት ስህተት!"
648+
649+#: ../app/clock/ClockPage.qml:273
650+msgid "Retrieving location..."
651+msgstr "አካባቢውን በ መፈለግ ላይ..."
652+
653+#: ../app/worldclock/AddWorldCityButton.qml:30
654+msgid "Add"
655+msgstr "መጨመሪያ"
656+
657+#: ../app/worldclock/AddWorldCityButton.qml:61
658+#: ../app/worldclock/WorldCityList.qml:64
659+msgid "City"
660+msgstr "ከተማ"
661+
662+#. TRANSLATORS: this indicates if the time in a world clock
663+#. is behind or ahead of the time at the current location
664+#: ../app/worldclock/UserWorldCityDelegate.qml:142
665+msgid "behind"
666+msgstr "በኋላ"
667+
668+#: ../app/worldclock/UserWorldCityDelegate.qml:143
669+msgid "ahead"
670+msgstr "በፊት"
671+
672+#. TRANSLATORS: the first argument is hour, followed by
673+#. minute, and the translation for either 'behind' or
674+#. 'ahead'
675+#: ../app/worldclock/UserWorldCityDelegate.qml:153
676+#, qt-format
677+msgid "%1h %2m %3"
678+msgstr "%1ሰ %2ደ %3"
679+
680+#. TRANSLATORS: the first argument is hour, followed by the
681+#. translation for either 'behind' or 'ahead'
682+#: ../app/worldclock/UserWorldCityDelegate.qml:162
683+#, qt-format
684+msgid "%1h %2"
685+msgstr "%1ሰ %2"
686+
687+#. TRANSLATORS: the first argument is minute, followed by the
688+#. translation for either 'behind' or 'ahead'
689+#: ../app/worldclock/UserWorldCityDelegate.qml:170
690+#, qt-format
691+msgid "%1m %2"
692+msgstr "%1ሰ %2"
693+
694+#: ../app/worldclock/UserWorldCityDelegate.qml:176
695+msgid "Same time"
696+msgstr "በተመሳሳይ ጊዜ"
697+
698+#: ../app/worldclock/WorldCityList.qml:51
699+msgid "Select a city"
700+msgstr "ከተማ ይምረጡ"
701+
702+#: ../app/worldclock/WorldCityList.qml:109
703+msgid "Search..."
704+msgstr "መፈለጊያ..."
705+
706+#: ../app/worldclock/WorldCityList.qml:214
707+msgid "Searching for a city"
708+msgstr "ከተማ በመፈለግ ላይ"
709+
710+#: ../app/worldclock/WorldCityList.qml:219
711+msgid "No City Found"
712+msgstr "ከተማ አልተገኘም"
713+
714+#: ../app/worldclock/WorldCityList.qml:225
715+msgid "Unable to connect."
716+msgstr "መገናኘት አልተቻለም"
717+
718+#: ../app/worldclock/WorldCityList.qml:226
719+msgid "Please check your network connection and try again"
720+msgstr "እባክዎን የ ኔትዎርክ ግንኙነት ይምረምሩ እና እንደገና ይሞክሩ"
721+
722+#: ubuntu-clock-app.desktop.in.in.h:1
723+msgid "Clock"
724+msgstr "ሰአት"
725+
726+#: ubuntu-clock-app.desktop.in.in.h:2
727+msgid ""
728+"A sophisticated clock app that provides world clock and alarm functionality."
729+msgstr "በጣም የተወሳሰበ የ ሰአት መተግበሪያ የ አለም ሰአት እና መቀስቀሻ ያካተተ"
730+
731+#: ubuntu-clock-app.desktop.in.in.h:3
732+msgid "time;alarm;alert;clock;world;"
733+msgstr "ሰአት;መቀስቀሻ;ማስጠንቀቂያ;ሰአት;አለም;"
734
735=== modified file 'po/ast.po'
736--- po/ast.po 2014-11-20 06:42:27 +0000
737+++ po/ast.po 2015-02-27 14:05:26 +0000
738@@ -7,15 +7,15 @@
739 msgstr ""
740 "Project-Id-Version: ubuntu-clock-app\n"
741 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
742-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
743-"PO-Revision-Date: 2014-10-12 17:18+0000\n"
744-"Last-Translator: Xuacu Saturio <xuacusk8@gmail.com>\n"
745+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
746+"PO-Revision-Date: 2015-02-11 20:35+0000\n"
747+"Last-Translator: ivarela <ivarela@ubuntu.com>\n"
748 "Language-Team: Asturian <ast@li.org>\n"
749 "MIME-Version: 1.0\n"
750 "Content-Type: text/plain; charset=UTF-8\n"
751 "Content-Transfer-Encoding: 8bit\n"
752-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
753-"X-Generator: Launchpad (build 17252)\n"
754+"X-Launchpad-Export-Date: 2015-02-12 07:08+0000\n"
755+"X-Generator: Launchpad (build 17336)\n"
756
757 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
758 #: ../app/alarm/EditAlarmPage.qml:302
759@@ -44,7 +44,7 @@
760 msgid "Select None"
761 msgstr "Nun esbillar nada"
762
763-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
764+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
765 msgid "Select All"
766 msgstr "Esbillalo too"
767
768@@ -56,7 +56,7 @@
769 msgid "Tap the + icon to add an alarm"
770 msgstr "Toca nel iconu + p'amestar una alarma"
771
772-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
773+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
774 msgid "Repeat"
775 msgstr "Repetir"
776
777@@ -154,13 +154,13 @@
778 msgid "Delete alarm"
779 msgstr "Desaniciar alarma"
780
781-#: ../app/clock/ClockPage.qml:268
782+#: ../app/clock/ClockPage.qml:271
783 msgid "Location Service Error!"
784-msgstr ""
785+msgstr "¡Fallu del serviciu de llocalización!"
786
787-#: ../app/clock/ClockPage.qml:270
788+#: ../app/clock/ClockPage.qml:273
789 msgid "Retrieving location..."
790-msgstr ""
791+msgstr "Obteniendo llocalización..."
792
793 #: ../app/worldclock/AddWorldCityButton.qml:30
794 msgid "Add"
795
796=== modified file 'po/br.po'
797--- po/br.po 2014-11-20 06:42:27 +0000
798+++ po/br.po 2015-02-27 14:05:26 +0000
799@@ -7,15 +7,15 @@
800 msgstr ""
801 "Project-Id-Version: ubuntu-clock-app\n"
802 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
803-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
804+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
805 "PO-Revision-Date: 2014-11-18 07:06+0000\n"
806 "Last-Translator: Fohanno Thierry <thierry.fohanno@ofis-bzh.org>\n"
807 "Language-Team: Breton <br@li.org>\n"
808 "MIME-Version: 1.0\n"
809 "Content-Type: text/plain; charset=UTF-8\n"
810 "Content-Transfer-Encoding: 8bit\n"
811-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
812-"X-Generator: Launchpad (build 17252)\n"
813+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
814+"X-Generator: Launchpad (build 17306)\n"
815
816 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
817 #: ../app/alarm/EditAlarmPage.qml:302
818@@ -44,7 +44,7 @@
819 msgid "Select None"
820 msgstr "Chom hep diuzañ netra"
821
822-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
823+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
824 msgid "Select All"
825 msgstr "Diuzañ pep tra"
826
827@@ -56,7 +56,7 @@
828 msgid "Tap the + icon to add an alarm"
829 msgstr "Pouezit war an arlun + evit ouzhpennañ un alarm"
830
831-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
832+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
833 msgid "Repeat"
834 msgstr "Adober"
835
836@@ -154,11 +154,11 @@
837 msgid "Delete alarm"
838 msgstr "Diverkañ an alarm"
839
840-#: ../app/clock/ClockPage.qml:268
841+#: ../app/clock/ClockPage.qml:271
842 msgid "Location Service Error!"
843 msgstr "Fazi gant ar servij lec'hiañ !"
844
845-#: ../app/clock/ClockPage.qml:270
846+#: ../app/clock/ClockPage.qml:273
847 msgid "Retrieving location..."
848 msgstr "Oc'h adtapout al lec'h..."
849
850
851=== modified file 'po/ca.po'
852--- po/ca.po 2014-11-21 07:03:33 +0000
853+++ po/ca.po 2015-02-27 14:05:26 +0000
854@@ -7,15 +7,15 @@
855 msgstr ""
856 "Project-Id-Version: ubuntu-clock-app\n"
857 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
858-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
859+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
860 "PO-Revision-Date: 2014-11-20 16:00+0000\n"
861 "Last-Translator: David Planella <david.planella@ubuntu.com>\n"
862 "Language-Team: Catalan <ca@li.org>\n"
863 "MIME-Version: 1.0\n"
864 "Content-Type: text/plain; charset=UTF-8\n"
865 "Content-Transfer-Encoding: 8bit\n"
866-"X-Launchpad-Export-Date: 2014-11-21 07:03+0000\n"
867-"X-Generator: Launchpad (build 17252)\n"
868+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
869+"X-Generator: Launchpad (build 17306)\n"
870
871 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
872 #: ../app/alarm/EditAlarmPage.qml:302
873@@ -44,7 +44,7 @@
874 msgid "Select None"
875 msgstr "No selec. res"
876
877-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
878+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
879 msgid "Select All"
880 msgstr "Selecc. tot"
881
882@@ -56,7 +56,7 @@
883 msgid "Tap the + icon to add an alarm"
884 msgstr "Feu un toc a la icona «+» per afegir una alarma"
885
886-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
887+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
888 msgid "Repeat"
889 msgstr "Repetició"
890
891@@ -154,11 +154,11 @@
892 msgid "Delete alarm"
893 msgstr "Suprimeix l'alarma"
894
895-#: ../app/clock/ClockPage.qml:268
896+#: ../app/clock/ClockPage.qml:271
897 msgid "Location Service Error!"
898 msgstr "Error del servei d'ubicació"
899
900-#: ../app/clock/ClockPage.qml:270
901+#: ../app/clock/ClockPage.qml:273
902 msgid "Retrieving location..."
903 msgstr ""
904
905
906=== modified file 'po/ca@valencia.po'
907--- po/ca@valencia.po 2014-11-20 06:42:27 +0000
908+++ po/ca@valencia.po 2015-02-27 14:05:26 +0000
909@@ -7,15 +7,15 @@
910 msgstr ""
911 "Project-Id-Version: ubuntu-clock-app\n"
912 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
913-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
914+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
915 "PO-Revision-Date: 2014-10-17 05:38+0000\n"
916 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
917 "Language-Team: Catalan (Valencian) <ca@valencia@li.org>\n"
918 "MIME-Version: 1.0\n"
919 "Content-Type: text/plain; charset=UTF-8\n"
920 "Content-Transfer-Encoding: 8bit\n"
921-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
922-"X-Generator: Launchpad (build 17252)\n"
923+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
924+"X-Generator: Launchpad (build 17306)\n"
925
926 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
927 #: ../app/alarm/EditAlarmPage.qml:302
928@@ -44,7 +44,7 @@
929 msgid "Select None"
930 msgstr ""
931
932-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
933+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
934 msgid "Select All"
935 msgstr ""
936
937@@ -56,7 +56,7 @@
938 msgid "Tap the + icon to add an alarm"
939 msgstr ""
940
941-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
942+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
943 msgid "Repeat"
944 msgstr ""
945
946@@ -154,11 +154,11 @@
947 msgid "Delete alarm"
948 msgstr ""
949
950-#: ../app/clock/ClockPage.qml:268
951+#: ../app/clock/ClockPage.qml:271
952 msgid "Location Service Error!"
953 msgstr ""
954
955-#: ../app/clock/ClockPage.qml:270
956+#: ../app/clock/ClockPage.qml:273
957 msgid "Retrieving location..."
958 msgstr ""
959
960
961=== modified file 'po/com.ubuntu.clock.pot'
962--- po/com.ubuntu.clock.pot 2014-11-17 16:11:18 +0000
963+++ po/com.ubuntu.clock.pot 2015-02-27 14:05:26 +0000
964@@ -8,7 +8,7 @@
965 msgstr ""
966 "Project-Id-Version: \n"
967 "Report-Msgid-Bugs-To: \n"
968-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
969+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
970 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
971 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
972 "Language-Team: LANGUAGE <LL@li.org>\n"
973@@ -44,7 +44,7 @@
974 msgid "Select None"
975 msgstr ""
976
977-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
978+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
979 msgid "Select All"
980 msgstr ""
981
982@@ -56,7 +56,7 @@
983 msgid "Tap the + icon to add an alarm"
984 msgstr ""
985
986-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
987+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
988 msgid "Repeat"
989 msgstr ""
990
991@@ -154,11 +154,11 @@
992 msgid "Delete alarm"
993 msgstr ""
994
995-#: ../app/clock/ClockPage.qml:268
996+#: ../app/clock/ClockPage.qml:271
997 msgid "Location Service Error!"
998 msgstr ""
999
1000-#: ../app/clock/ClockPage.qml:270
1001+#: ../app/clock/ClockPage.qml:273
1002 msgid "Retrieving location..."
1003 msgstr ""
1004
1005
1006=== modified file 'po/cs.po'
1007--- po/cs.po 2014-11-20 06:42:27 +0000
1008+++ po/cs.po 2015-02-27 14:05:26 +0000
1009@@ -7,15 +7,15 @@
1010 msgstr ""
1011 "Project-Id-Version: ubuntu-clock-app\n"
1012 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1013-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1014+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1015 "PO-Revision-Date: 2014-10-26 18:19+0000\n"
1016 "Last-Translator: Vojtěch Daněk <vdanek@outlook.com>\n"
1017 "Language-Team: Czech <cs@li.org>\n"
1018 "MIME-Version: 1.0\n"
1019 "Content-Type: text/plain; charset=UTF-8\n"
1020 "Content-Transfer-Encoding: 8bit\n"
1021-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
1022-"X-Generator: Launchpad (build 17252)\n"
1023+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1024+"X-Generator: Launchpad (build 17306)\n"
1025
1026 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1027 #: ../app/alarm/EditAlarmPage.qml:302
1028@@ -44,7 +44,7 @@
1029 msgid "Select None"
1030 msgstr "Zrušit výběr"
1031
1032-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1033+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1034 msgid "Select All"
1035 msgstr "Vybrat vše"
1036
1037@@ -56,7 +56,7 @@
1038 msgid "Tap the + icon to add an alarm"
1039 msgstr "Klepněte na ikonu + pro přidání budíku"
1040
1041-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1042+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1043 msgid "Repeat"
1044 msgstr "Opakovat"
1045
1046@@ -154,11 +154,11 @@
1047 msgid "Delete alarm"
1048 msgstr "Smazat budík"
1049
1050-#: ../app/clock/ClockPage.qml:268
1051+#: ../app/clock/ClockPage.qml:271
1052 msgid "Location Service Error!"
1053 msgstr ""
1054
1055-#: ../app/clock/ClockPage.qml:270
1056+#: ../app/clock/ClockPage.qml:273
1057 msgid "Retrieving location..."
1058 msgstr ""
1059
1060
1061=== modified file 'po/da.po'
1062--- po/da.po 2014-11-20 06:42:27 +0000
1063+++ po/da.po 2015-02-27 14:05:26 +0000
1064@@ -7,15 +7,15 @@
1065 msgstr ""
1066 "Project-Id-Version: ubuntu-clock-app\n"
1067 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1068-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1069+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1070 "PO-Revision-Date: 2014-10-24 06:57+0000\n"
1071 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1072 "Language-Team: Danish <da@li.org>\n"
1073 "MIME-Version: 1.0\n"
1074 "Content-Type: text/plain; charset=UTF-8\n"
1075 "Content-Transfer-Encoding: 8bit\n"
1076-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
1077-"X-Generator: Launchpad (build 17252)\n"
1078+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1079+"X-Generator: Launchpad (build 17306)\n"
1080
1081 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1082 #: ../app/alarm/EditAlarmPage.qml:302
1083@@ -44,7 +44,7 @@
1084 msgid "Select None"
1085 msgstr ""
1086
1087-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1088+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1089 msgid "Select All"
1090 msgstr ""
1091
1092@@ -56,7 +56,7 @@
1093 msgid "Tap the + icon to add an alarm"
1094 msgstr ""
1095
1096-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1097+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1098 msgid "Repeat"
1099 msgstr ""
1100
1101@@ -154,11 +154,11 @@
1102 msgid "Delete alarm"
1103 msgstr ""
1104
1105-#: ../app/clock/ClockPage.qml:268
1106+#: ../app/clock/ClockPage.qml:271
1107 msgid "Location Service Error!"
1108 msgstr ""
1109
1110-#: ../app/clock/ClockPage.qml:270
1111+#: ../app/clock/ClockPage.qml:273
1112 msgid "Retrieving location..."
1113 msgstr ""
1114
1115
1116=== modified file 'po/de.po'
1117--- po/de.po 2014-12-04 06:49:13 +0000
1118+++ po/de.po 2015-02-27 14:05:26 +0000
1119@@ -7,15 +7,15 @@
1120 msgstr ""
1121 "Project-Id-Version: ubuntu-clock-app\n"
1122 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1123-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1124-"PO-Revision-Date: 2014-12-03 21:11+0000\n"
1125-"Last-Translator: Jonatan Zeidler <Unknown>\n"
1126+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1127+"PO-Revision-Date: 2015-01-14 15:58+0000\n"
1128+"Last-Translator: Tobias Bannert <Unknown>\n"
1129 "Language-Team: German <de@li.org>\n"
1130 "MIME-Version: 1.0\n"
1131 "Content-Type: text/plain; charset=UTF-8\n"
1132 "Content-Transfer-Encoding: 8bit\n"
1133-"X-Launchpad-Export-Date: 2014-12-04 06:49+0000\n"
1134-"X-Generator: Launchpad (build 17274)\n"
1135+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1136+"X-Generator: Launchpad (build 17306)\n"
1137
1138 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1139 #: ../app/alarm/EditAlarmPage.qml:302
1140@@ -44,7 +44,7 @@
1141 msgid "Select None"
1142 msgstr "Keine auswählen"
1143
1144-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1145+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1146 msgid "Select All"
1147 msgstr "Alle auswählen"
1148
1149@@ -56,7 +56,7 @@
1150 msgid "Tap the + icon to add an alarm"
1151 msgstr "Das +-Symbol antippen, um einen neuen Wecker hinzuzufügen"
1152
1153-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1154+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1155 msgid "Repeat"
1156 msgstr "Wiederholen"
1157
1158@@ -108,7 +108,7 @@
1159
1160 #: ../app/alarm/AlarmUtils.qml:41
1161 msgid "Weekends"
1162-msgstr ""
1163+msgstr "Wochenenden"
1164
1165 #: ../app/alarm/AlarmUtils.qml:45
1166 msgid "Daily"
1167@@ -121,7 +121,7 @@
1168 #: ../app/alarm/AlarmUtils.qml:72
1169 #, qt-format
1170 msgid "Next Alarm %1"
1171-msgstr ""
1172+msgstr "Nächster Alarm %1"
1173
1174 #: ../app/alarm/AlarmUtils.qml:79
1175 msgid "Alarm Passed"
1176@@ -130,17 +130,17 @@
1177 #: ../app/alarm/AlarmUtils.qml:89
1178 #, no-c-format, qt-format
1179 msgid "in %1d %2h %3m"
1180-msgstr ""
1181+msgstr "in %1 Tagen, %2 Stunden und %3 Minuten"
1182
1183 #: ../app/alarm/AlarmUtils.qml:99
1184 #, no-c-format, qt-format
1185 msgid "in %1h %2m"
1186-msgstr ""
1187+msgstr "in %1 Stunden und %2 Minuten"
1188
1189 #: ../app/alarm/AlarmUtils.qml:108
1190 #, no-c-format, qt-format
1191 msgid "in %1m"
1192-msgstr ""
1193+msgstr "in %1 Minuten"
1194
1195 #: ../app/alarm/EditAlarmPage.qml:43
1196 msgid "New alarm"
1197@@ -154,13 +154,13 @@
1198 msgid "Delete alarm"
1199 msgstr "Wecker löschen"
1200
1201-#: ../app/clock/ClockPage.qml:268
1202+#: ../app/clock/ClockPage.qml:271
1203 msgid "Location Service Error!"
1204-msgstr ""
1205+msgstr "Standortdienstfehler!"
1206
1207-#: ../app/clock/ClockPage.qml:270
1208+#: ../app/clock/ClockPage.qml:273
1209 msgid "Retrieving location..."
1210-msgstr ""
1211+msgstr "Standort wird abgerufen …"
1212
1213 #: ../app/worldclock/AddWorldCityButton.qml:30
1214 msgid "Add"
1215@@ -175,11 +175,11 @@
1216 #. is behind or ahead of the time at the current location
1217 #: ../app/worldclock/UserWorldCityDelegate.qml:142
1218 msgid "behind"
1219-msgstr ""
1220+msgstr "zurück"
1221
1222 #: ../app/worldclock/UserWorldCityDelegate.qml:143
1223 msgid "ahead"
1224-msgstr ""
1225+msgstr "voraus"
1226
1227 #. TRANSLATORS: the first argument is hour, followed by
1228 #. minute, and the translation for either 'behind' or
1229@@ -187,21 +187,21 @@
1230 #: ../app/worldclock/UserWorldCityDelegate.qml:153
1231 #, qt-format
1232 msgid "%1h %2m %3"
1233-msgstr ""
1234+msgstr "%1 Stunden und %2 Minuten %3"
1235
1236 #. TRANSLATORS: the first argument is hour, followed by the
1237 #. translation for either 'behind' or 'ahead'
1238 #: ../app/worldclock/UserWorldCityDelegate.qml:162
1239 #, qt-format
1240 msgid "%1h %2"
1241-msgstr ""
1242+msgstr "%1 h %2"
1243
1244 #. TRANSLATORS: the first argument is minute, followed by the
1245 #. translation for either 'behind' or 'ahead'
1246 #: ../app/worldclock/UserWorldCityDelegate.qml:170
1247 #, qt-format
1248 msgid "%1m %2"
1249-msgstr ""
1250+msgstr "%1 min %2"
1251
1252 #: ../app/worldclock/UserWorldCityDelegate.qml:176
1253 msgid "Same time"
1254@@ -239,6 +239,8 @@
1255 msgid ""
1256 "A sophisticated clock app that provides world clock and alarm functionality."
1257 msgstr ""
1258+"Eine umfassende Uhren-App, welche Weltzeit- und Weckerfunktionalitäten "
1259+"bietet."
1260
1261 #: ubuntu-clock-app.desktop.in.in.h:3
1262 msgid "time;alarm;alert;clock;world;"
1263
1264=== modified file 'po/en_GB.po'
1265--- po/en_GB.po 2014-11-20 06:42:27 +0000
1266+++ po/en_GB.po 2015-02-27 14:05:26 +0000
1267@@ -7,15 +7,15 @@
1268 msgstr ""
1269 "Project-Id-Version: ubuntu-clock-app\n"
1270 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1271-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1272+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1273 "PO-Revision-Date: 2014-11-12 18:01+0000\n"
1274 "Last-Translator: Andi Chandler <Unknown>\n"
1275 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
1276 "MIME-Version: 1.0\n"
1277 "Content-Type: text/plain; charset=UTF-8\n"
1278 "Content-Transfer-Encoding: 8bit\n"
1279-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
1280-"X-Generator: Launchpad (build 17252)\n"
1281+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1282+"X-Generator: Launchpad (build 17306)\n"
1283
1284 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1285 #: ../app/alarm/EditAlarmPage.qml:302
1286@@ -44,7 +44,7 @@
1287 msgid "Select None"
1288 msgstr "Select None"
1289
1290-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1291+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1292 msgid "Select All"
1293 msgstr "Select All"
1294
1295@@ -56,7 +56,7 @@
1296 msgid "Tap the + icon to add an alarm"
1297 msgstr "Tap the + icon to add an alarm"
1298
1299-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1300+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1301 msgid "Repeat"
1302 msgstr "Repeat"
1303
1304@@ -154,11 +154,11 @@
1305 msgid "Delete alarm"
1306 msgstr "Delete alarm"
1307
1308-#: ../app/clock/ClockPage.qml:268
1309+#: ../app/clock/ClockPage.qml:271
1310 msgid "Location Service Error!"
1311 msgstr "Location Service Error!"
1312
1313-#: ../app/clock/ClockPage.qml:270
1314+#: ../app/clock/ClockPage.qml:273
1315 msgid "Retrieving location..."
1316 msgstr "Retrieving location..."
1317
1318
1319=== modified file 'po/es.po'
1320--- po/es.po 2014-11-20 06:42:27 +0000
1321+++ po/es.po 2015-02-27 14:05:26 +0000
1322@@ -7,15 +7,15 @@
1323 msgstr ""
1324 "Project-Id-Version: ubuntu-clock-app\n"
1325 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1326-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1327-"PO-Revision-Date: 2014-11-13 19:13+0000\n"
1328+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1329+"PO-Revision-Date: 2015-02-24 13:26+0000\n"
1330 "Last-Translator: Víctor R. Ruiz <Unknown>\n"
1331 "Language-Team: Spanish <es@li.org>\n"
1332 "MIME-Version: 1.0\n"
1333 "Content-Type: text/plain; charset=UTF-8\n"
1334 "Content-Transfer-Encoding: 8bit\n"
1335-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
1336-"X-Generator: Launchpad (build 17252)\n"
1337+"X-Launchpad-Export-Date: 2015-02-25 06:02+0000\n"
1338+"X-Generator: Launchpad (build 17355)\n"
1339
1340 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1341 #: ../app/alarm/EditAlarmPage.qml:302
1342@@ -44,7 +44,7 @@
1343 msgid "Select None"
1344 msgstr "Cancelar la selección"
1345
1346-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1347+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1348 msgid "Select All"
1349 msgstr "Seleccionar todo"
1350
1351@@ -56,7 +56,7 @@
1352 msgid "Tap the + icon to add an alarm"
1353 msgstr "Para añadir una alarma toque el icono +"
1354
1355-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1356+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1357 msgid "Repeat"
1358 msgstr "Repetir"
1359
1360@@ -84,7 +84,7 @@
1361
1362 #: ../app/alarm/AlarmSettingsPage.qml:214
1363 msgid "Snooze for"
1364-msgstr "Sonar durante"
1365+msgstr "Posponer"
1366
1367 #: ../app/alarm/AlarmSettingsPage.qml:259
1368 msgid "Vibration"
1369@@ -154,11 +154,11 @@
1370 msgid "Delete alarm"
1371 msgstr "Eliminar alarma"
1372
1373-#: ../app/clock/ClockPage.qml:268
1374+#: ../app/clock/ClockPage.qml:271
1375 msgid "Location Service Error!"
1376-msgstr "¡Error del servicio de ubucación!"
1377+msgstr "¡Error del servicio de ubicación!"
1378
1379-#: ../app/clock/ClockPage.qml:270
1380+#: ../app/clock/ClockPage.qml:273
1381 msgid "Retrieving location..."
1382 msgstr "Obteniendo ubicación..."
1383
1384
1385=== modified file 'po/eu.po'
1386--- po/eu.po 2014-11-20 06:42:27 +0000
1387+++ po/eu.po 2015-02-27 14:05:26 +0000
1388@@ -7,15 +7,15 @@
1389 msgstr ""
1390 "Project-Id-Version: ubuntu-clock-app\n"
1391 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1392-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1393+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1394 "PO-Revision-Date: 2014-11-12 21:42+0000\n"
1395 "Last-Translator: Asier Iturralde Sarasola <Unknown>\n"
1396 "Language-Team: Basque <eu@li.org>\n"
1397 "MIME-Version: 1.0\n"
1398 "Content-Type: text/plain; charset=UTF-8\n"
1399 "Content-Transfer-Encoding: 8bit\n"
1400-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
1401-"X-Generator: Launchpad (build 17252)\n"
1402+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1403+"X-Generator: Launchpad (build 17306)\n"
1404
1405 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1406 #: ../app/alarm/EditAlarmPage.qml:302
1407@@ -44,7 +44,7 @@
1408 msgid "Select None"
1409 msgstr "Ez hautatu bat ere"
1410
1411-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1412+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1413 msgid "Select All"
1414 msgstr "Hautatu dena"
1415
1416@@ -56,7 +56,7 @@
1417 msgid "Tap the + icon to add an alarm"
1418 msgstr "Ukitu + ikonoa alarma gehitzeko"
1419
1420-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1421+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1422 msgid "Repeat"
1423 msgstr "Errepikatu"
1424
1425@@ -154,11 +154,11 @@
1426 msgid "Delete alarm"
1427 msgstr "Ezabatu alarma"
1428
1429-#: ../app/clock/ClockPage.qml:268
1430+#: ../app/clock/ClockPage.qml:271
1431 msgid "Location Service Error!"
1432 msgstr "Kokapen-zerbitzuaren errorea!"
1433
1434-#: ../app/clock/ClockPage.qml:270
1435+#: ../app/clock/ClockPage.qml:273
1436 msgid "Retrieving location..."
1437 msgstr "Kokapena eskuratzen..."
1438
1439
1440=== modified file 'po/fa.po'
1441--- po/fa.po 2014-12-02 06:52:45 +0000
1442+++ po/fa.po 2015-02-27 14:05:26 +0000
1443@@ -7,15 +7,15 @@
1444 msgstr ""
1445 "Project-Id-Version: ubuntu-clock-app\n"
1446 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1447-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1448+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1449 "PO-Revision-Date: 2014-12-01 08:42+0000\n"
1450 "Last-Translator: Danial Behzadi <dani.behzi@gmail.com>\n"
1451 "Language-Team: Persian <fa@li.org>\n"
1452 "MIME-Version: 1.0\n"
1453 "Content-Type: text/plain; charset=UTF-8\n"
1454 "Content-Transfer-Encoding: 8bit\n"
1455-"X-Launchpad-Export-Date: 2014-12-02 06:52+0000\n"
1456-"X-Generator: Launchpad (build 17274)\n"
1457+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1458+"X-Generator: Launchpad (build 17306)\n"
1459
1460 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1461 #: ../app/alarm/EditAlarmPage.qml:302
1462@@ -44,7 +44,7 @@
1463 msgid "Select None"
1464 msgstr "برگزیدن هیچ‌کدام"
1465
1466-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1467+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1468 msgid "Select All"
1469 msgstr "گزینش همه"
1470
1471@@ -56,7 +56,7 @@
1472 msgid "Tap the + icon to add an alarm"
1473 msgstr "برای افزودن هشدار، روی شمایل + ضربه بزنید"
1474
1475-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1476+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1477 msgid "Repeat"
1478 msgstr "تکرار"
1479
1480@@ -154,11 +154,11 @@
1481 msgid "Delete alarm"
1482 msgstr "حذف هشدار"
1483
1484-#: ../app/clock/ClockPage.qml:268
1485+#: ../app/clock/ClockPage.qml:271
1486 msgid "Location Service Error!"
1487 msgstr "خطای خدمات موقعیت!"
1488
1489-#: ../app/clock/ClockPage.qml:270
1490+#: ../app/clock/ClockPage.qml:273
1491 msgid "Retrieving location..."
1492 msgstr "درحال بازیابی موقعیت…"
1493
1494
1495=== modified file 'po/fi.po'
1496--- po/fi.po 2014-11-24 06:37:33 +0000
1497+++ po/fi.po 2015-02-27 14:05:26 +0000
1498@@ -7,15 +7,15 @@
1499 msgstr ""
1500 "Project-Id-Version: ubuntu-clock-app\n"
1501 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1502-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1503+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1504 "PO-Revision-Date: 2014-11-23 13:00+0000\n"
1505 "Last-Translator: Timo Jyrinki <timo.jyrinki@canonical.com>\n"
1506 "Language-Team: Finnish <fi@li.org>\n"
1507 "MIME-Version: 1.0\n"
1508 "Content-Type: text/plain; charset=UTF-8\n"
1509 "Content-Transfer-Encoding: 8bit\n"
1510-"X-Launchpad-Export-Date: 2014-11-24 06:37+0000\n"
1511-"X-Generator: Launchpad (build 17252)\n"
1512+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1513+"X-Generator: Launchpad (build 17306)\n"
1514
1515 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1516 #: ../app/alarm/EditAlarmPage.qml:302
1517@@ -44,7 +44,7 @@
1518 msgid "Select None"
1519 msgstr "Tyhjennä valinta"
1520
1521-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1522+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1523 msgid "Select All"
1524 msgstr "Valitse kaikki"
1525
1526@@ -56,7 +56,7 @@
1527 msgid "Tap the + icon to add an alarm"
1528 msgstr "Kosketa +-kuvaketta lisätäksesi hälytyksen"
1529
1530-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1531+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1532 msgid "Repeat"
1533 msgstr "Toista"
1534
1535@@ -154,11 +154,11 @@
1536 msgid "Delete alarm"
1537 msgstr "Poista hälytys"
1538
1539-#: ../app/clock/ClockPage.qml:268
1540+#: ../app/clock/ClockPage.qml:271
1541 msgid "Location Service Error!"
1542 msgstr "Virhe sijaintipalvelussa."
1543
1544-#: ../app/clock/ClockPage.qml:270
1545+#: ../app/clock/ClockPage.qml:273
1546 msgid "Retrieving location..."
1547 msgstr "Noudetaan sijaintia..."
1548
1549
1550=== modified file 'po/fr.po'
1551--- po/fr.po 2014-11-20 06:42:27 +0000
1552+++ po/fr.po 2015-02-27 14:05:26 +0000
1553@@ -7,15 +7,15 @@
1554 msgstr ""
1555 "Project-Id-Version: ubuntu-clock-app\n"
1556 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1557-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1558+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1559 "PO-Revision-Date: 2014-11-19 08:15+0000\n"
1560 "Last-Translator: Anne <anneonyme017@gmail.com>\n"
1561 "Language-Team: French <fr@li.org>\n"
1562 "MIME-Version: 1.0\n"
1563 "Content-Type: text/plain; charset=UTF-8\n"
1564 "Content-Transfer-Encoding: 8bit\n"
1565-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
1566-"X-Generator: Launchpad (build 17252)\n"
1567+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1568+"X-Generator: Launchpad (build 17306)\n"
1569
1570 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1571 #: ../app/alarm/EditAlarmPage.qml:302
1572@@ -44,7 +44,7 @@
1573 msgid "Select None"
1574 msgstr "Ne rien sélectionner"
1575
1576-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1577+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1578 msgid "Select All"
1579 msgstr "Tout sélectionner"
1580
1581@@ -56,7 +56,7 @@
1582 msgid "Tap the + icon to add an alarm"
1583 msgstr "Appuyez sur l'icône + pour ajouter une alarme"
1584
1585-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1586+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1587 msgid "Repeat"
1588 msgstr "Répétition"
1589
1590@@ -154,11 +154,11 @@
1591 msgid "Delete alarm"
1592 msgstr "Supprimer l'alarme"
1593
1594-#: ../app/clock/ClockPage.qml:268
1595+#: ../app/clock/ClockPage.qml:271
1596 msgid "Location Service Error!"
1597 msgstr "Erreur du service de localisation  !"
1598
1599-#: ../app/clock/ClockPage.qml:270
1600+#: ../app/clock/ClockPage.qml:273
1601 msgid "Retrieving location..."
1602 msgstr "Recherche de la localisation..."
1603
1604
1605=== added file 'po/fur.po'
1606--- po/fur.po 1970-01-01 00:00:00 +0000
1607+++ po/fur.po 2015-02-27 14:05:26 +0000
1608@@ -0,0 +1,245 @@
1609+# Friulian translation for ubuntu-clock-app
1610+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
1611+# This file is distributed under the same license as the ubuntu-clock-app package.
1612+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
1613+#
1614+msgid ""
1615+msgstr ""
1616+"Project-Id-Version: ubuntu-clock-app\n"
1617+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1618+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1619+"PO-Revision-Date: 2015-01-28 16:52+0000\n"
1620+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1621+"Language-Team: Friulian <fur@li.org>\n"
1622+"MIME-Version: 1.0\n"
1623+"Content-Type: text/plain; charset=UTF-8\n"
1624+"Content-Transfer-Encoding: 8bit\n"
1625+"X-Launchpad-Export-Date: 2015-01-29 06:04+0000\n"
1626+"X-Generator: Launchpad (build 17306)\n"
1627+
1628+#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1629+#: ../app/alarm/EditAlarmPage.qml:302
1630+msgid "Label"
1631+msgstr ""
1632+
1633+#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:117
1634+#: ../app/worldclock/UserWorldCityList.qml:101
1635+msgid "Delete"
1636+msgstr ""
1637+
1638+#: ../app/alarm/AlarmPage.qml:26
1639+msgid "Alarms"
1640+msgstr ""
1641+
1642+#: ../app/alarm/AlarmPage.qml:43 ../app/alarm/EditAlarmPage.qml:50
1643+#: ../app/alarm/EditAlarmPage.qml:177
1644+msgid "Alarm"
1645+msgstr ""
1646+
1647+#: ../app/alarm/AlarmPage.qml:58 ../app/worldclock/WorldCityList.qml:80
1648+msgid "Back"
1649+msgstr ""
1650+
1651+#: ../app/alarm/AlarmPage.qml:87
1652+msgid "Select None"
1653+msgstr ""
1654+
1655+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1656+msgid "Select All"
1657+msgstr ""
1658+
1659+#: ../app/alarm/AlarmPage.qml:149
1660+msgid "No saved alarms"
1661+msgstr ""
1662+
1663+#: ../app/alarm/AlarmPage.qml:150
1664+msgid "Tap the + icon to add an alarm"
1665+msgstr ""
1666+
1667+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1668+msgid "Repeat"
1669+msgstr ""
1670+
1671+#: ../app/alarm/AlarmSettingsPage.qml:29
1672+msgid "Settings"
1673+msgstr ""
1674+
1675+#: ../app/alarm/AlarmSettingsPage.qml:53 ../app/alarm/AlarmSettingsPage.qml:54
1676+#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
1677+#: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:66
1678+#: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68
1679+#: ../app/alarm/AlarmSettingsPage.qml:146
1680+#: ../app/alarm/AlarmSettingsPage.qml:215
1681+#, qt-format
1682+msgid "%1 minutes"
1683+msgstr ""
1684+
1685+#: ../app/alarm/AlarmSettingsPage.qml:92
1686+msgid "Alarm volume"
1687+msgstr ""
1688+
1689+#: ../app/alarm/AlarmSettingsPage.qml:145
1690+msgid "Silence after"
1691+msgstr ""
1692+
1693+#: ../app/alarm/AlarmSettingsPage.qml:214
1694+msgid "Snooze for"
1695+msgstr ""
1696+
1697+#: ../app/alarm/AlarmSettingsPage.qml:259
1698+msgid "Vibration"
1699+msgstr ""
1700+
1701+#: ../app/alarm/AlarmSettingsPage.qml:293
1702+msgid "Change time and date"
1703+msgstr ""
1704+
1705+#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:315
1706+msgid "Sound"
1707+msgstr ""
1708+
1709+#: ../app/alarm/AlarmUtils.qml:31
1710+msgid "Never"
1711+msgstr ""
1712+
1713+#: ../app/alarm/AlarmUtils.qml:37
1714+msgid "Weekdays"
1715+msgstr ""
1716+
1717+#: ../app/alarm/AlarmUtils.qml:41
1718+msgid "Weekends"
1719+msgstr ""
1720+
1721+#: ../app/alarm/AlarmUtils.qml:45
1722+msgid "Daily"
1723+msgstr ""
1724+
1725+#: ../app/alarm/AlarmUtils.qml:55
1726+msgid "No active alarms"
1727+msgstr ""
1728+
1729+#: ../app/alarm/AlarmUtils.qml:72
1730+#, qt-format
1731+msgid "Next Alarm %1"
1732+msgstr ""
1733+
1734+#: ../app/alarm/AlarmUtils.qml:79
1735+msgid "Alarm Passed"
1736+msgstr ""
1737+
1738+#: ../app/alarm/AlarmUtils.qml:89
1739+#, no-c-format, qt-format
1740+msgid "in %1d %2h %3m"
1741+msgstr ""
1742+
1743+#: ../app/alarm/AlarmUtils.qml:99
1744+#, no-c-format, qt-format
1745+msgid "in %1h %2m"
1746+msgstr ""
1747+
1748+#: ../app/alarm/AlarmUtils.qml:108
1749+#, no-c-format, qt-format
1750+msgid "in %1m"
1751+msgstr ""
1752+
1753+#: ../app/alarm/EditAlarmPage.qml:43
1754+msgid "New alarm"
1755+msgstr ""
1756+
1757+#: ../app/alarm/EditAlarmPage.qml:43
1758+msgid "Edit alarm"
1759+msgstr ""
1760+
1761+#: ../app/alarm/EditAlarmPage.qml:336
1762+msgid "Delete alarm"
1763+msgstr ""
1764+
1765+#: ../app/clock/ClockPage.qml:271
1766+msgid "Location Service Error!"
1767+msgstr ""
1768+
1769+#: ../app/clock/ClockPage.qml:273
1770+msgid "Retrieving location..."
1771+msgstr ""
1772+
1773+#: ../app/worldclock/AddWorldCityButton.qml:30
1774+msgid "Add"
1775+msgstr ""
1776+
1777+#: ../app/worldclock/AddWorldCityButton.qml:61
1778+#: ../app/worldclock/WorldCityList.qml:64
1779+msgid "City"
1780+msgstr ""
1781+
1782+#. TRANSLATORS: this indicates if the time in a world clock
1783+#. is behind or ahead of the time at the current location
1784+#: ../app/worldclock/UserWorldCityDelegate.qml:142
1785+msgid "behind"
1786+msgstr ""
1787+
1788+#: ../app/worldclock/UserWorldCityDelegate.qml:143
1789+msgid "ahead"
1790+msgstr ""
1791+
1792+#. TRANSLATORS: the first argument is hour, followed by
1793+#. minute, and the translation for either 'behind' or
1794+#. 'ahead'
1795+#: ../app/worldclock/UserWorldCityDelegate.qml:153
1796+#, qt-format
1797+msgid "%1h %2m %3"
1798+msgstr ""
1799+
1800+#. TRANSLATORS: the first argument is hour, followed by the
1801+#. translation for either 'behind' or 'ahead'
1802+#: ../app/worldclock/UserWorldCityDelegate.qml:162
1803+#, qt-format
1804+msgid "%1h %2"
1805+msgstr ""
1806+
1807+#. TRANSLATORS: the first argument is minute, followed by the
1808+#. translation for either 'behind' or 'ahead'
1809+#: ../app/worldclock/UserWorldCityDelegate.qml:170
1810+#, qt-format
1811+msgid "%1m %2"
1812+msgstr ""
1813+
1814+#: ../app/worldclock/UserWorldCityDelegate.qml:176
1815+msgid "Same time"
1816+msgstr ""
1817+
1818+#: ../app/worldclock/WorldCityList.qml:51
1819+msgid "Select a city"
1820+msgstr ""
1821+
1822+#: ../app/worldclock/WorldCityList.qml:109
1823+msgid "Search..."
1824+msgstr ""
1825+
1826+#: ../app/worldclock/WorldCityList.qml:214
1827+msgid "Searching for a city"
1828+msgstr ""
1829+
1830+#: ../app/worldclock/WorldCityList.qml:219
1831+msgid "No City Found"
1832+msgstr ""
1833+
1834+#: ../app/worldclock/WorldCityList.qml:225
1835+msgid "Unable to connect."
1836+msgstr ""
1837+
1838+#: ../app/worldclock/WorldCityList.qml:226
1839+msgid "Please check your network connection and try again"
1840+msgstr ""
1841+
1842+#: ubuntu-clock-app.desktop.in.in.h:1
1843+msgid "Clock"
1844+msgstr ""
1845+
1846+#: ubuntu-clock-app.desktop.in.in.h:2
1847+msgid ""
1848+"A sophisticated clock app that provides world clock and alarm functionality."
1849+msgstr ""
1850+
1851+#: ubuntu-clock-app.desktop.in.in.h:3
1852+msgid "time;alarm;alert;clock;world;"
1853+msgstr ""
1854
1855=== modified file 'po/gl.po'
1856--- po/gl.po 2014-11-20 06:42:27 +0000
1857+++ po/gl.po 2015-02-27 14:05:26 +0000
1858@@ -7,15 +7,15 @@
1859 msgstr ""
1860 "Project-Id-Version: ubuntu-clock-app\n"
1861 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1862-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1863+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1864 "PO-Revision-Date: 2014-11-09 01:21+0000\n"
1865 "Last-Translator: Marcos Lans <Unknown>\n"
1866 "Language-Team: Galician <gl@li.org>\n"
1867 "MIME-Version: 1.0\n"
1868 "Content-Type: text/plain; charset=UTF-8\n"
1869 "Content-Transfer-Encoding: 8bit\n"
1870-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
1871-"X-Generator: Launchpad (build 17252)\n"
1872+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1873+"X-Generator: Launchpad (build 17306)\n"
1874
1875 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1876 #: ../app/alarm/EditAlarmPage.qml:302
1877@@ -44,7 +44,7 @@
1878 msgid "Select None"
1879 msgstr "Non seleccionar nada"
1880
1881-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1882+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1883 msgid "Select All"
1884 msgstr "Selecionar todo"
1885
1886@@ -56,7 +56,7 @@
1887 msgid "Tap the + icon to add an alarm"
1888 msgstr "Tocar a icona + engade unha alarma"
1889
1890-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1891+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1892 msgid "Repeat"
1893 msgstr "Repetición"
1894
1895@@ -154,11 +154,11 @@
1896 msgid "Delete alarm"
1897 msgstr "Eliminar a alarma"
1898
1899-#: ../app/clock/ClockPage.qml:268
1900+#: ../app/clock/ClockPage.qml:271
1901 msgid "Location Service Error!"
1902 msgstr "Erro do servizo de localización"
1903
1904-#: ../app/clock/ClockPage.qml:270
1905+#: ../app/clock/ClockPage.qml:273
1906 msgid "Retrieving location..."
1907 msgstr "Recuperando a localización..."
1908
1909
1910=== modified file 'po/hu.po'
1911--- po/hu.po 2014-11-20 06:42:27 +0000
1912+++ po/hu.po 2015-02-27 14:05:26 +0000
1913@@ -7,15 +7,15 @@
1914 msgstr ""
1915 "Project-Id-Version: ubuntu-clock-app\n"
1916 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1917-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1918-"PO-Revision-Date: 2014-11-08 09:53+0000\n"
1919+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1920+"PO-Revision-Date: 2015-02-10 10:25+0000\n"
1921 "Last-Translator: Richard Somlói <ricsipontaz@gmail.com>\n"
1922 "Language-Team: Hungarian <hu@li.org>\n"
1923 "MIME-Version: 1.0\n"
1924 "Content-Type: text/plain; charset=UTF-8\n"
1925 "Content-Transfer-Encoding: 8bit\n"
1926-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
1927-"X-Generator: Launchpad (build 17252)\n"
1928+"X-Launchpad-Export-Date: 2015-02-11 06:32+0000\n"
1929+"X-Generator: Launchpad (build 17336)\n"
1930
1931 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1932 #: ../app/alarm/EditAlarmPage.qml:302
1933@@ -44,7 +44,7 @@
1934 msgid "Select None"
1935 msgstr "Kijelölés megszüntetése"
1936
1937-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
1938+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
1939 msgid "Select All"
1940 msgstr "Összes kijelölése"
1941
1942@@ -56,7 +56,7 @@
1943 msgid "Tap the + icon to add an alarm"
1944 msgstr "Új hozzáadásához koppintson a + ikonra"
1945
1946-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
1947+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
1948 msgid "Repeat"
1949 msgstr "Ismétlődés"
1950
1951@@ -140,7 +140,7 @@
1952 #: ../app/alarm/AlarmUtils.qml:108
1953 #, no-c-format, qt-format
1954 msgid "in %1m"
1955-msgstr "%1m múlva"
1956+msgstr "%1 perc múlva"
1957
1958 #: ../app/alarm/EditAlarmPage.qml:43
1959 msgid "New alarm"
1960@@ -154,11 +154,11 @@
1961 msgid "Delete alarm"
1962 msgstr "Riasztás törlése"
1963
1964-#: ../app/clock/ClockPage.qml:268
1965+#: ../app/clock/ClockPage.qml:271
1966 msgid "Location Service Error!"
1967 msgstr "Helymeghatározási hiba!"
1968
1969-#: ../app/clock/ClockPage.qml:270
1970+#: ../app/clock/ClockPage.qml:273
1971 msgid "Retrieving location..."
1972 msgstr "Hely meghatározása..."
1973
1974
1975=== modified file 'po/it.po'
1976--- po/it.po 2014-11-20 06:42:27 +0000
1977+++ po/it.po 2015-02-27 14:05:26 +0000
1978@@ -7,15 +7,15 @@
1979 msgstr ""
1980 "Project-Id-Version: ubuntu-clock-app\n"
1981 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
1982-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
1983+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
1984 "PO-Revision-Date: 2014-09-04 07:13+0000\n"
1985 "Last-Translator: Claudio Arseni <claudio.arseni@gmail.com>\n"
1986 "Language-Team: Italian <it@li.org>\n"
1987 "MIME-Version: 1.0\n"
1988 "Content-Type: text/plain; charset=UTF-8\n"
1989 "Content-Transfer-Encoding: 8bit\n"
1990-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
1991-"X-Generator: Launchpad (build 17252)\n"
1992+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
1993+"X-Generator: Launchpad (build 17306)\n"
1994
1995 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
1996 #: ../app/alarm/EditAlarmPage.qml:302
1997@@ -44,7 +44,7 @@
1998 msgid "Select None"
1999 msgstr ""
2000
2001-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
2002+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
2003 msgid "Select All"
2004 msgstr "Seleziona tutti"
2005
2006@@ -56,7 +56,7 @@
2007 msgid "Tap the + icon to add an alarm"
2008 msgstr ""
2009
2010-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
2011+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
2012 msgid "Repeat"
2013 msgstr "Ripeti"
2014
2015@@ -154,11 +154,11 @@
2016 msgid "Delete alarm"
2017 msgstr "Elimina allarme"
2018
2019-#: ../app/clock/ClockPage.qml:268
2020+#: ../app/clock/ClockPage.qml:271
2021 msgid "Location Service Error!"
2022 msgstr ""
2023
2024-#: ../app/clock/ClockPage.qml:270
2025+#: ../app/clock/ClockPage.qml:273
2026 msgid "Retrieving location..."
2027 msgstr ""
2028
2029
2030=== added file 'po/pa.po'
2031--- po/pa.po 1970-01-01 00:00:00 +0000
2032+++ po/pa.po 2015-02-27 14:05:26 +0000
2033@@ -0,0 +1,246 @@
2034+# Punjabi translation for ubuntu-clock-app
2035+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
2036+# This file is distributed under the same license as the ubuntu-clock-app package.
2037+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
2038+#
2039+msgid ""
2040+msgstr ""
2041+"Project-Id-Version: ubuntu-clock-app\n"
2042+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2043+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
2044+"PO-Revision-Date: 2015-02-09 06:12+0000\n"
2045+"Last-Translator: Gursharnjit_Singh <ubuntuser13@gmail.com>\n"
2046+"Language-Team: Punjabi <pa@li.org>\n"
2047+"MIME-Version: 1.0\n"
2048+"Content-Type: text/plain; charset=UTF-8\n"
2049+"Content-Transfer-Encoding: 8bit\n"
2050+"X-Launchpad-Export-Date: 2015-02-10 07:10+0000\n"
2051+"X-Generator: Launchpad (build 17331)\n"
2052+
2053+#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
2054+#: ../app/alarm/EditAlarmPage.qml:302
2055+msgid "Label"
2056+msgstr "ਲੇਬਲ"
2057+
2058+#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:117
2059+#: ../app/worldclock/UserWorldCityList.qml:101
2060+msgid "Delete"
2061+msgstr "ਹਟਾਓ"
2062+
2063+#: ../app/alarm/AlarmPage.qml:26
2064+msgid "Alarms"
2065+msgstr "ਅਲਾਰਮ"
2066+
2067+#: ../app/alarm/AlarmPage.qml:43 ../app/alarm/EditAlarmPage.qml:50
2068+#: ../app/alarm/EditAlarmPage.qml:177
2069+msgid "Alarm"
2070+msgstr "ਅਲਾਰਮ"
2071+
2072+#: ../app/alarm/AlarmPage.qml:58 ../app/worldclock/WorldCityList.qml:80
2073+msgid "Back"
2074+msgstr "ਪਿੱਛੇ"
2075+
2076+#: ../app/alarm/AlarmPage.qml:87
2077+msgid "Select None"
2078+msgstr "ਕੋਈ ਨਾ ਚੁਣੋ"
2079+
2080+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
2081+msgid "Select All"
2082+msgstr "ਸੱਭ ਚੁਣੋ"
2083+
2084+#: ../app/alarm/AlarmPage.qml:149
2085+msgid "No saved alarms"
2086+msgstr "ਕੋਈ ਸੰਭਾਲ੍ਹਿਆ ਅਲਾਰਮ ਨਹੀਂ"
2087+
2088+#: ../app/alarm/AlarmPage.qml:150
2089+msgid "Tap the + icon to add an alarm"
2090+msgstr "ਇੱਕ ਅਲਾਰਮ ਜੋੜਨ ਲਈ + ਆਈਕਾਨ ਨੂੰ ਛੂਹੋ"
2091+
2092+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
2093+msgid "Repeat"
2094+msgstr "ਦੁਹਰਾਓ"
2095+
2096+#: ../app/alarm/AlarmSettingsPage.qml:29
2097+msgid "Settings"
2098+msgstr "ਸੈਟਿੰਗ"
2099+
2100+#: ../app/alarm/AlarmSettingsPage.qml:53 ../app/alarm/AlarmSettingsPage.qml:54
2101+#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
2102+#: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:66
2103+#: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68
2104+#: ../app/alarm/AlarmSettingsPage.qml:146
2105+#: ../app/alarm/AlarmSettingsPage.qml:215
2106+#, qt-format
2107+msgid "%1 minutes"
2108+msgstr "%1 ਮਿੰਟ"
2109+
2110+#: ../app/alarm/AlarmSettingsPage.qml:92
2111+msgid "Alarm volume"
2112+msgstr "ਅਲਾਰਮ ਅਵਾਜ"
2113+
2114+#: ../app/alarm/AlarmSettingsPage.qml:145
2115+msgid "Silence after"
2116+msgstr "ਚੁੱਪ ਬਾਅਦ"
2117+
2118+#: ../app/alarm/AlarmSettingsPage.qml:214
2119+msgid "Snooze for"
2120+msgstr "ਲਈ ਝਪਕੀ"
2121+
2122+#: ../app/alarm/AlarmSettingsPage.qml:259
2123+msgid "Vibration"
2124+msgstr "ਕੰਬਣੀ"
2125+
2126+#: ../app/alarm/AlarmSettingsPage.qml:293
2127+msgid "Change time and date"
2128+msgstr "ਸਮਾਂ ਅਤੇ ਮਿਤੀ ਬਦਲੋ"
2129+
2130+#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:315
2131+msgid "Sound"
2132+msgstr "ਆਵਾਜ਼"
2133+
2134+#: ../app/alarm/AlarmUtils.qml:31
2135+msgid "Never"
2136+msgstr "ਕਦੇ ਨਹੀਂ"
2137+
2138+#: ../app/alarm/AlarmUtils.qml:37
2139+msgid "Weekdays"
2140+msgstr "ਹਫ਼ਤਾ ਦਿਨ"
2141+
2142+#: ../app/alarm/AlarmUtils.qml:41
2143+msgid "Weekends"
2144+msgstr "ਹਫ਼ਤੇਵਾਰ"
2145+
2146+#: ../app/alarm/AlarmUtils.qml:45
2147+msgid "Daily"
2148+msgstr "ਰੋਜ਼"
2149+
2150+#: ../app/alarm/AlarmUtils.qml:55
2151+msgid "No active alarms"
2152+msgstr "ਕੋਈ ਸਰਗਰਮ ਅਲਾਰਮ ਨਹੀਂ"
2153+
2154+#: ../app/alarm/AlarmUtils.qml:72
2155+#, qt-format
2156+msgid "Next Alarm %1"
2157+msgstr "ਅਗਲਾ ਅਲਾਰਮ %1"
2158+
2159+#: ../app/alarm/AlarmUtils.qml:79
2160+msgid "Alarm Passed"
2161+msgstr "ਅਲਾਰਮ ਲੰਘਿਆ"
2162+
2163+#: ../app/alarm/AlarmUtils.qml:89
2164+#, no-c-format, qt-format
2165+msgid "in %1d %2h %3m"
2166+msgstr "%1d %2h %3m ਵਿੱਚ"
2167+
2168+#: ../app/alarm/AlarmUtils.qml:99
2169+#, no-c-format, qt-format
2170+msgid "in %1h %2m"
2171+msgstr "%1h %2m ਵਿੱਚ"
2172+
2173+#: ../app/alarm/AlarmUtils.qml:108
2174+#, no-c-format, qt-format
2175+msgid "in %1m"
2176+msgstr "%1m ਵਿੱਚ"
2177+
2178+#: ../app/alarm/EditAlarmPage.qml:43
2179+msgid "New alarm"
2180+msgstr "ਨਵਾਂ ਅਲਾਰਮ"
2181+
2182+#: ../app/alarm/EditAlarmPage.qml:43
2183+msgid "Edit alarm"
2184+msgstr "ਅਲਾਰਮ ਸੋਧ"
2185+
2186+#: ../app/alarm/EditAlarmPage.qml:336
2187+msgid "Delete alarm"
2188+msgstr "ਅਲਾਰਮ ਹਟਾਓ"
2189+
2190+#: ../app/clock/ClockPage.qml:271
2191+msgid "Location Service Error!"
2192+msgstr "ਸਥਿਤੀ ਸੇਵਾ ਖਾਮੀ!"
2193+
2194+#: ../app/clock/ClockPage.qml:273
2195+msgid "Retrieving location..."
2196+msgstr "ਸਥਿਤੀ ਪ੍ਰਾਪਤ ਕਰ ਰਿਹਾ..."
2197+
2198+#: ../app/worldclock/AddWorldCityButton.qml:30
2199+msgid "Add"
2200+msgstr "ਜੋੜੋ"
2201+
2202+#: ../app/worldclock/AddWorldCityButton.qml:61
2203+#: ../app/worldclock/WorldCityList.qml:64
2204+msgid "City"
2205+msgstr "ਸ਼ਹਿਰ"
2206+
2207+#. TRANSLATORS: this indicates if the time in a world clock
2208+#. is behind or ahead of the time at the current location
2209+#: ../app/worldclock/UserWorldCityDelegate.qml:142
2210+msgid "behind"
2211+msgstr "ਪਿੱਛੇ"
2212+
2213+#: ../app/worldclock/UserWorldCityDelegate.qml:143
2214+msgid "ahead"
2215+msgstr "ਅੱਗੇ"
2216+
2217+#. TRANSLATORS: the first argument is hour, followed by
2218+#. minute, and the translation for either 'behind' or
2219+#. 'ahead'
2220+#: ../app/worldclock/UserWorldCityDelegate.qml:153
2221+#, qt-format
2222+msgid "%1h %2m %3"
2223+msgstr "%1h %2m %3"
2224+
2225+#. TRANSLATORS: the first argument is hour, followed by the
2226+#. translation for either 'behind' or 'ahead'
2227+#: ../app/worldclock/UserWorldCityDelegate.qml:162
2228+#, qt-format
2229+msgid "%1h %2"
2230+msgstr "%1h %2"
2231+
2232+#. TRANSLATORS: the first argument is minute, followed by the
2233+#. translation for either 'behind' or 'ahead'
2234+#: ../app/worldclock/UserWorldCityDelegate.qml:170
2235+#, qt-format
2236+msgid "%1m %2"
2237+msgstr "%1m %2"
2238+
2239+#: ../app/worldclock/UserWorldCityDelegate.qml:176
2240+msgid "Same time"
2241+msgstr "ਉਹੀ ਸਮਾਂ"
2242+
2243+#: ../app/worldclock/WorldCityList.qml:51
2244+msgid "Select a city"
2245+msgstr "ਇੱਕ ਸ਼ਹਿਰ ਚੁਣੋ"
2246+
2247+#: ../app/worldclock/WorldCityList.qml:109
2248+msgid "Search..."
2249+msgstr "ਖੋਜੋ..."
2250+
2251+#: ../app/worldclock/WorldCityList.qml:214
2252+msgid "Searching for a city"
2253+msgstr "ਸ਼ਹਿਰ ਦੀ ਖੋਜ ਕਰ ਰਿਹਾ"
2254+
2255+#: ../app/worldclock/WorldCityList.qml:219
2256+msgid "No City Found"
2257+msgstr "ਕੋਈ ਸ਼ਹਿਰ ਨਹੀਂ ਮਿਲਿਆ"
2258+
2259+#: ../app/worldclock/WorldCityList.qml:225
2260+msgid "Unable to connect."
2261+msgstr "ਕੁਨੈਕਟ ਕਰਨ ਵਿੱਚ ਅਸਮਰੱਥ"
2262+
2263+#: ../app/worldclock/WorldCityList.qml:226
2264+msgid "Please check your network connection and try again"
2265+msgstr "ਕਿਰਪਾ ਕਰਕੇ ਆਪਣੇ ਇੰਟਰਨੈੱਟ ਕੁਨੈਕਸ਼ਨ ਦੀ ਪੜਤਾਲ ਕਰੋ ਅਤੇ ਮੁੜ-ਕੋਸ਼ਿਸ ਕਰੋ"
2266+
2267+#: ubuntu-clock-app.desktop.in.in.h:1
2268+msgid "Clock"
2269+msgstr "ਘੜੀ"
2270+
2271+#: ubuntu-clock-app.desktop.in.in.h:2
2272+msgid ""
2273+"A sophisticated clock app that provides world clock and alarm functionality."
2274+msgstr ""
2275+"ਇੱਕ ਵਧੀਆ ਘੜੀ ਐਪ ਜੋ ਸੰਸਾਰ ਸਮਾਂ ਅਤੇ ਅਲਾਰਮ ਕਾਰਜਕੁਸ਼ਲਤਾ ਮੁਹੱਈਆ ਕਰਵਾਉਂਦੀ ਹੈ।"
2276+
2277+#: ubuntu-clock-app.desktop.in.in.h:3
2278+msgid "time;alarm;alert;clock;world;"
2279+msgstr "ਸਮਾਂ;ਅਲਾਰਮ;ਚੇਤਾਵਨੀ;ਘੜੀ;ਸੰਸਾਰ;"
2280
2281=== modified file 'po/pt.po'
2282--- po/pt.po 2014-11-21 07:03:33 +0000
2283+++ po/pt.po 2015-02-27 14:05:26 +0000
2284@@ -7,15 +7,15 @@
2285 msgstr ""
2286 "Project-Id-Version: ubuntu-clock-app\n"
2287 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2288-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
2289+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
2290 "PO-Revision-Date: 2014-11-20 15:18+0000\n"
2291 "Last-Translator: Ivo Xavier <ivofernandes12@gmail.com>\n"
2292 "Language-Team: Portuguese <pt@li.org>\n"
2293 "MIME-Version: 1.0\n"
2294 "Content-Type: text/plain; charset=UTF-8\n"
2295 "Content-Transfer-Encoding: 8bit\n"
2296-"X-Launchpad-Export-Date: 2014-11-21 07:03+0000\n"
2297-"X-Generator: Launchpad (build 17252)\n"
2298+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
2299+"X-Generator: Launchpad (build 17306)\n"
2300
2301 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
2302 #: ../app/alarm/EditAlarmPage.qml:302
2303@@ -44,7 +44,7 @@
2304 msgid "Select None"
2305 msgstr "Desmarcar todos"
2306
2307-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
2308+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
2309 msgid "Select All"
2310 msgstr "Selecionar tudo"
2311
2312@@ -56,7 +56,7 @@
2313 msgid "Tap the + icon to add an alarm"
2314 msgstr "Toque no ícone + para adicionar um alarme"
2315
2316-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
2317+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
2318 msgid "Repeat"
2319 msgstr "Repetir"
2320
2321@@ -154,11 +154,11 @@
2322 msgid "Delete alarm"
2323 msgstr "Apagar o alarme"
2324
2325-#: ../app/clock/ClockPage.qml:268
2326+#: ../app/clock/ClockPage.qml:271
2327 msgid "Location Service Error!"
2328 msgstr "Erro no serviço de localização!"
2329
2330-#: ../app/clock/ClockPage.qml:270
2331+#: ../app/clock/ClockPage.qml:273
2332 msgid "Retrieving location..."
2333 msgstr "A recuperar localização..."
2334
2335
2336=== added file 'po/pt_BR.po'
2337--- po/pt_BR.po 1970-01-01 00:00:00 +0000
2338+++ po/pt_BR.po 2015-02-27 14:05:26 +0000
2339@@ -0,0 +1,247 @@
2340+# Brazilian Portuguese translation for ubuntu-clock-app
2341+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
2342+# This file is distributed under the same license as the ubuntu-clock-app package.
2343+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
2344+#
2345+msgid ""
2346+msgstr ""
2347+"Project-Id-Version: ubuntu-clock-app\n"
2348+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2349+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
2350+"PO-Revision-Date: 2015-02-26 16:03+0000\n"
2351+"Last-Translator: Tiago Hillebrandt <tiagohillebrandt@gmail.com>\n"
2352+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
2353+"MIME-Version: 1.0\n"
2354+"Content-Type: text/plain; charset=UTF-8\n"
2355+"Content-Transfer-Encoding: 8bit\n"
2356+"X-Launchpad-Export-Date: 2015-02-27 05:56+0000\n"
2357+"X-Generator: Launchpad (build 17361)\n"
2358+
2359+#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
2360+#: ../app/alarm/EditAlarmPage.qml:302
2361+msgid "Label"
2362+msgstr "Etiqueta"
2363+
2364+#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:117
2365+#: ../app/worldclock/UserWorldCityList.qml:101
2366+msgid "Delete"
2367+msgstr "Excluir"
2368+
2369+#: ../app/alarm/AlarmPage.qml:26
2370+msgid "Alarms"
2371+msgstr "Alarmes"
2372+
2373+#: ../app/alarm/AlarmPage.qml:43 ../app/alarm/EditAlarmPage.qml:50
2374+#: ../app/alarm/EditAlarmPage.qml:177
2375+msgid "Alarm"
2376+msgstr "Alarme"
2377+
2378+#: ../app/alarm/AlarmPage.qml:58 ../app/worldclock/WorldCityList.qml:80
2379+msgid "Back"
2380+msgstr "Voltar"
2381+
2382+#: ../app/alarm/AlarmPage.qml:87
2383+msgid "Select None"
2384+msgstr "Selecionar nenhum"
2385+
2386+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
2387+msgid "Select All"
2388+msgstr "Selecionar todos"
2389+
2390+#: ../app/alarm/AlarmPage.qml:149
2391+msgid "No saved alarms"
2392+msgstr "Nenhum alarme salvo"
2393+
2394+#: ../app/alarm/AlarmPage.qml:150
2395+msgid "Tap the + icon to add an alarm"
2396+msgstr "Toque no ícone + para adicionar um alarme"
2397+
2398+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
2399+msgid "Repeat"
2400+msgstr "Repetir"
2401+
2402+#: ../app/alarm/AlarmSettingsPage.qml:29
2403+msgid "Settings"
2404+msgstr "Configurações"
2405+
2406+#: ../app/alarm/AlarmSettingsPage.qml:53 ../app/alarm/AlarmSettingsPage.qml:54
2407+#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
2408+#: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:66
2409+#: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68
2410+#: ../app/alarm/AlarmSettingsPage.qml:146
2411+#: ../app/alarm/AlarmSettingsPage.qml:215
2412+#, qt-format
2413+msgid "%1 minutes"
2414+msgstr "%1 minutos"
2415+
2416+#: ../app/alarm/AlarmSettingsPage.qml:92
2417+msgid "Alarm volume"
2418+msgstr "Volume do alarme"
2419+
2420+#: ../app/alarm/AlarmSettingsPage.qml:145
2421+msgid "Silence after"
2422+msgstr "Silenciar depois"
2423+
2424+#: ../app/alarm/AlarmSettingsPage.qml:214
2425+msgid "Snooze for"
2426+msgstr "Soneca por"
2427+
2428+#: ../app/alarm/AlarmSettingsPage.qml:259
2429+msgid "Vibration"
2430+msgstr "Vibração"
2431+
2432+#: ../app/alarm/AlarmSettingsPage.qml:293
2433+msgid "Change time and date"
2434+msgstr "Alterar data e hora"
2435+
2436+#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:315
2437+msgid "Sound"
2438+msgstr "Som"
2439+
2440+#: ../app/alarm/AlarmUtils.qml:31
2441+msgid "Never"
2442+msgstr "Nunca"
2443+
2444+#: ../app/alarm/AlarmUtils.qml:37
2445+msgid "Weekdays"
2446+msgstr "Dias da semana"
2447+
2448+#: ../app/alarm/AlarmUtils.qml:41
2449+msgid "Weekends"
2450+msgstr "Finais de semana"
2451+
2452+#: ../app/alarm/AlarmUtils.qml:45
2453+msgid "Daily"
2454+msgstr "Diariamente"
2455+
2456+#: ../app/alarm/AlarmUtils.qml:55
2457+msgid "No active alarms"
2458+msgstr "Nenhum alarme ativo"
2459+
2460+#: ../app/alarm/AlarmUtils.qml:72
2461+#, qt-format
2462+msgid "Next Alarm %1"
2463+msgstr "Próximo alarme %1"
2464+
2465+#: ../app/alarm/AlarmUtils.qml:79
2466+msgid "Alarm Passed"
2467+msgstr "Alarme passou"
2468+
2469+#: ../app/alarm/AlarmUtils.qml:89
2470+#, no-c-format, qt-format
2471+msgid "in %1d %2h %3m"
2472+msgstr "em %1d %2h %3m"
2473+
2474+#: ../app/alarm/AlarmUtils.qml:99
2475+#, no-c-format, qt-format
2476+msgid "in %1h %2m"
2477+msgstr "em %1h %2m"
2478+
2479+#: ../app/alarm/AlarmUtils.qml:108
2480+#, no-c-format, qt-format
2481+msgid "in %1m"
2482+msgstr "em %1m"
2483+
2484+#: ../app/alarm/EditAlarmPage.qml:43
2485+msgid "New alarm"
2486+msgstr "Novo alarme"
2487+
2488+#: ../app/alarm/EditAlarmPage.qml:43
2489+msgid "Edit alarm"
2490+msgstr "Editar alarme"
2491+
2492+#: ../app/alarm/EditAlarmPage.qml:336
2493+msgid "Delete alarm"
2494+msgstr "Excluir alarme"
2495+
2496+#: ../app/clock/ClockPage.qml:271
2497+msgid "Location Service Error!"
2498+msgstr "Erro no serviço de localização!"
2499+
2500+#: ../app/clock/ClockPage.qml:273
2501+msgid "Retrieving location..."
2502+msgstr "Obtendo localização..."
2503+
2504+#: ../app/worldclock/AddWorldCityButton.qml:30
2505+msgid "Add"
2506+msgstr "Adicionar"
2507+
2508+#: ../app/worldclock/AddWorldCityButton.qml:61
2509+#: ../app/worldclock/WorldCityList.qml:64
2510+msgid "City"
2511+msgstr "Cidade"
2512+
2513+#. TRANSLATORS: this indicates if the time in a world clock
2514+#. is behind or ahead of the time at the current location
2515+#: ../app/worldclock/UserWorldCityDelegate.qml:142
2516+msgid "behind"
2517+msgstr "atrás"
2518+
2519+#: ../app/worldclock/UserWorldCityDelegate.qml:143
2520+msgid "ahead"
2521+msgstr "adiante"
2522+
2523+#. TRANSLATORS: the first argument is hour, followed by
2524+#. minute, and the translation for either 'behind' or
2525+#. 'ahead'
2526+#: ../app/worldclock/UserWorldCityDelegate.qml:153
2527+#, qt-format
2528+msgid "%1h %2m %3"
2529+msgstr "%1h %2m %3"
2530+
2531+#. TRANSLATORS: the first argument is hour, followed by the
2532+#. translation for either 'behind' or 'ahead'
2533+#: ../app/worldclock/UserWorldCityDelegate.qml:162
2534+#, qt-format
2535+msgid "%1h %2"
2536+msgstr "%1h %2"
2537+
2538+#. TRANSLATORS: the first argument is minute, followed by the
2539+#. translation for either 'behind' or 'ahead'
2540+#: ../app/worldclock/UserWorldCityDelegate.qml:170
2541+#, qt-format
2542+msgid "%1m %2"
2543+msgstr "%1m %2"
2544+
2545+#: ../app/worldclock/UserWorldCityDelegate.qml:176
2546+msgid "Same time"
2547+msgstr "Mesma hora"
2548+
2549+#: ../app/worldclock/WorldCityList.qml:51
2550+msgid "Select a city"
2551+msgstr "Selecione a cidade"
2552+
2553+#: ../app/worldclock/WorldCityList.qml:109
2554+msgid "Search..."
2555+msgstr "Pesquisar..."
2556+
2557+#: ../app/worldclock/WorldCityList.qml:214
2558+msgid "Searching for a city"
2559+msgstr "Pesquisando por uma cidade"
2560+
2561+#: ../app/worldclock/WorldCityList.qml:219
2562+msgid "No City Found"
2563+msgstr "Nenhum cidade encontrada"
2564+
2565+#: ../app/worldclock/WorldCityList.qml:225
2566+msgid "Unable to connect."
2567+msgstr "Não foi possível conectar."
2568+
2569+#: ../app/worldclock/WorldCityList.qml:226
2570+msgid "Please check your network connection and try again"
2571+msgstr "Por favor verifique sua conexão de internet e tente novamente"
2572+
2573+#: ubuntu-clock-app.desktop.in.in.h:1
2574+msgid "Clock"
2575+msgstr "Relógio"
2576+
2577+#: ubuntu-clock-app.desktop.in.in.h:2
2578+msgid ""
2579+"A sophisticated clock app that provides world clock and alarm functionality."
2580+msgstr ""
2581+"Um aplicativo sofisticado de relógio que fornece a hora mundialmente, bem "
2582+"como a funcionalidade de alarme."
2583+
2584+#: ubuntu-clock-app.desktop.in.in.h:3
2585+msgid "time;alarm;alert;clock;world;"
2586+msgstr "time;alarm;alert;clock;world;alarme;relógio;hora;despertador;"
2587
2588=== modified file 'po/ru.po'
2589--- po/ru.po 2014-11-20 06:42:27 +0000
2590+++ po/ru.po 2015-02-27 14:05:26 +0000
2591@@ -7,15 +7,15 @@
2592 msgstr ""
2593 "Project-Id-Version: ubuntu-clock-app\n"
2594 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2595-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
2596-"PO-Revision-Date: 2014-09-02 09:22+0000\n"
2597+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
2598+"PO-Revision-Date: 2015-01-29 09:17+0000\n"
2599 "Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
2600 "Language-Team: Russian <ru@li.org>\n"
2601 "MIME-Version: 1.0\n"
2602 "Content-Type: text/plain; charset=UTF-8\n"
2603 "Content-Transfer-Encoding: 8bit\n"
2604-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
2605-"X-Generator: Launchpad (build 17252)\n"
2606+"X-Launchpad-Export-Date: 2015-01-30 07:28+0000\n"
2607+"X-Generator: Launchpad (build 17306)\n"
2608
2609 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
2610 #: ../app/alarm/EditAlarmPage.qml:302
2611@@ -42,21 +42,21 @@
2612
2613 #: ../app/alarm/AlarmPage.qml:87
2614 msgid "Select None"
2615-msgstr ""
2616+msgstr "Снять выделение"
2617
2618-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
2619+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
2620 msgid "Select All"
2621 msgstr "Выбрать всё"
2622
2623 #: ../app/alarm/AlarmPage.qml:149
2624 msgid "No saved alarms"
2625-msgstr ""
2626+msgstr "Нет сохранённых будильников"
2627
2628 #: ../app/alarm/AlarmPage.qml:150
2629 msgid "Tap the + icon to add an alarm"
2630-msgstr ""
2631+msgstr "Чтобы добавить будильник, нажмите значок \"+\""
2632
2633-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
2634+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
2635 msgid "Repeat"
2636 msgstr "Повторять"
2637
2638@@ -84,7 +84,7 @@
2639
2640 #: ../app/alarm/AlarmSettingsPage.qml:214
2641 msgid "Snooze for"
2642-msgstr ""
2643+msgstr "Повторить через"
2644
2645 #: ../app/alarm/AlarmSettingsPage.qml:259
2646 msgid "Vibration"
2647@@ -100,7 +100,7 @@
2648
2649 #: ../app/alarm/AlarmUtils.qml:31
2650 msgid "Never"
2651-msgstr ""
2652+msgstr "Никогда"
2653
2654 #: ../app/alarm/AlarmUtils.qml:37
2655 msgid "Weekdays"
2656@@ -116,12 +116,12 @@
2657
2658 #: ../app/alarm/AlarmUtils.qml:55
2659 msgid "No active alarms"
2660-msgstr ""
2661+msgstr "Будильники отсутствуют"
2662
2663 #: ../app/alarm/AlarmUtils.qml:72
2664 #, qt-format
2665 msgid "Next Alarm %1"
2666-msgstr ""
2667+msgstr "Следующий будильник %1"
2668
2669 #: ../app/alarm/AlarmUtils.qml:79
2670 msgid "Alarm Passed"
2671@@ -130,17 +130,17 @@
2672 #: ../app/alarm/AlarmUtils.qml:89
2673 #, no-c-format, qt-format
2674 msgid "in %1d %2h %3m"
2675-msgstr ""
2676+msgstr "через %1d %2h %3m"
2677
2678 #: ../app/alarm/AlarmUtils.qml:99
2679 #, no-c-format, qt-format
2680 msgid "in %1h %2m"
2681-msgstr ""
2682+msgstr "через %1h %2m"
2683
2684 #: ../app/alarm/AlarmUtils.qml:108
2685 #, no-c-format, qt-format
2686 msgid "in %1m"
2687-msgstr ""
2688+msgstr "через %1m"
2689
2690 #: ../app/alarm/EditAlarmPage.qml:43
2691 msgid "New alarm"
2692@@ -154,13 +154,13 @@
2693 msgid "Delete alarm"
2694 msgstr "Удалить будильник"
2695
2696-#: ../app/clock/ClockPage.qml:268
2697+#: ../app/clock/ClockPage.qml:271
2698 msgid "Location Service Error!"
2699-msgstr ""
2700+msgstr "Не удалось определить местоположение!"
2701
2702-#: ../app/clock/ClockPage.qml:270
2703+#: ../app/clock/ClockPage.qml:273
2704 msgid "Retrieving location..."
2705-msgstr ""
2706+msgstr "Определение местоположения..."
2707
2708 #: ../app/worldclock/AddWorldCityButton.qml:30
2709 msgid "Add"
2710@@ -187,25 +187,25 @@
2711 #: ../app/worldclock/UserWorldCityDelegate.qml:153
2712 #, qt-format
2713 msgid "%1h %2m %3"
2714-msgstr ""
2715+msgstr "%1h %2m %3"
2716
2717 #. TRANSLATORS: the first argument is hour, followed by the
2718 #. translation for either 'behind' or 'ahead'
2719 #: ../app/worldclock/UserWorldCityDelegate.qml:162
2720 #, qt-format
2721 msgid "%1h %2"
2722-msgstr ""
2723+msgstr "%1h %2"
2724
2725 #. TRANSLATORS: the first argument is minute, followed by the
2726 #. translation for either 'behind' or 'ahead'
2727 #: ../app/worldclock/UserWorldCityDelegate.qml:170
2728 #, qt-format
2729 msgid "%1m %2"
2730-msgstr ""
2731+msgstr "%1m %2"
2732
2733 #: ../app/worldclock/UserWorldCityDelegate.qml:176
2734 msgid "Same time"
2735-msgstr ""
2736+msgstr "Такое же время"
2737
2738 #: ../app/worldclock/WorldCityList.qml:51
2739 msgid "Select a city"
2740@@ -238,7 +238,7 @@
2741 #: ubuntu-clock-app.desktop.in.in.h:2
2742 msgid ""
2743 "A sophisticated clock app that provides world clock and alarm functionality."
2744-msgstr ""
2745+msgstr "Современные часы с функциями мирового времени и будильника."
2746
2747 #: ubuntu-clock-app.desktop.in.in.h:3
2748 msgid "time;alarm;alert;clock;world;"
2749
2750=== modified file 'po/sl.po'
2751--- po/sl.po 2014-11-20 06:42:27 +0000
2752+++ po/sl.po 2015-02-27 14:05:26 +0000
2753@@ -7,15 +7,15 @@
2754 msgstr ""
2755 "Project-Id-Version: ubuntu-clock-app\n"
2756 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2757-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
2758+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
2759 "PO-Revision-Date: 2014-11-14 18:13+0000\n"
2760 "Last-Translator: Damir Jerovšek <Unknown>\n"
2761 "Language-Team: Slovenian <sl@li.org>\n"
2762 "MIME-Version: 1.0\n"
2763 "Content-Type: text/plain; charset=UTF-8\n"
2764 "Content-Transfer-Encoding: 8bit\n"
2765-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
2766-"X-Generator: Launchpad (build 17252)\n"
2767+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
2768+"X-Generator: Launchpad (build 17306)\n"
2769
2770 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
2771 #: ../app/alarm/EditAlarmPage.qml:302
2772@@ -44,7 +44,7 @@
2773 msgid "Select None"
2774 msgstr "Odznači vse"
2775
2776-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
2777+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
2778 msgid "Select All"
2779 msgstr "Označi vse"
2780
2781@@ -56,7 +56,7 @@
2782 msgid "Tap the + icon to add an alarm"
2783 msgstr "Tapnite na ikono + za dodanje alarma"
2784
2785-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
2786+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
2787 msgid "Repeat"
2788 msgstr "Ponovi"
2789
2790@@ -154,11 +154,11 @@
2791 msgid "Delete alarm"
2792 msgstr "Zbriši alarm"
2793
2794-#: ../app/clock/ClockPage.qml:268
2795+#: ../app/clock/ClockPage.qml:271
2796 msgid "Location Service Error!"
2797 msgstr "Napaka storitve mesta!"
2798
2799-#: ../app/clock/ClockPage.qml:270
2800+#: ../app/clock/ClockPage.qml:273
2801 msgid "Retrieving location..."
2802 msgstr "Pridobivanje mesta ..."
2803
2804
2805=== modified file 'po/sv.po'
2806--- po/sv.po 2014-11-20 06:42:27 +0000
2807+++ po/sv.po 2015-02-27 14:05:26 +0000
2808@@ -7,15 +7,15 @@
2809 msgstr ""
2810 "Project-Id-Version: ubuntu-clock-app\n"
2811 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2812-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
2813+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
2814 "PO-Revision-Date: 2014-09-19 06:10+0000\n"
2815 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
2816 "Language-Team: Swedish <sv@li.org>\n"
2817 "MIME-Version: 1.0\n"
2818 "Content-Type: text/plain; charset=UTF-8\n"
2819 "Content-Transfer-Encoding: 8bit\n"
2820-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
2821-"X-Generator: Launchpad (build 17252)\n"
2822+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
2823+"X-Generator: Launchpad (build 17306)\n"
2824
2825 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
2826 #: ../app/alarm/EditAlarmPage.qml:302
2827@@ -44,7 +44,7 @@
2828 msgid "Select None"
2829 msgstr ""
2830
2831-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
2832+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
2833 msgid "Select All"
2834 msgstr ""
2835
2836@@ -56,7 +56,7 @@
2837 msgid "Tap the + icon to add an alarm"
2838 msgstr ""
2839
2840-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
2841+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
2842 msgid "Repeat"
2843 msgstr ""
2844
2845@@ -154,11 +154,11 @@
2846 msgid "Delete alarm"
2847 msgstr ""
2848
2849-#: ../app/clock/ClockPage.qml:268
2850+#: ../app/clock/ClockPage.qml:271
2851 msgid "Location Service Error!"
2852 msgstr ""
2853
2854-#: ../app/clock/ClockPage.qml:270
2855+#: ../app/clock/ClockPage.qml:273
2856 msgid "Retrieving location..."
2857 msgstr ""
2858
2859
2860=== added file 'po/tr.po'
2861--- po/tr.po 1970-01-01 00:00:00 +0000
2862+++ po/tr.po 2015-02-27 14:05:26 +0000
2863@@ -0,0 +1,245 @@
2864+# Turkish translation for ubuntu-clock-app
2865+# Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
2866+# This file is distributed under the same license as the ubuntu-clock-app package.
2867+# FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
2868+#
2869+msgid ""
2870+msgstr ""
2871+"Project-Id-Version: ubuntu-clock-app\n"
2872+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
2873+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
2874+"PO-Revision-Date: 2015-02-04 20:45+0000\n"
2875+"Last-Translator: Volkan Gezer <Unknown>\n"
2876+"Language-Team: Turkish <tr@li.org>\n"
2877+"MIME-Version: 1.0\n"
2878+"Content-Type: text/plain; charset=UTF-8\n"
2879+"Content-Transfer-Encoding: 8bit\n"
2880+"X-Launchpad-Export-Date: 2015-02-05 07:45+0000\n"
2881+"X-Generator: Launchpad (build 17331)\n"
2882+
2883+#: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
2884+#: ../app/alarm/EditAlarmPage.qml:302
2885+msgid "Label"
2886+msgstr "Etiket"
2887+
2888+#: ../app/alarm/AlarmList.qml:78 ../app/alarm/AlarmPage.qml:117
2889+#: ../app/worldclock/UserWorldCityList.qml:101
2890+msgid "Delete"
2891+msgstr "Sil"
2892+
2893+#: ../app/alarm/AlarmPage.qml:26
2894+msgid "Alarms"
2895+msgstr "Alarmlar"
2896+
2897+#: ../app/alarm/AlarmPage.qml:43 ../app/alarm/EditAlarmPage.qml:50
2898+#: ../app/alarm/EditAlarmPage.qml:177
2899+msgid "Alarm"
2900+msgstr "Alarm"
2901+
2902+#: ../app/alarm/AlarmPage.qml:58 ../app/worldclock/WorldCityList.qml:80
2903+msgid "Back"
2904+msgstr "Geri"
2905+
2906+#: ../app/alarm/AlarmPage.qml:87
2907+msgid "Select None"
2908+msgstr "Hiçbirini Seçme"
2909+
2910+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
2911+msgid "Select All"
2912+msgstr "Tümünü Seç"
2913+
2914+#: ../app/alarm/AlarmPage.qml:149
2915+msgid "No saved alarms"
2916+msgstr "Kayıtlı alarm yok"
2917+
2918+#: ../app/alarm/AlarmPage.qml:150
2919+msgid "Tap the + icon to add an alarm"
2920+msgstr "Bir alarm eklemek için + simgesine dokunun"
2921+
2922+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
2923+msgid "Repeat"
2924+msgstr "Tekrarla"
2925+
2926+#: ../app/alarm/AlarmSettingsPage.qml:29
2927+msgid "Settings"
2928+msgstr "Ayarlar"
2929+
2930+#: ../app/alarm/AlarmSettingsPage.qml:53 ../app/alarm/AlarmSettingsPage.qml:54
2931+#: ../app/alarm/AlarmSettingsPage.qml:55 ../app/alarm/AlarmSettingsPage.qml:56
2932+#: ../app/alarm/AlarmSettingsPage.qml:65 ../app/alarm/AlarmSettingsPage.qml:66
2933+#: ../app/alarm/AlarmSettingsPage.qml:67 ../app/alarm/AlarmSettingsPage.qml:68
2934+#: ../app/alarm/AlarmSettingsPage.qml:146
2935+#: ../app/alarm/AlarmSettingsPage.qml:215
2936+#, qt-format
2937+msgid "%1 minutes"
2938+msgstr "%1 dakika"
2939+
2940+#: ../app/alarm/AlarmSettingsPage.qml:92
2941+msgid "Alarm volume"
2942+msgstr "Alarm sesitrusty"
2943+
2944+#: ../app/alarm/AlarmSettingsPage.qml:145
2945+msgid "Silence after"
2946+msgstr "Susturma gecikmesi"
2947+
2948+#: ../app/alarm/AlarmSettingsPage.qml:214
2949+msgid "Snooze for"
2950+msgstr "Şu kadar ertele"
2951+
2952+#: ../app/alarm/AlarmSettingsPage.qml:259
2953+msgid "Vibration"
2954+msgstr "Titreşim"
2955+
2956+#: ../app/alarm/AlarmSettingsPage.qml:293
2957+msgid "Change time and date"
2958+msgstr "Saat ve tarihi değiştir"
2959+
2960+#: ../app/alarm/AlarmSound.qml:28 ../app/alarm/EditAlarmPage.qml:315
2961+msgid "Sound"
2962+msgstr "Ses"
2963+
2964+#: ../app/alarm/AlarmUtils.qml:31
2965+msgid "Never"
2966+msgstr "Asla"
2967+
2968+#: ../app/alarm/AlarmUtils.qml:37
2969+msgid "Weekdays"
2970+msgstr "İş günleri"
2971+
2972+#: ../app/alarm/AlarmUtils.qml:41
2973+msgid "Weekends"
2974+msgstr "Haftasonları"
2975+
2976+#: ../app/alarm/AlarmUtils.qml:45
2977+msgid "Daily"
2978+msgstr "Günlük"
2979+
2980+#: ../app/alarm/AlarmUtils.qml:55
2981+msgid "No active alarms"
2982+msgstr "Etkin alarm yok"
2983+
2984+#: ../app/alarm/AlarmUtils.qml:72
2985+#, qt-format
2986+msgid "Next Alarm %1"
2987+msgstr "Sonraki Alarm %1"
2988+
2989+#: ../app/alarm/AlarmUtils.qml:79
2990+msgid "Alarm Passed"
2991+msgstr "Alarm Geçti"
2992+
2993+#: ../app/alarm/AlarmUtils.qml:89
2994+#, no-c-format, qt-format
2995+msgid "in %1d %2h %3m"
2996+msgstr "%1d %2h %3m kaldı"
2997+
2998+#: ../app/alarm/AlarmUtils.qml:99
2999+#, no-c-format, qt-format
3000+msgid "in %1h %2m"
3001+msgstr "%1h %2m kaldı"
3002+
3003+#: ../app/alarm/AlarmUtils.qml:108
3004+#, no-c-format, qt-format
3005+msgid "in %1m"
3006+msgstr "%1m kaldı"
3007+
3008+#: ../app/alarm/EditAlarmPage.qml:43
3009+msgid "New alarm"
3010+msgstr "Yeni alarm"
3011+
3012+#: ../app/alarm/EditAlarmPage.qml:43
3013+msgid "Edit alarm"
3014+msgstr "Alarmı düzenle"
3015+
3016+#: ../app/alarm/EditAlarmPage.qml:336
3017+msgid "Delete alarm"
3018+msgstr "Alarmı sil"
3019+
3020+#: ../app/clock/ClockPage.qml:271
3021+msgid "Location Service Error!"
3022+msgstr "Konum Hizmet Hatası!"
3023+
3024+#: ../app/clock/ClockPage.qml:273
3025+msgid "Retrieving location..."
3026+msgstr "Konum getiriliyor..."
3027+
3028+#: ../app/worldclock/AddWorldCityButton.qml:30
3029+msgid "Add"
3030+msgstr "Add"
3031+
3032+#: ../app/worldclock/AddWorldCityButton.qml:61
3033+#: ../app/worldclock/WorldCityList.qml:64
3034+msgid "City"
3035+msgstr "Şehir"
3036+
3037+#. TRANSLATORS: this indicates if the time in a world clock
3038+#. is behind or ahead of the time at the current location
3039+#: ../app/worldclock/UserWorldCityDelegate.qml:142
3040+msgid "behind"
3041+msgstr "arkasında"
3042+
3043+#: ../app/worldclock/UserWorldCityDelegate.qml:143
3044+msgid "ahead"
3045+msgstr "önünde"
3046+
3047+#. TRANSLATORS: the first argument is hour, followed by
3048+#. minute, and the translation for either 'behind' or
3049+#. 'ahead'
3050+#: ../app/worldclock/UserWorldCityDelegate.qml:153
3051+#, qt-format
3052+msgid "%1h %2m %3"
3053+msgstr "%1h %2m %3"
3054+
3055+#. TRANSLATORS: the first argument is hour, followed by the
3056+#. translation for either 'behind' or 'ahead'
3057+#: ../app/worldclock/UserWorldCityDelegate.qml:162
3058+#, qt-format
3059+msgid "%1h %2"
3060+msgstr "%1h %2"
3061+
3062+#. TRANSLATORS: the first argument is minute, followed by the
3063+#. translation for either 'behind' or 'ahead'
3064+#: ../app/worldclock/UserWorldCityDelegate.qml:170
3065+#, qt-format
3066+msgid "%1m %2"
3067+msgstr "%1m %2"
3068+
3069+#: ../app/worldclock/UserWorldCityDelegate.qml:176
3070+msgid "Same time"
3071+msgstr "Aynı zaman"
3072+
3073+#: ../app/worldclock/WorldCityList.qml:51
3074+msgid "Select a city"
3075+msgstr "Bir şehir seçin"
3076+
3077+#: ../app/worldclock/WorldCityList.qml:109
3078+msgid "Search..."
3079+msgstr "Ara..."
3080+
3081+#: ../app/worldclock/WorldCityList.qml:214
3082+msgid "Searching for a city"
3083+msgstr "Bir şehir ara"
3084+
3085+#: ../app/worldclock/WorldCityList.qml:219
3086+msgid "No City Found"
3087+msgstr "Hiç Şehir Bulunamadı"
3088+
3089+#: ../app/worldclock/WorldCityList.qml:225
3090+msgid "Unable to connect."
3091+msgstr "Bağlanılamıyor."
3092+
3093+#: ../app/worldclock/WorldCityList.qml:226
3094+msgid "Please check your network connection and try again"
3095+msgstr "Lütfen ağ bağlantınızı denetleyin ve yeniden deneyin"
3096+
3097+#: ubuntu-clock-app.desktop.in.in.h:1
3098+msgid "Clock"
3099+msgstr "Saat"
3100+
3101+#: ubuntu-clock-app.desktop.in.in.h:2
3102+msgid ""
3103+"A sophisticated clock app that provides world clock and alarm functionality."
3104+msgstr "Dünya saati ve alarm işlevi sağlayan çok amaçlı saat uygulaması."
3105+
3106+#: ubuntu-clock-app.desktop.in.in.h:3
3107+msgid "time;alarm;alert;clock;world;"
3108+msgstr "zaman;alarm;uyarı;saat;dünya;"
3109
3110=== modified file 'po/zh_CN.po'
3111--- po/zh_CN.po 2014-11-20 06:42:27 +0000
3112+++ po/zh_CN.po 2015-02-27 14:05:26 +0000
3113@@ -7,15 +7,15 @@
3114 msgstr ""
3115 "Project-Id-Version: ubuntu-clock-app\n"
3116 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3117-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
3118+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
3119 "PO-Revision-Date: 2014-08-27 14:54+0000\n"
3120 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
3121 "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
3122 "MIME-Version: 1.0\n"
3123 "Content-Type: text/plain; charset=UTF-8\n"
3124 "Content-Transfer-Encoding: 8bit\n"
3125-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
3126-"X-Generator: Launchpad (build 17252)\n"
3127+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
3128+"X-Generator: Launchpad (build 17306)\n"
3129
3130 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
3131 #: ../app/alarm/EditAlarmPage.qml:302
3132@@ -44,7 +44,7 @@
3133 msgid "Select None"
3134 msgstr ""
3135
3136-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
3137+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
3138 msgid "Select All"
3139 msgstr ""
3140
3141@@ -56,7 +56,7 @@
3142 msgid "Tap the + icon to add an alarm"
3143 msgstr ""
3144
3145-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
3146+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
3147 msgid "Repeat"
3148 msgstr ""
3149
3150@@ -154,11 +154,11 @@
3151 msgid "Delete alarm"
3152 msgstr ""
3153
3154-#: ../app/clock/ClockPage.qml:268
3155+#: ../app/clock/ClockPage.qml:271
3156 msgid "Location Service Error!"
3157 msgstr ""
3158
3159-#: ../app/clock/ClockPage.qml:270
3160+#: ../app/clock/ClockPage.qml:273
3161 msgid "Retrieving location..."
3162 msgstr ""
3163
3164
3165=== modified file 'po/zh_TW.po'
3166--- po/zh_TW.po 2014-11-20 06:42:27 +0000
3167+++ po/zh_TW.po 2015-02-27 14:05:26 +0000
3168@@ -7,15 +7,15 @@
3169 msgstr ""
3170 "Project-Id-Version: ubuntu-clock-app\n"
3171 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
3172-"POT-Creation-Date: 2014-11-17 17:05+0100\n"
3173+"POT-Creation-Date: 2015-01-22 01:14+0100\n"
3174 "PO-Revision-Date: 2014-11-19 14:12+0000\n"
3175 "Last-Translator: Walter Cheuk <wwycheuk@gmail.com>\n"
3176 "Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
3177 "MIME-Version: 1.0\n"
3178 "Content-Type: text/plain; charset=UTF-8\n"
3179 "Content-Transfer-Encoding: 8bit\n"
3180-"X-Launchpad-Export-Date: 2014-11-20 06:42+0000\n"
3181-"X-Generator: Launchpad (build 17252)\n"
3182+"X-Launchpad-Export-Date: 2015-01-23 06:50+0000\n"
3183+"X-Generator: Launchpad (build 17306)\n"
3184
3185 #: ../app/alarm/AlarmLabel.qml:30 ../app/alarm/AlarmLabel.qml:56
3186 #: ../app/alarm/EditAlarmPage.qml:302
3187@@ -44,7 +44,7 @@
3188 msgid "Select None"
3189 msgstr "全部不選"
3190
3191-#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:35
3192+#: ../app/alarm/AlarmPage.qml:89 ../app/alarm/AlarmRepeat.qml:38
3193 msgid "Select All"
3194 msgstr "全部選取"
3195
3196@@ -56,7 +56,7 @@
3197 msgid "Tap the + icon to add an alarm"
3198 msgstr "輕觸 + 圖示以加入鬧鐘"
3199
3200-#: ../app/alarm/AlarmRepeat.qml:31 ../app/alarm/EditAlarmPage.qml:292
3201+#: ../app/alarm/AlarmRepeat.qml:34 ../app/alarm/EditAlarmPage.qml:292
3202 msgid "Repeat"
3203 msgstr "重複"
3204
3205@@ -154,11 +154,11 @@
3206 msgid "Delete alarm"
3207 msgstr "刪除鬧鐘"
3208
3209-#: ../app/clock/ClockPage.qml:268
3210+#: ../app/clock/ClockPage.qml:271
3211 msgid "Location Service Error!"
3212 msgstr "位置服務發生錯誤！"
3213
3214-#: ../app/clock/ClockPage.qml:270
3215+#: ../app/clock/ClockPage.qml:273
3216 msgid "Retrieving location..."
3217 msgstr "正在取得位置..."
3218
3219
3220=== modified file 'tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/alarms.pxu'
3221--- tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/alarms.pxu 2014-10-25 13:31:26 +0000
3222+++ tests/manual/2014.com.ubuntu.clock:clock-tests/jobs/alarms.pxu 2015-02-27 14:05:26 +0000
3223@@ -156,3 +156,51 @@
3224 The alarm switch should be colorless to indicate it is disabled.
3225 5. Wait for the time to pass the alarm time.
3226 The alarm should not ring since it was disabled.
3227+
3228+id: alarm/refresh-one-alarm
3229+plugin: manual
3230+depends: alarm/trigger-alarm
3231+estimated_duration: 120
3232+_summary: Test the alarm page refresh issue
3233+_description:
3234+ This test checks if the alarm listview refreshes appropriately when clock app gains focus.
3235+ 1. Launch the clock app.
3236+ Clock app opens showing the current local time.
3237+ 2. Swipe the bottom edge to open the alarms page.
3238+ Alarms page should appear showing a list of alarm. If empty then you should see a
3239+ message being displayed that "No saved alarms".
3240+ 3. Press the plus icon to create a new one-time alarm. Change the alarm time to ring in the next
3241+ minute. Do not change any other options. Save Alarm.
3242+ The saved alarm should be displayed in the alarms page.
3243+ 4. Wait for the time to pass the alarm time.
3244+ The alarm should ring at the time set in the previous step.
3245+ 5. Press "Ok" to dismiss the alarm
3246+ The alarm should be dismissed.
3247+ 6. Check the status of the one-time alarm you just dismissed.
3248+ The one-time alarm must be disabled since it was triggered and dismissed by the user.
3249+
3250+id: alarm/refresh-recurring-alarm
3251+plugin: manual
3252+depends: alarm/trigger-alarm
3253+estimated_duration: 120
3254+_summary: Test the alarm switch disable issue
3255+_description:
3256+ This test checks if the recurring alarm switches stays enabled after dismissing the alarm.
3257+ 1. Launch the clock app.
3258+ Clock app opens showing the current local time.
3259+ 2. Swipe the bottom edge to open the alarms page.
3260+ Alarms page should appear showing a list of alarm. If empty then you should see a
3261+ message being displayed that "No saved alarms".
3262+ 3. Press the plus icon to create a new recurring alarm. Change the alarm time to ring in the next
3263+ minute and set it to repeat on 2-3 days (including today). Save Alarm.
3264+ The saved alarm should be displayed in the alarms page.
3265+ 4. Wait for the time to pass the alarm time.
3266+ The alarm should ring at the time set in the previous step.
3267+ 5. Press "Ok" to dismiss the alarm
3268+ The alarm should be dismissed.
3269+ 6. Check the status of the recurring alarm you just dismissed.
3270+ The recurring alarm must not be disabled after it was triggered and dismissed by the user since
3271+ it is a recurring alarm.
3272+ 7. Check the recurring alarm in the datetime indicator.
3273+ Indicator datetime should update and show the next occurance day of the recurring alarm you dismissed.
3274+
3275
3276=== modified file 'tests/unit/tst_alarmRepeat.qml'
3277--- tests/unit/tst_alarmRepeat.qml 2014-10-05 21:23:09 +0000
3278+++ tests/unit/tst_alarmRepeat.qml 2015-02-27 14:05:26 +0000
3279@@ -1,5 +1,5 @@
3280 /*
3281- * Copyright (C) 2014 Canonical Ltd
3282+ * Copyright (C) 2014-2015 Canonical Ltd
3283 *
3284 * This file is part of Ubuntu Clock App
3285 *
3286@@ -33,10 +33,15 @@
3287 id: _alarm
3288 }
3289
3290+ AlarmUtils {
3291+ id: _alarmUtils
3292+ }
3293+
3294 Component {
3295 id: alarmRepeatPage
3296 AlarmRepeat {
3297 alarm: _alarm
3298+ alarmUtils: _alarmUtils
3299 }
3300 }
3301
3302@@ -112,12 +117,12 @@
3303
3304 tryCompare(_alarm, "type", Alarm.OneTime, 3000, "Alarm type is not OneTime by default")
3305
3306- var dayListItem = findChild(alarmRepeatPageLoader.item, "alarmDay"+3)
3307+ var randomDaySwitch = findChild(alarmRepeatPageLoader.item, "daySwitch"+3)
3308
3309- mouseClick(dayListItem, centerOf(dayListItem).x, centerOf(dayListItem).y)
3310+ mouseClick(randomDaySwitch, centerOf(randomDaySwitch).x, centerOf(randomDaySwitch).y)
3311 tryCompare(_alarm, "type", Alarm.Repeating, 3000, "Alarm type did not change to Repeating despite enabling a switch")
3312
3313- mouseClick(dayListItem, centerOf(dayListItem).x, centerOf(dayListItem).y)
3314+ mouseClick(randomDaySwitch, centerOf(randomDaySwitch).x, centerOf(randomDaySwitch).y)
3315 tryCompare(_alarm, "type", Alarm.OneTime, 3000, "Alarm type is not OneTime despite all switches disabled")
3316 }
3317
3318@@ -129,11 +134,10 @@
3319 waitForRendering(alarmRepeatPageLoader.item);
3320
3321 for(var i=0; i<repeater.count; i++) {
3322- var dayListItem = findChild(alarmRepeatPageLoader.item, "alarmDayHolder"+i)
3323 var currentDaySwitch = findChild(alarmRepeatPageLoader.item, "daySwitch"+i)
3324
3325 if(!currentDaySwitch.checked) {
3326- mouseClick(dayListItem, centerOf(dayListItem).x, centerOf(dayListItem).y)
3327+ mouseClick(currentDaySwitch, centerOf(currentDaySwitch).x, centerOf(currentDaySwitch).y)
3328 }
3329 }
3330

Subscribers

People subscribed via source and target branches