Merge lp://staging/~smartboyhw/ubuntu/raring/rekonq/new-version-2.1-0ubuntu1 into lp://staging/ubuntu/raring/rekonq

Proposed by Howard Chan
Status: Merged
Merged at revision: 57
Proposed branch: lp://staging/~smartboyhw/ubuntu/raring/rekonq/new-version-2.1-0ubuntu1
Merge into: lp://staging/ubuntu/raring/rekonq
Diff against target: 122706 lines (+15464/-78421)
135 files modified
.pc/applied-patches (+0/-5)
.pc/kubuntu_adblock.diff/src/data/adblockrc (+0/-187)
.pc/kubuntu_default_homepages.diff/src/rekonq.kcfg (+0/-279)
.pc/kubuntu_initial_preference.diff/src/data/rekonq.desktop (+0/-92)
.pc/kubuntu_no_default_bookmarks.diff/src/data/defaultbookmarks.xbel (+0/-22)
.pc/kubuntu_restricted_install.diff/src/application.cpp (+0/-864)
CMakeLists.txt (+2/-2)
debian/changelog (+7/-0)
debian/patches/kubuntu_initial_preference.diff (+4/-4)
debian/patches/kubuntu_no_default_bookmarks.diff (+5/-8)
doc/CMakeLists.txt (+0/-1)
doc/de/index.docbook (+2/-2)
doc/nl/index.docbook (+8/-8)
doc/pt/index.docbook (+286/-215)
doc/pt_BR/CMakeLists.txt (+0/-1)
doc/pt_BR/index.docbook (+0/-1689)
po/CMakeLists.txt (+0/-20)
po/bg/CMakeLists.txt (+0/-2)
po/bg/rekonq.po (+0/-3029)
po/bs/CMakeLists.txt (+0/-2)
po/bs/rekonq.po (+0/-2949)
po/ca/CMakeLists.txt (+0/-2)
po/ca/rekonq.po (+0/-3036)
po/ca@valencia/CMakeLists.txt (+0/-2)
po/ca@valencia/rekonq.po (+0/-3041)
po/cs/rekonq.po (+372/-291)
po/da/rekonq.po (+374/-323)
po/de/rekonq.po (+586/-587)
po/el/rekonq.po (+388/-321)
po/en_GB/CMakeLists.txt (+0/-2)
po/en_GB/rekonq.po (+0/-3636)
po/eo/CMakeLists.txt (+0/-2)
po/eo/rekonq.po (+0/-3049)
po/es/rekonq.po (+937/-862)
po/et/rekonq.po (+963/-900)
po/eu/CMakeLists.txt (+0/-2)
po/eu/rekonq.po (+0/-3093)
po/fa/CMakeLists.txt (+0/-2)
po/fa/rekonq.po (+0/-2907)
po/fi/rekonq.po (+434/-416)
po/fr/rekonq.po (+392/-475)
po/ga/CMakeLists.txt (+0/-2)
po/ga/rekonq.po (+0/-2584)
po/gl/CMakeLists.txt (+0/-2)
po/gl/rekonq.po (+0/-2882)
po/hu/rekonq.po (+965/-884)
po/ia/rekonq.po (+484/-353)
po/is/CMakeLists.txt (+0/-2)
po/is/rekonq.po (+0/-3263)
po/it/rekonq.po (+529/-509)
po/ja/CMakeLists.txt (+0/-2)
po/ja/rekonq.po (+0/-2969)
po/km/rekonq.po (+397/-478)
po/ko/CMakeLists.txt (+0/-2)
po/ko/rekonq.po (+0/-3216)
po/lt/rekonq.po (+585/-585)
po/nb/rekonq.po (+151/-128)
po/nds/CMakeLists.txt (+0/-2)
po/nds/rekonq.po (+0/-3321)
po/nl/rekonq.po (+984/-934)
po/pa/CMakeLists.txt (+0/-2)
po/pa/rekonq.po (+0/-2700)
po/pl/rekonq.po (+1062/-1034)
po/pt/rekonq.po (+374/-293)
po/pt_BR/rekonq.po (+401/-381)
po/ro/CMakeLists.txt (+0/-2)
po/ro/rekonq.po (+0/-3034)
po/ru/CMakeLists.txt (+0/-2)
po/ru/rekonq.po (+0/-3689)
po/sk/rekonq.po (+395/-297)
po/sl/rekonq.po (+372/-318)
po/sr/rekonq.po (+367/-285)
po/sr@ijekavian/rekonq.po (+367/-285)
po/sr@ijekavianlatin/rekonq.po (+367/-285)
po/sr@latin/rekonq.po (+367/-285)
po/sv/rekonq.po (+376/-295)
po/th/CMakeLists.txt (+0/-2)
po/th/rekonq.po (+0/-3196)
po/tr/CMakeLists.txt (+0/-2)
po/tr/rekonq.po (+0/-3265)
po/ug/CMakeLists.txt (+0/-2)
po/ug/rekonq.po (+0/-2768)
po/uk/rekonq.po (+376/-295)
po/zh_CN/rekonq.po (+548/-468)
po/zh_TW/rekonq.po (+577/-572)
src/CMakeLists.txt (+1/-0)
src/Messages.sh (+2/-2)
src/application.cpp (+7/-13)
src/application.h (+2/-0)
src/bookmarks/bookmarkowner.cpp (+10/-10)
src/bookmarks/bookmarkowner.h (+4/-4)
src/bookmarks/bookmarkstoolbar.cpp (+24/-11)
src/data/adblockrc (+2/-2)
src/data/defaultbookmarks.xbel (+15/-0)
src/data/home.html (+40/-4)
src/data/rekonq.desktop (+2/-1)
src/history/historymanager.cpp (+12/-0)
src/history/historymanager.h (+3/-2)
src/history/historymodels.cpp (+9/-7)
src/icons/iconmanager.cpp (+2/-14)
src/icons/iconmanager.h (+0/-3)
src/kspellplugin.cpp (+1/-0)
src/main.cpp (+6/-3)
src/rekonq.kcfg (+6/-3)
src/rekonqpage/newtabpage.cpp (+33/-15)
src/settings/settings_advanced.ui (+11/-2)
src/settings/settings_tabs.ui (+7/-0)
src/sync/googlesynchandler.cpp (+22/-22)
src/sync/sync_check.ui (+3/-3)
src/sync/sync_data.ui (+4/-4)
src/sync/sync_ftp_settings.ui (+1/-1)
src/sync/sync_host_type.ui (+1/-1)
src/sync/syncassistant.cpp (+1/-1)
src/tabwindow/rekonqwindow.cpp (+6/-1)
src/tabwindow/tabhighlighteffect.cpp (+1/-1)
src/tabwindow/tabwindow.cpp (+71/-1)
src/tabwindow/tabwindow.h (+4/-1)
src/urlbar/bookmarkwidget.cpp (+4/-3)
src/urlbar/listitem.cpp (+1/-1)
src/urlbar/resourcelinkdialog.cpp (+1/-1)
src/urlbar/urlbar.cpp (+11/-17)
src/webtab/protocolhandler.cpp (+13/-3)
src/webtab/webpage.cpp (+0/-2)
src/webtab/webtab.cpp (+41/-21)
src/webtab/webtab.h (+12/-2)
src/webtab/webview.cpp (+5/-4)
src/webwindow/findbar.cpp (+2/-13)
src/webwindow/findbar.h (+0/-1)
src/webwindow/maintoolbar.cpp (+73/-0)
src/webwindow/maintoolbar.h (+53/-0)
src/webwindow/rekonqfactory.cpp (+45/-1)
src/webwindow/rekonqfactory.h (+2/-0)
src/webwindow/rekonqui.rc (+2/-1)
src/webwindow/webwindow.cpp (+73/-11)
src/webwindow/webwindow.h (+9/-3)
To merge this branch: bzr merge lp://staging/~smartboyhw/ubuntu/raring/rekonq/new-version-2.1-0ubuntu1
Reviewer Review Type Date Requested Status
Jonathan Riddell Pending
Review via email: mp+145611@code.staging.launchpad.net

Description of the change

 * New upstream release version 2.1 of rekonq.
 * Fixed the delete bookmarks patch.

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
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: