Merge lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0 into lp://qastaging/ubuntuone-control-panel/stable-4-0
Proposed by
dobey
Status: | Merged |
---|---|
Approved by: | Eric Casteleijn |
Approved revision: | no longer in the source branch. |
Merged at revision: | 339 |
Proposed branch: | lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0 |
Merge into: | lp://qastaging/ubuntuone-control-panel/stable-4-0 |
Diff against target: |
53254 lines (+52475/-60) 101 files modified
po/POTFILES.in (+1/-0) po/af.po (+24/-0) po/am.po (+659/-0) po/ar.po (+696/-0) po/ast.po (+706/-0) po/az.po (+24/-0) po/be.po (+711/-0) po/bg.po (+680/-0) po/bn.po (+716/-0) po/bo.po (+23/-0) po/bs.po (+703/-0) po/ca.po (+720/-0) po/ca@valencia.po (+703/-0) po/cs.po (+706/-0) po/csb.po (+678/-0) po/cy.po (+24/-0) po/da.po (+711/-0) po/de.po (+727/-0) po/el.po (+727/-0) po/en_AU.po (+706/-0) po/en_CA.po (+24/-0) po/en_GB.po (+706/-0) po/eo.po (+710/-0) po/es.po (+718/-0) po/et.po (+702/-0) po/eu.po (+711/-0) po/fa.po (+24/-0) po/fi.po (+708/-0) po/fil.po (+24/-0) po/fo.po (+664/-0) po/fr.po (+727/-0) po/fy.po (+659/-0) po/gd.po (+720/-0) po/gl.po (+713/-0) po/gu.po (+663/-0) po/he.po (+694/-0) po/hi.po (+676/-0) po/hr.po (+708/-0) po/hu.po (+714/-0) po/hy.po (+659/-0) po/id.po (+671/-0) po/is.po (+24/-0) po/it.po (+713/-0) po/ja.po (+687/-0) po/kk.po (+681/-0) po/km.po (+722/-0) po/ko.po (+687/-0) po/ku.po (+664/-0) po/ky.po (+659/-0) po/lt.po (+693/-0) po/lv.po (+707/-0) po/mhr.po (+24/-0) po/mi.po (+664/-0) po/mr.po (+659/-0) po/ms.po (+708/-0) po/my.po (+672/-0) po/nb.po (+678/-0) po/ne.po (+659/-0) po/nl.po (+713/-0) po/nn.po (+678/-0) po/oc.po (+726/-0) po/pa.po (+667/-0) po/pl.po (+712/-0) po/pt.po (+688/-0) po/pt_BR.po (+717/-0) po/ro.po (+715/-0) po/ru.po (+714/-0) po/se.po (+664/-0) po/shn.po (+664/-0) po/si.po (+667/-0) po/sk.po (+711/-0) po/sl.po (+706/-0) po/sq.po (+714/-0) po/sr.po (+693/-0) po/sv.po (+707/-0) po/sw.po (+23/-0) po/ta.po (+666/-0) po/te.po (+664/-0) po/th.po (+678/-0) po/tr.po (+709/-0) po/ug.po (+713/-0) po/uk.po (+707/-0) po/uz.po (+24/-0) po/vi.po (+672/-0) po/zh_CN.po (+683/-0) po/zh_HK.po (+680/-0) po/zh_TW.po (+680/-0) ubuntuone-installer.desktop.in (+12/-0) ubuntuone/controlpanel/backend.py (+32/-20) ubuntuone/controlpanel/dbus_service.py (+1/-2) ubuntuone/controlpanel/dbustests/test_dbus_service.py (+12/-25) ubuntuone/controlpanel/gui/qt/filesyncstatus.py (+1/-1) ubuntuone/controlpanel/gui/qt/main/__init__.py (+3/-1) ubuntuone/controlpanel/gui/qt/main/tests/test_main.py (+19/-0) ubuntuone/controlpanel/gui/qt/share_links_search.py (+10/-0) ubuntuone/controlpanel/gui/qt/systray.py (+1/-1) ubuntuone/controlpanel/gui/qt/tests/__init__.py (+1/-0) ubuntuone/controlpanel/gui/qt/tests/test_filesyncstatus.py (+4/-3) ubuntuone/controlpanel/gui/qt/tests/test_share_links_search.py (+6/-0) ubuntuone/controlpanel/gui/qt/tests/test_systray.py (+4/-4) ubuntuone/controlpanel/tests/test_backend.py (+73/-3) |
To merge this branch: | bzr merge lp://qastaging/~dobey/ubuntuone-control-panel/update-4-0 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Eric Casteleijn (community) | Approve | ||
Roberto Alsina (community) | Approve | ||
Review via email:
|
Commit message
[Rodney Dawes]
Update translations with .desktop translations.
Add the ubuntuone-installer desktop file.
Import translations from LP.
[Mike McCracken]
- Fix sync indicator in control panel main window. (LP: #1044197)
[Roberto Alsina]
- Made --with-icon the default on Darwin
- Disabled search box until it's ready to work (Fixes LP: 1042885)
[Mike McCracken]
- Fix race in backend get_credentials call. (LP: #1042860)
To post a comment you must log in.