lp:~nik90/ubuntu-clock-app/resync-trunk

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-clock-dev/ubuntu-clock-app/vivid at revision 182

Ubuntu Clock Developers: Pending requested 2015-02-27

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

182. By Nekhelesh Ramananthan on 2015-02-27

merged lp:ubuntu-clock-app

181. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-12-04

Launchpad automatic translations update.

180. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-12-02

Launchpad automatic translations update.

179. By Brendan Donegan on 2014-11-27

Wait for the bottomEdgeTip 'visible' property to be True.

Approved by Ubuntu Phone Apps Jenkins Bot, Leo Arias.

178. By Nekhelesh Ramananthan on 2014-11-25

Fixed incorrect saving of alarm data using alarm delegate model. .

Approved by Ubuntu Phone Apps Jenkins Bot, Zsombor Egri.

177. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-11-24

Launchpad automatic translations update.

176. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-11-21

Launchpad automatic translations update.

175. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-11-20

Launchpad automatic translations update.

174. By Nekhelesh Ramananthan on 2014-11-19

Fixes the "h", "d" and "m" strings not being translatable in "Next Alarm in 3d 2h 4m". Fixes: https://bugs.launchpad.net/bugs/1380248.

Approved by Nekhelesh Ramananthan, Albert Astals Cid, Ubuntu Phone Apps Jenkins Bot.

173. By Launchpad Translations on behalf of ubuntu-clock-dev on 2014-11-19

Launchpad automatic translations update.