~ubuntu-branches/ubuntu/oneiric/arora/oneiric

Committer: Bazaar Package Importer
Author(s): Roderick B. Greening
Date: 2009-09-10 15:24:04 UTC
mfrom: (1.1.10 upstream)
Revision ID: james.westby@ubuntu.com-20090910152404-668k22ux3mfap6g0

Tags: 0.9.0-0ubuntu1

* New upstream release
* Update patches:
  - kubuntu_02_default_bookmarks.diff
* Remove patches:
  - kubuntu_04_startpage_spacing.diff (fixed upstream)
  - kubuntu_05_manpages.diff (fixed upstream)
  - kubuntu_07_adblock.diff (unstable/unsuitable)

files added:
autotests/opensearchengine/opensearchengine.qrc

autotests/opensearchengine/suggestions.txt

debian-upstream/arora.menu

debian-upstream/arora.postinst

debian-upstream/arora.prerm

debian-upstream/watch

src/autosaver.cpp

src/autosaver.h

src/network

src/network/cookiejar

src/network/cookiejar/cookiedialog.cpp

src/network/cookiejar/cookiedialog.h

src/network/cookiejar/cookieexceptionsdialog.cpp

src/network/cookiejar/cookieexceptionsdialog.h

src/network/cookiejar/cookieexceptionsmodel.cpp

src/network/cookiejar/cookieexceptionsmodel.h

src/network/cookiejar/cookiejar.cpp

src/network/cookiejar/cookiejar.h

src/network/cookiejar/cookiejar.pri

src/network/cookiejar/cookiemodel.cpp

src/network/cookiejar/cookiemodel.h

src/network/cookiejar/cookies.ui

src/network/cookiejar/cookiesexceptions.ui

src/network/cookiejar/networkcookiejar

src/network/cookiejar/networkcookiejar/MOZILLA_LICENSE.txt

src/network/cookiejar/networkcookiejar/networkcookiejar.cpp

src/network/cookiejar/networkcookiejar/networkcookiejar.h

src/network/cookiejar/networkcookiejar/networkcookiejar.pri

src/network/cookiejar/networkcookiejar/networkcookiejar_p.h

src/network/cookiejar/networkcookiejar/trie_p.h

src/network/cookiejar/networkcookiejar/twoleveldomains_p.h

src/network/fileaccesshandler.cpp

src/network/fileaccesshandler.h

src/network/network.pri

src/network/networkaccessmanager.cpp

src/network/networkaccessmanager.h

src/network/networkdiskcache.cpp

src/network/networkdiskcache.h

src/network/networkproxyfactory.cpp

src/network/networkproxyfactory.h

src/network/passworddialog.ui

src/network/proxy.ui

src/network/schemeaccesshandler.cpp

src/network/schemeaccesshandler.h

src/opensearch/opensearchenginedelegate.cpp

src/opensearch/opensearchenginedelegate.h

src/utils/explorerstyle.cpp

src/utils/explorerstyle.h

src/utils/languagemanager.cpp

src/utils/languagemanager.h

files removed:
debian/patches/diff

debian/patches/kubuntu_04_startpage_spacing.diff

debian/patches/kubuntu_05_manpages.diff

debian/patches/kubuntu_07_adblock.diff

src/cookiejar

src/cookiejar/cookiedialog.cpp

src/cookiejar/cookiedialog.h

src/cookiejar/cookieexceptionsdialog.cpp

src/cookiejar/cookieexceptionsdialog.h

src/cookiejar/cookieexceptionsmodel.cpp

src/cookiejar/cookieexceptionsmodel.h

src/cookiejar/cookiejar.cpp

src/cookiejar/cookiejar.h

src/cookiejar/cookiejar.pri

src/cookiejar/cookiemodel.cpp

src/cookiejar/cookiemodel.h

src/cookiejar/cookies.ui

src/cookiejar/cookiesexceptions.ui

src/cookiejar/networkcookiejar

src/cookiejar/networkcookiejar/MOZILLA_LICENSE.txt

src/cookiejar/networkcookiejar/networkcookiejar.cpp

src/cookiejar/networkcookiejar/networkcookiejar.h

src/cookiejar/networkcookiejar/networkcookiejar.pri

src/cookiejar/networkcookiejar/networkcookiejar_p.h

src/cookiejar/networkcookiejar/trie_p.h

