Merge lp://staging/~nik90/ubuntu-clock-app/resync-trunk into lp://staging/~ubuntu-clock-dev/ubuntu-clock-app/vivid
Proposed by
Nekhelesh Ramananthan
Status: | Merged |
---|---|
Merged at revision: | 182 |
Proposed branch: | lp://staging/~nik90/ubuntu-clock-app/resync-trunk |
Merge into: | lp://staging/~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://staging/~nik90/ubuntu-clock-app/resync-trunk |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ubuntu Clock Developers | Pending | ||
Review via email: mp+251263@code.staging.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.