Merge lp://staging/~robru/unity-firefox-extension/quantal-sru-candidate into lp://staging/ubuntu/quantal/unity-firefox-extension
Proposed by
Robert Bruce Park
| Status: | Merged |
|---|---|
| Merge reported by: | Ken VanDine |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~robru/unity-firefox-extension/quantal-sru-candidate |
| Merge into: | lp://staging/ubuntu/quantal/unity-firefox-extension |
| Diff against target: |
10583 lines (+7671/-710) 162 files modified
.pc/.quilt_patches (+0/-1) .pc/.quilt_series (+0/-1) .pc/.version (+0/-1) debian/changelog (+47/-0) po/am.po (+83/-0) po/ar.po (+84/-0) po/ast.po (+86/-0) po/az.po (+83/-0) po/be.po (+84/-0) po/bg.po (+86/-0) po/bn.po (+85/-0) po/bo.po (+87/-0) po/bs.po (+84/-0) po/ca.po (+88/-0) po/ca@valencia.po (+88/-0) po/ckb.po (+83/-0) po/cs.po (+85/-0) po/csb.po (+84/-0) po/cy.po (+83/-0) po/da.po (+87/-0) po/de.po (+87/-0) po/el.po (+87/-0) po/en_AU.po (+84/-0) po/en_GB.po (+84/-0) po/eo.po (+83/-0) po/es.po (+86/-0) po/et.po (+85/-0) po/eu.po (+86/-0) po/fa.po (+84/-0) po/fi.po (+87/-0) po/fr.po (+87/-0) po/gd.po (+87/-0) po/gl.po (+87/-0) po/gu.po (+83/-0) po/he.po (+84/-0) po/hi.po (+83/-0) po/hr.po (+83/-0) po/hu.po (+87/-0) po/id.po (+83/-0) po/is.po (+83/-0) po/it.po (+85/-0) po/ja.po (+83/-0) po/kk.po (+83/-0) po/kn.po (+87/-0) po/ko.po (+83/-0) po/ky.po (+83/-0) po/lt.po (+86/-0) po/lv.po (+83/-0) po/ml.po (+83/-0) po/mr.po (+83/-0) po/ms.po (+84/-0) po/my.po (+87/-0) po/nb.po (+83/-0) po/nl.po (+83/-0) po/nn.po (+83/-0) po/oc.po (+87/-0) po/os.po (+84/-0) po/pa.po (+83/-0) po/pl.po (+83/-0) po/pt.po (+86/-0) po/pt_BR.po (+87/-0) po/ro.po (+83/-0) po/ru.po (+84/-0) po/sk.po (+85/-0) po/sl.po (+84/-0) po/sq.po (+83/-0) po/sr.po (+86/-0) po/sv.po (+83/-0) po/ta.po (+83/-0) po/te.po (+87/-0) po/tr.po (+86/-0) po/ug.po (+85/-0) po/uk.po (+87/-0) po/unity_firefox_extension.pot (+28/-8) po/uz.po (+84/-0) po/vi.po (+86/-0) po/zh_CN.po (+83/-0) po/zh_HK.po (+83/-0) po/zh_TW.po (+83/-0) tests/testBradingRemover.js (+1/-1) tests/testPreviewUtils.js (+12/-5) tests/testStress.js (+67/-0) unity-firefox-extension/bootstrap.js (+2/-4) unity-firefox-extension/build.sh (+6/-2) unity-firefox-extension/chrome.manifest (+65/-0) unity-firefox-extension/content/exceptions.js (+2/-0) unity-firefox-extension/content/exceptions.xul (+1/-2) unity-firefox-extension/content/observer.js (+201/-1) unity-firefox-extension/content/unity-api.js (+25/-8) unity-firefox-extension/content/unity-global-property-initializer.js (+61/-106) unity-firefox-extension/content/unity-popup-manager.js (+3/-3) unity-firefox-extension/content/unity-view-manager.js (+0/-52) unity-firefox-extension/content/unity-webapps.js (+555/-0) unity-firefox-extension/content/unity-window-helper.js (+15/-8) unity-firefox-extension/install.rdf (+2/-1) unity-firefox-extension/locale/am/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/ar/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/ast/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/be/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/bg/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/bn/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/bo/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/bs/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/ca/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/ca@valencia/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/cs/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/cy/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/da/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/de/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/el/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/en-AU/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/en-GB/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/en-US/unity_webapps.properties (+5/-0) unity-firefox-extension/locale/eo/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/es/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/eu/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/fa/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/fi/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/fr/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/gd/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/gl/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/gu/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/he/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/hr/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/hu/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/id/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/it/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/ja/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/kk/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/kn/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/ko/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/ky/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/lt/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/lv/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/ml/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/ms/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/my/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/nb/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/nl/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/nn/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/oc/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/os/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/pa/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/pl/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/pt-BR/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/pt/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/ro/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/ru-RU/unity_webapps.properties (+5/-0) unity-firefox-extension/locale/ru/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/sk/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/sl/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/sq/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/sr/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/sv/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/ta/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/tr/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/ug/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/uk/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/vi/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/zh-CN/unity_webapps.properties (+0/-11) unity-firefox-extension/locale/zh-HK/unity_webapps.properties (+16/-0) unity-firefox-extension/locale/zh-TW/unity_webapps.properties (+0/-11) |
| To merge this branch: | bzr merge lp://staging/~robru/unity-firefox-extension/quantal-sru-candidate |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ken VanDine | Approve | ||
|
Review via email:
|
|||
Description of the change
Backport 2.4.4 for quantal.
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
Looks good