src/cookiejar/networkcookiejar/twoleveldomains_p.h

src/explorerstyle.cpp

src/explorerstyle.h

src/explorerstyle.pri

src/languagemanager.cpp

src/languagemanager.h

src/networkaccessmanager.cpp

src/networkaccessmanager.h

src/passworddialog.ui

src/proxy.ui

src/schemeaccesshandler.cpp

src/schemeaccesshandler.h

src/utils/autosaver.cpp

src/utils/autosaver.h

src/utils/proxystyle.h

files modified:
AUTHORS

ChangeLog

autotests/historymanager/tst_historymanager.cpp

autotests/languagemanager/languagemanager.pro

autotests/languagemanager/tst_languagemanager.cpp

autotests/opensearchengine/opensearchengine.pro

autotests/opensearchengine/tst_opensearchengine.cpp

autotests/opensearchmanager/tst_opensearchmanager.cpp

autotests/opensearchreader/opensearchreader.pro

autotests/opensearchreader/testfile1.xml

autotests/opensearchreader/testfile3.xml

autotests/opensearchreader/tst_opensearchreader.cpp

autotests/opensearchwriter/opensearchwriter.pro

autotests/opensearchwriter/testfile2.xml

autotests/opensearchwriter/testfile3.xml

autotests/opensearchwriter/tst_opensearchwriter.cpp

autotests/tabbar/tst_tabbar.cpp

autotests/webpage/tst_webpage.cpp

buildosx.sh

debian-upstream/changelog.in

debian-upstream/control

debian-upstream/copyright

debian/changelog

debian/patches/kubuntu_02_default_bookmarks.diff

debian/patches/series

generateReleaseContributors

git_hooks/findstyleerrors.sh

src/aboutdialog.cpp

src/aboutdialog.ui

src/arora.desktop

src/bookmarks/bookmarkstoolbar.cpp

src/browserapplication.cpp

src/browserapplication.h

src/browsermainwindow.cpp

src/browsermainwindow.h

src/clearprivatedata.cpp

src/data/defaultbookmarks.xbel

src/downloadmanager.cpp

src/downloadmanager.h

src/downloads.ui

src/history/historycompleter.cpp

src/htmls/startpage.css

src/locale/ast.ts

src/locale/ca.ts

src/locale/cs_CZ.ts

src/locale/da_DK.ts

src/locale/de_DE.ts

src/locale/el_GR.ts

src/locale/es.ts

src/locale/es_CR.ts

src/locale/et_EE.ts

src/locale/fi_FI.ts

src/locale/fr_CA.ts

src/locale/fr_FR.ts

src/locale/gl.ts

src/locale/he_IL.ts

src/locale/hu_HU.ts

src/locale/it_IT.ts

src/locale/ja_JP.ts

src/locale/ms.ts

src/locale/nb_NO.ts

src/locale/nl_NL.ts *

src/locale/pl_PL.ts

src/locale/pt_BR.ts

src/locale/ru_RU.ts

src/locale/sk_SK.ts

src/locale/sr_RS.ts

src/locale/sr_RS@latin.ts

src/locale/tr_TR.ts

src/locale/uk.ts

src/locale/zh_CN.ts

src/locale/zh_TW.ts

src/locationbar/locationbar.cpp

src/opensearch/opensearch.pri

src/opensearch/opensearchdialog.cpp

src/opensearch/opensearchdialog.ui

src/opensearch/opensearchengine.cpp

src/opensearch/opensearchengine.h

src/opensearch/opensearchengineaction.cpp

src/opensearch/opensearchenginemodel.cpp

src/opensearch/opensearchenginemodel.h

src/opensearch/opensearchmanager.cpp

src/opensearch/opensearchmanager.h

src/opensearch/opensearchreader.cpp

src/opensearch/opensearchreader.h

src/opensearch/opensearchwriter.cpp

src/opensearch/opensearchwriter.h

src/qwebplugins/arorawebplugin.cpp

src/qwebplugins/arorawebplugin.h

src/qwebplugins/clicktoflash/clicktoflashplugin.cpp

src/qwebplugins/clicktoflash/clicktoflashplugin.h

src/qwebplugins/webpluginfactory.cpp

src/settings.cpp

src/settings.h

src/settings.ui

src/sourceviewer.cpp

src/sourceviewer.h

src/src.pri

src/tabbar.cpp

src/tabbar.h

src/tabwidget.cpp

src/tabwidget.h

src/toolbarsearch.cpp

src/utils/README

src/utils/lineedit.cpp

src/utils/lineedit.h

src/utils/lineedit_p.h

src/utils/utils.pri

src/webpage.cpp

src/webview.cpp

src/webview.h

tools/cacheinfo/data/arora-cacheinfo.1

tools/htmlToXBel/data/htmlToXBel.1

tools/placesimport/data/arora-placesimport.1

tools/tools.pro

windowsinstaller.nsi

Show diffs side-by-side

added added

removed removed

src/locale/zh_TW.ts

<source>Close</source>

</message>

<source>WebKit version: %1</source>

</message>

</context>

<name>AcceptLanguage</name>

391

395

</message>

392

396

393

397

<source>Shift+Ctrl+B</source>

394

<translation>Shift+Ctrl+B</translation>

398

<translation type="obsolete">Shift+Ctrl+B</translation>

395

399

</message>

396

400

397

401

575

579

</message>

576

580

577

581

<source>%1 When private browsing is turned on, some actions concerning your privacy will be disabled:<ul><li> Webpages are not added to the history.</li><li> Items are automatically removed from the Downloads window.</li><li> New cookies are not stored, current cookies can't be accessed.</li><li> Site icons won't be stored, session won't be saved.</li><li> Searches are not added to the pop-up menu in the search box.</li><li> Network cache is disabled.</li></ul>Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>

578

<translation>%1 當啟用私密瀏覽後，一些關於私隱的功能將會被停用：<ul><li> 網頁不會加入歷史記錄中。</li><li> 項目會自動從下載視窗中移除。</li><li> 不會儲存新的 cookie，亦不會存取目前的 cookie。</li><li> 網站的圖示不會儲存，階段不會儲存。</li><li>搜尋不會加入到搜尋方塊中的彈出式選單。</li><li> 網路快取已被停用。</li></ul>當你關閉視窗時，您仍可按上一頁及下一頁來回到您剛才開啟的網頁。</translation>

582

<translation type="obsolete">%1 當啟用私密瀏覽後，一些關於私隱的功能將會被停用：<ul><li> 網頁不會加入歷史記錄中。</li><li> 項目會自動從下載視窗中移除。</li><li> 不會儲存新的 cookie，亦不會存取目前的 cookie。</li><li> 網站的圖示不會儲存，階段不會儲存。</li><li>搜尋不會加入到搜尋方塊中的彈出式選單。</li><li> 網路快取已被停用。</li></ul>當你關閉視窗時，您仍可按上一頁及下一頁來回到您剛才開啟的網頁。</translation>

579

583

</message>

580

584

581

585

<source>Are you sure you want to close the window? There are %1 tabs open</source>

608

612

<comment>Download Manager</comment>

609

613

610

614

</message>

615

616

<source>Select &All</source>

617

618

</message>

619

620

621

622

</message>

623

624

<source>%1 When private browsing is turned on, some actions concerning your privacy will be disabled:<ul><li> Webpages are not added to the history.</li><li> Items are automatically removed from the Downloads window.</li><li> New cookies are not stored, current cookies can't be accessed.</li><li> Site icons won't be stored, session won't be saved.</li><li> Searches are not added to the pop-up menu in the search box.</li><li> No new network cache is written to disk.</li></ul>Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>

625

626

</message>

611

627

</context>

612

628

613

629

<name>ClearButton</name>

1157

1173

<source>Provides contextual suggestions</source>

1158

1174

<translation>提供範圍內的建議</translation>

1159

1175

</message>

1176

1177

<source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>

1178

1179

</message>

1180

1181

1182

1183

</message>

1184

1185

<source>Keywords</source>

1186

1187

</message>

1160

1188

</context>

1161

1189

1162

1190

<name>OpenSearchManager</name>

1533

1561

1534

1562

1535

1563

</message>

1564

1565

<source>Choose Directory...</source>

1566

1567

</message>

1536

1568

</context>

1537

1569

1538

1570

<name>SettingsDialog</name>

1544

1576

<source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>

1545

1577

<translation>網路快取設定已經修改。瀏覽器需要重新啟動才能使其生效。</translation>

1546

1578

</message>

1579

1580

<source>Choose Directory</source>

1581

1582

</message>

1547

1583

</context>

1548

1584

1549

1585

<name>SourceViewer</name>

Older »