diff --git a/.gitignore b/.gitignore
index 2c0d7db7..9d28a012 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,4 @@ ms_print.*
 doc/
 .qmake.stash
 build
+.vscode
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..b90881a8
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "tools/htmlToXBel"]
+	path = tools/htmlToXBel
+	url = https://gitlab.com/EndorphinBrowser/tools/htmlToXBel.git
diff --git a/BUILDING.md b/BUILDING.md
index cf4eb33b..376252a1 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -5,14 +5,13 @@ Endorphin is still in development, which means that there are no compiled instal
 ### Step 1: Make sure git is installed.
 To see if git is installed, open up a terminal window and type `git`. If it is not installed, the terminal will report back command not found. If it is installed, you'll receive the git help text. To install git: [Windows](https://gitforwindows.org/), [Mac](https://git-scm.com/download/mac), and for Linux, use your distro's package manager.
 
-### Step 2: Download and install Qt 5.14 or greater.
-If you already have **Qt 5.14** or greater installed, you can skip this step.
-To install Qt 5.14, visit the [Download Page](https://www.qt.io/download) or use your distro's package manager on Linux. Be sure to add the correct PATH variable if required in the official install instructions. When you're done, skip the alternative method section, and move onto Step 3.
+### Step 2: Download and install Qt 5.15.
+If you already have **Qt 5.15** or greater installed, you can skip this step. To install Qt 5.15, visit the [Download Page](https://www.qt.io/download) or use your distro's package manager on Linux. Be sure to add the correct PATH variable if required in the official install instructions. When you're done, skip the alternative method section, and move onto Step 3.
 
 ### Step 3: Download and compile the latest Endorphin.
 Now we will download the latest tree of Endorphin. Issue these commands:
 ```
-$ git clone git://github.com/EndorphinBrowser/browser.git
+$ git clone https://gitlab.com/EndorphinBrowser/browser.git --recursive
 $ cd browser
 $ mkdir build && cd build
 $ cmake ..
diff --git a/ChangeLog b/CHANGELOG.arora.md
similarity index 77%
rename from ChangeLog
rename to CHANGELOG.arora.md
index b48bb743..5acbf78b 100644
--- a/ChangeLog
+++ b/CHANGELOG.arora.md
@@ -1,131 +1,82 @@
-UNRELEASED:
-
-Fixed issues:
-    endorphin-placesimport sometimes resulted in an "Invalid cross-device link" error.
-
-Behind the scene:
-    Add alternative CMake build system
-        This is not final yet, and currently only works on Linux.
-        When it is finished, it will replace qmake.
-        CMake currently reduces the size of endorphin-placesimport from about 2 MB to about 250 KB.
-        This improvement will be added to QMake later.
-
-Other:
-    Remove ClickToFlash
-        Flash will reach its end-of-life soon, and shouldn't be used at all, so this feature was removed.
-    Remove usage of some deprecated QT features
-
-Fixed issues:
-     Fix many "invalid certificate" errors
-
-0.12.1
-
-Interface:
-    Add note about this being an inofficial fork
-    Update included user agents
-    Improve placeholder text of the searchbox on the front page
-
-Fixed issues:
-     Fix language fallback
-
-0.12.0
-
-Interface:
-    Show the number of downloads in the download manager dialog title
-    
-Fixed issues:
-    When the 'delete' button is pressed, the downloaded item count was not updated.
-    Issue: 912: Autofill manager was always storing forms.
-    Issue: 915: Fixed ssl certificate problem with sites like https://webmail.us.army.mil
-        By default QSSLConfiguration was only accepting SSLv3 while we want to
-        accept all of them.
-    Issue: 918: "Autofill webforms" in Preferences was always checked.
-    Issue: 931: Fix for fullscreen on Mac
-    Issue: 957: Workaround for a bug in QCompleter
-    
-Behind the scene:
-    Support persistent data storage (HTML5 localStorage)
-    Update to QT5 & latest WebKit to fix many issues with modern websites
-    Update some internal pages to HTML5
-    Code cleanup
-
-Other:
-    Remove OS2 support
-    
-This is not an official update to this browser.
-
-0.11.0
-Interface:
-    When the privacy indicator is visible clicking on it will result in private mode being turned off.
-    Add a way to modify the user agent string from within the application.
-    Support arguments for the external download program
-    Tweak the adblock dialog spacing and size.
-    Change the AdBlock dialog to use a simple check box instead of a group box.
-    Replace Stopped with Download Complete (like in ffx it's less confusing )
-    Update the copyright year in the about dialog to include 2010
-    Issue: 768: Fix spelling mistake
-    Issue: 821: Sort columns in cookie dialog by data values instead of string value. This fixes the dates being alphanumerically sorted.
-
-Behind the scene:
-    Issue: 891: Fix Text Encoding to work correctly
-    Issue: 826: Correctly save the history state of a tab when using Qt 4.6
-    Fix build breakage with QtWebKit 2.0.
-    Remove remnant of delayed QWebView creation. Fixes tab restore again.
-    Style fix: convert tabs to spaces.
-
-Build system:
-    Add an application icon for os2.
-    For finding the locale tools on os2 behave like win32
-    When building in debug mode on OS2 just like with Windows enable the console.
-    Move Endorphin's hooks to the git-hooks format to utilize git-hooks (See: http://github.com/icefox/git-hooks)
-    Default to lrelease and not lrelease-qt4 on non unix platforms.
-    QMAKE_EXTRA_UNIX_TARGETS is deprecated; use QMAKE_EXTRA_TARGETS instead.
-    Enable the raster graphics system by default for X11
-
-Translation:
-    Make "Show Hidden Files" translatable.
-    Issue: 811: Fix typos in the German translation
-    Replaced "leichtgewichtiger" with "schlanker" in translation with source "Lightweight WebKit-based wen browser"
-    Fixed capitalization typo whare the word "Tab" began with a lowercase "t"
-    Renamed Dutch translation file from nl_BE to nl.
-
-
-0.10.2
-The major issues:
-    - When compiling with Qt 4.6 Endorphin had been using some API that changes
+# Arora Changelog
+
+This is the changelog of the Arora browser. Arora had a different issue log (not accessible anymore)
+and it might be confusing if we used the Endorphin and Arora issue log in the changelog, so the Changelog
+was moved to another file.
+
+## 0.11.0
+
+### Interface
+- When the privacy indicator is visible clicking on it will result in private mode being turned off.
+- Add a way to modify the user agent string from within the application.
+- Support arguments for the external download program
+- Tweak the adblock dialog spacing and size.
+- Change the AdBlock dialog to use a simple check box instead of a group box.
+- Replace Stopped with Download Complete (like in ffx it's less confusing )
+- Update the copyright year in the about dialog to include 2010
+- Issue: 768: Fix spelling mistake
+- Issue: 821: Sort columns in cookie dialog by data values instead of string value. This fixes the dates being alphanumerically sorted.
+
+### Behind the scene
+- Issue: 891: Fix Text Encoding to work correctly
+- Issue: 826: Correctly save the history state of a tab when using Qt 4.6
+- Fix build breakage with QtWebKit 2.0.
+- Remove remnant of delayed QWebView creation. Fixes tab restore again.
+- Style fix: convert tabs to spaces.
+
+#### Build system
+- Add an application icon for os2.
+- For finding the locale tools on os2 behave like win32
+- When building in debug mode on OS2 just like with Windows enable the console.
+- Move Arora's hooks to the git-hooks format to utilize git-hooks (See: http://github.com/icefox/git-hooks)
+- Default to lrelease and not lrelease-qt4 on non unix platforms.
+- QMAKE_EXTRA_UNIX_TARGETS is deprecated; use QMAKE_EXTRA_TARGETS instead.
+- Enable the raster graphics system by default for X11
+
+### Translation
+- Make "Show Hidden Files" translatable.
+- Issue: 811: Fix typos in the German translation
+- Replaced "leichtgewichtiger" with "schlanker" in translation with source "Lightweight WebKit-based wen browser"
+- Fixed capitalization typo whare the word "Tab" began with a lowercase "t"
+- Renamed Dutch translation file from nl_BE to nl.
+
+
+## 0.10.2
+### The major issues
+- When compiling with Qt 4.6 Arora had been using some API that changes
     shortly before the release of Qt 4.6.0 after an API review was done for
     the new API in QtWebKit.  This release changes the code to build with the
     final API that is found in Qt 4.6.0
-    - A segfault that could occur when opening a URL on a new window from the command-line.
+- A segfault that could occur when opening a URL on a new window from the command-line.
 
 
-0.10.1
-The major issues:
-    Issue: 666 Sites were showing a "SSL handshake failure". With the new NetworkAccessManagerProxy the signals were being sent to the proxy and not the primary networkaccessmanager.
-    Issue: 683: Endorphin crashes when using privacy mode.
+## 0.10.1
+### The major issues
+- Issue: 666 Sites were showing a "SSL handshake failure". With the new NetworkAccessManagerProxy the signals were being sent to the proxy and not the primary networkaccessmanager.
+- Issue: 683: Arora crashes when using privacy mode.
 	When switching to private mode the primary networkaccessmanagers swaps cookiejar's which caused a segfault. Introduce a CookieJarProxy class which will pass the cookie requests to the primary networkaccessmanager's cookiejar.
 
-Translations:
-    Add Portuguese translation from Américo Monteiro <a_monteiro@netcabo.pt>
-    Updated Turkish translation from Mehmet Nur Olcay <mnurolcay@gmail.com>
-    Issue: 682,677 Fix several FR spelling mistakes.
-
-Fixed Issues:
-    Issue: 79 Only tab down the completer when the popup is visible.
-    Issue: 221 When using Qt 4.6 hardcode a webpage to have a white background even when using a dark theme.
-    Issue: 472 Set the url on the location bar that matches the webview that we are loading the url in, not in the current location bar which might not be the correct one.
-    Issue: 637 Startup Crash with Qt 4.5.0 (not with any other version)
-    Issue: 679 Selecting Show only one close button instead of one for each tab requires an application restart to be applied.
-    Issue: 676 Fix openstreetmap.org's login saving and improve the Wallet password dialog when finding the login name.
+### Translations
+- Add Portuguese translation from Américo Monteiro <a_monteiro@netcabo.pt>
+- Updated Turkish translation from Mehmet Nur Olcay <mnurolcay@gmail.com>
+- Issue: 682,677 Fix several FR spelling mistakes.
+
+### Fixed Issues
+- Issue: 79 Only tab down the completer when the popup is visible.
+- Issue: 221 When using Qt 4.6 hardcode a webpage to have a white background even when using a dark theme.
+- Issue: 472 Set the url on the location bar that matches the webview that we are loading the url in, not in the current location bar which might not be the correct one.
+- Issue: 637 Startup Crash with Qt 4.5.0 (not with any other version)
+- Issue: 679 Selecting Show only one close button instead of one for each tab requires an application restart to be applied.
+- Issue: 676 Fix openstreetmap.org's login saving and improve the Wallet password dialog when finding the login name.
 	Rather than using the document.form[0].name use document.form[0].elements["name"] this allows the name to contain things such as []'s without causing a problem.
 
-Other issues / changes
-    Add support for the home, favorites, search, and openurl multimedia keys found on some keyboards
-    Turn on AutoFill by default
-    Remove the accidental 100MB limit on the disk cache size in the settings dialog.
-    Make source viewer remember the window size and not block access to the main window
+### Other issues / changes
+- Add support for the home, favorites, search, and openurl multimedia keys found on some keyboards
+- Turn on AutoFill by default
+- Remove the accidental 100MB limit on the disk cache size in the settings dialog.
+- Make source viewer remember the window size and not block access to the main window
 
-0.10.0
+## 0.10.0
 Interface
 - Issue #24: Add support for AdBlock
 - Issue #40: Support several common modifiers in the location bar for modifying the typed in url.
@@ -140,30 +91,30 @@ Interface
 - Issue #650: Save the toolbar location allowing the toolbars to be next to each other
 - Add ctrl-z shortcut to undo the closing of the last tab.
 - Behave better when access keys are enabled by adding a slight delay to make sure that the ctrl is actually for access keys and not for another shortcut such as ctrl-tab or ctrl-a
-- When endorphin crashed on the previous startup give the user a way to bypass the failsafe and restore their session if they really want.
+- When Arora crashed on the previous startup give the user a way to bypass the failsafe and restore their session if they really want.
 - Add the ability to set the length of a session cookie
 - Enable DNS prefetching and WebKit version in the about dialog when building against Qt 4.6.
 - Remember what tab you were on when you close the settings dialog
 - Add a browse button next to the style sheet line edit to help users find files and automatically translate them into url's.
 - Add icons to the menu actions on freedesktop systems.
 - Show the configure search engines action in the tools menu
-- Change default bookmarks to only have a link to htpp://endorphin-browser.org
+- Change default bookmarks to only have a link to htpp://Arora-browser.org
     Removed all of Qt development type entries
-    From discussion on http://endorphinbrowser.blogspot.com/2009/08/endorphin-090.html and also the Kubuntu guys strip the bookmarks in their release so it make sense.
+    From discussion on http://Arorabrowser.blogspot.com/2009/08/Arora-090.html and also the Kubuntu guys strip the bookmarks in their release so it make sense.
 - Move the Preferences menu item to Tools|Options
 - Set placeholder text for the start page search box
 - Add a checkbox to hide/show hidden files in the directory listing.
 - Change the about dialog text so it can be selected with a mouse so users can copy the application version.
 - Allow urls to be dropped on the bookmark bar and bookmark menu
 
-Behind the scenes
+### Behind the scenes
 - Force the history completer to be LTR: same as the url line.
 - Create a new stills class, NetworkAcessManagerProxy that is useful for tracking what QWebPage a QWebReply came from.
 - Load QWebView settings when the View is created so m_enableAccessKeys will be read from settings
 - Rename lineedit -> locationbar functions & variables
 - Enhance SingleApplication so that the host can send messages back to the second application.
     On Windows this is used to send the window id back to the application that was just started
-    so it can raise the endorphin window to the front.
+    so it can raise the Arora window to the front.
 - Fix some old MSVC compile warnings
 - Make it possible to retranslate the bookmarks toolbar title
 - Set the maximumPagesInCache to 3 (default is 0) and provide a way for users to set this value through QSettings.
@@ -181,7 +132,7 @@ Behind the scenes
 - Fix character encoding in directory listing.
 - Clean up the private browsing message box to make it easier to translate.
 
-Build system
+#### Build system
 - Allow building against a shadow-built WebKit trunk
 - Ignore more misc generated build files on windows
 - Add Git hook to check commits for the proper copyright year
@@ -190,17 +141,18 @@ Build system
 - Re-enable sharing the temporary compilation objects for all subprojects. Use the 'ordered' configuration to make sure that we walk through the subdirectories one by one and not all simultaneously when building in parallel.
 
 
-0.9.0
+## 0.9.0
+
 Drop support for Qt 4.4.
 
-Interface
-FEATURES:
+### Interface
+#### Features
 - Add support for search keywords in the location bar.
 - POST support for OpenSearch suggestion requests.
 - Add WebKit version to the About dialog [WebKit trunk only].
 - Use HTTP pipelining for all network requests [Qt 4.6 only].
 
-IMPROVEMENTS:
+#### Improvements
 - Remember last used save directory.
 - Added file dialog to download location settings.
 - Restrict drag and drop to the same page unless a QWebView accepts it.
@@ -214,7 +166,7 @@ IMPROVEMENTS:
 - Add Planet Qt to the default set of bookmarks.
 - Remove the text wrapping option from the source viewer's menu and instead enable it by default.
 
-BUGFIXES:
+### Bug fixes
 - Avoid duplicated and contradictory rules on the cookie rule list.
 - Change the shortcut for showing the bookmark toolbar as it was conflicting with the show bookmark dialog shortcut.
 - Encode the user input before inserting it into an URL template.
@@ -237,7 +189,7 @@ BUGFIXES:
 - Avoid overwriting the user agent string in the WebPage autotest.
 - Fix non-ASCII characters displayed garbled for Authors.
 
-Behind the scenes
+### Behind the scenes
 - Merge two blocks of code that deals with oneCloseButton policy.
 - Make parentWindow() prettier.
 - Simplify updates of actions in view menu.
@@ -245,14 +197,14 @@ Behind the scenes
 - Save UI changes in the active window before creating a new one.
 - Move all network related files into one directory.
 
-Build system
+#### Build system
 - When building on osx use qmake -r.
 - Ignore generated files built on windows.
 
 
-0.8.0
-Interface
-FEATURES:
+## 0.8.0
+### Interface
+#### Features
 - When the ctrl key is pressed show keyboard accelerators on the screen. [Qt 4.6 only].
 - Location bar: implement full text search and more accurate sorting.
 - Add a simple start page with a search box pointing at the active search engine.
@@ -263,7 +215,7 @@ FEATURES:
 - Add a checkable push button to the search bar that allows to highlight a specific string in a website [Qt 4.6 only].
 - Add a setting that specifies if the url supplied by the user should be forwarded to the default search engine if it isn't valid.
 
-IMPROVEMENTS:
+#### Improvements
 - Show a more verbose message when the htmlToXBel tool is not installed.
 - Show the complete tab title as tool tip to improve GUI usability for long website titles.
 - Download manager: Create the download directory as needed.
@@ -274,7 +226,7 @@ IMPROVEMENTS:
 - When creating new windows, use the startup setting to decide if the homepage should be loaded.
 - Remove the network monitor tool as the current Inspector now lets you see request headers and response headers.
 
-BUGFIXES:
+### Bug fixes
 - Fix several memory leaks: set the Qt::WA_DeleteOnClose flag on dialogs that are executed asynchronously.
 - Download manager: Fix displaying file size when downloading huge files.
 - Download manager: Give correct name to downloaded files with no suffix.
@@ -282,7 +234,7 @@ BUGFIXES:
 - Bookmarks manager: Don't allow to edit the url in any nodes but normal bookmarks.
 - Private browsing now disables the disk cache.
 
-Behind the scenes
+### Behind the scenes
 - Added custom network scheme handlers, i.e. a single one for listing local directories.
 - Add a setting so the user can swap the location of the new and close tab buttons.
 - Add the ability for a user to specify the userAgent through QSettings.
@@ -294,19 +246,21 @@ Behind the scenes
 - Tweak the certToFormattedString() function.
 - OpenSearch: localization improvements.
 
-Build system
-- Include an additional XML file in the installation, which will make Endorphin appear in Gnome Control Center on the list of available web browsers that can be set as default.
+#### Build system
+- Include an additional XML file in the installation, which will make Arora appear in Gnome Control Center on the list of available web browsers that can be set as default.
 - Add man pages for the tools.
 - webkit.pri now supports building QtWebKit as a framework on mac.
 
 
-0.7.1
-Fix Windows build.
-Fix building in parallel (make -jX).
+## 0.7.1
+### Behind the scenes
+#### Build system
+- Fix Windows build.
+- Fix building in parallel (make -jX).
 
 
-0.7.0
-Interface
+## 0.7.0
+### Interface
 - Add support for OpenSearch to the toolbar search
 - Add the ability to search from the webpage context menu
 - Remember the boxes checked in the Clear Private Data dialog
@@ -317,7 +271,7 @@ Interface
 - Add a setting specifying if the application should quit when last tab is closed.
 - Revert the check for the Oxygen style so when under KDE4 Oxygen will be
 used even if it has issues.
-- Fix mid click to paste urls into Endorphin to have them be loaded
+- Fix mid click to paste urls into Arora to have them be loaded
 - Fix crash in Clear Privacy Dialog when cache is disabled
 - In the download manager change the "Ok" Button to "Close"
 - Fix the positioning of new tab and close tab buttons. Comparing to 0.6 they are just swapped now.
@@ -345,10 +299,10 @@ used even if it has issues.
 - Add subdomain checking, eg when the policy says 'block def.com', then it will block cookies from 'def.com', 'www.def.com' but not from 'abcdef.com'
 - Handle cookie rules with starting dot correctly
 
-Behind the scenes
+### Behind the scenes
 - Add a subclass of QWebPluginFactory that can be used for managing QWebPlugin's
 - Add a static BrowserMainWindow::parentWindow(QWidget *) method that returns a main window being one of the passed widget's parents.
-- Move QTRY functions into their own header file as it has no dependency on Endorphin and can be used by tests that don't require BrowserApplication
+- Move QTRY functions into their own header file as it has no dependency on Arora and can be used by tests that don't require BrowserApplication
 - Mark strings as not translatable where it doesn't make sense
 - Move location bar site icon class into its own file
 - Move the privacy indicator out into its own class and file
@@ -366,27 +320,27 @@ Behind the scenes
 - Add WebPage::linkedResources(const QString&) method that returns a list of resources attached to the main document
 - BrowserApplication::mainWindow() returns the currently active window
 
-Build system
+#### Build system
 - Remove one second punishment because it didn't work and I didn't make autotests when I was punished
 - Add foreach() style error to look for and fix existing occurences.
 - When building by default don't have lrelase be verbose as it du/mps a lot of junk on the console
 - Add commit hook to do basic style checking on the files being commited
 - unset GIT_DIR to fix warnings that are printed to the console
-- When building Endorphin also don't allow casts to ascii to detect bugs.
-- Share compiled object files with the main endorphin binary to reduce build times
+- When building Arora also don't allow casts to ascii to detect bugs.
+- Share compiled object files with the main Arora binary to reduce build times
 
 
-0.6.1
-When using Endorphin with Qt 4.5.1 after a little while pages will stop rendering.
+## 0.6.1
+When using Arora with Qt 4.5.1 after a little while pages will stop rendering.
 This is because of a bug in 4.5.1 where renaming a file will cause the file
 descriptor to not be closed.  QNetworkDiskCache is a simple cache and uses
 QTemporaryFile's for each new cached file and eventually the kernel
 wont let QNetworkDiskCache open a cache file because all of the previous files were not
-closed.  When running against Qt 4.5.1 Endorphin will now disable the disk cache.
+closed.  When running against Qt 4.5.1 Arora will now disable the disk cache.
 
 
-0.6
-Interface
+## 0.6
+### Interface
 - Save more of the main window state, window's fullscreen status, maximized status, menu bar visibility, normal size, and ensure that the menu bar and status bar are returned to their proper states if saving while the window is fullscreen.
 - Open a downloaded file instead of the containing directory
 - Add check for the Oxygen style and switch to Plastique unless the user specifies oxygen on the command line
@@ -406,7 +360,7 @@ Interface
 - Allow to close the browser with more than one window opened, which was previously impossible (it might be useful when you restore session on startup).
 - Revert to the default tab selection behavior after closing a tab to match other browsers
 - Middle button role should be inverted when "Select tabs and windows as they created" is selected
-- Add support for MidClick/Ctrl-Click/Shift-Ctrl-Click to all urls in Endorphin.  Be it in menus, toolbars, links and javascript links.
+- Add support for MidClick/Ctrl-Click/Shift-Ctrl-Click to all urls in Arora.  Be it in menus, toolbars, links and javascript links.
 - Add support for XButton1 and XButton2 to be back/forward on the webview
 - Add the ability to turn pop-up blocking off
 - More control to the users! Added a possibility to control where target="_blank" links will be opened and default to a new tab.
@@ -428,18 +382,20 @@ Interface
 - Several spelling errors in the interface and code.
 
 
-Behind the scenes
--Upgrade the SearchLineEdit class
+### Behind the scenes
+#### Upgrade the SearchLineEdit class
  - Rather then using a QMenu use QCompleter now that LineEdit can let you set the text margin and the completer popup takes up the whole width.
  - Re-code searchlineedit to just be a LineEdit subclass that has a search button and a clear button and nothing more.
  - Re-code the SearchButton to use the QCompleter, take up less width when there isn't one and use a QImage.
  - Update the toolbar search widget to use the completer rather then the old QMenu
-- Significantly improve the startup time of Endorphin.
+
+#### Other improvementsv behind the scenes
+- Significantly improve the startup time of Arora.
 - Add new access functions to the DownloadItem data.
 - Move the ClearButton and SearchButton class into its own file
 - Fix searchbar for special chars such as '+'. This seems a bug in Qt's addQueryItem.  Workaround is to use addEncodedQueryItem.
 - delete the root bookmark node on exit to not generate errors in valgrind
-- fix memory leaks in the autotest to confirm that Endorphin's xbel doesn't have any leaks
+- fix memory leaks in the autotest to confirm that Arora's xbel doesn't have any leaks
 - Only clear the cookies if we have loaded them
 - In ModelMenu rather then all submenu's being QMenu let them be specified by the implementation and as the default use ModelMenu.
 - Add new menumodel manualtest
@@ -454,7 +410,7 @@ Behind the scenes
 - Remove executable bit from html not found file
 - Be more vigilant about always using encoded urls when storing them in QString
 
-Build system
+#### Build system
 - Ignore generated files on Windows
 - Add a common way to install binaries and install the tools
 - Add commit hook commit-msg with support for aspell to check the spelling of the commit message
@@ -465,8 +421,8 @@ Build system
 - Improve the build times of the manualtests by sharing object files and simplifying the includes
 
 
-0.5
-Interface
+## 0.5
+### Interface
 - Add new Network Access Monitor tool that shows each network request as it passes.
 - Added option for showing only one close Button
 - Don't add empty tabs if closed to recently closed tabs menu.
@@ -494,7 +450,7 @@ Interface
 - Refined drag & drop handling in bookmarks toolbar. Fixed a bug, when page was assigned to inappropriate folder due to more than one folder having same name.
 - Implement simple context menu in bookmarks toolbar. Let user change bookmark URL in Add Bookmark dialog.
 
-Behind the scenes
+### Behind the scenes
 - Brand new more compliant, faster cookie jar
 - Brand new Language Manager which selects the correct language on start and lets you choose a different language via the Help menu.
 - Separate the cookie classes into separate files.
@@ -503,23 +459,23 @@ Behind the scenes
 - The error web pages are now translatable.
 - Encode urls rather then use toString in various places to prevent loss of url data.
 - When using foreach try to use a const reference so a copy isn't made (slower) compared to the reference (faster).
-- Add a new tool to convert bookmarks that are in the html format into the XBel format (not used in Endorphin yet).
+- Add a new tool to convert bookmarks that are in the html format into the XBel format (not used in Arora yet).
 - Various code style and general keeping the code clean fixes
 - Add Implementation to get the current username on Windows for the single application
 
-Build system
+#### Build system
 - Add script to build OS X package using the new macdeployqt tool in Qt 4.5
 - Building with QT_STRICT_ITERATORS to catch errors.
 - Enhance support for building with multiple WebKit trunk branches
 - Adds the ability to generate code documentation with doxygen
 
-0.4
-Interface
+## 0.4
+### Interface
 - New source viewer with search and syntax highlighting.
 - Make middle click on bookmarks menus open the user in a new tab.
 - Added the ability to change the language from the Help menu.
 - Double left click location bar selects all of the text.
-- Incorporate Jens Explorer style into Endorphin on Window for a better look and feel on XP and Vista. http://labs.trolltech.com/blogs/2007/06/08/explorer-style-toolbars/
+- Incorporate Jens Explorer style into Arora on Window for a better look and feel on XP and Vista. http://labs.trolltech.com/blogs/2007/06/08/explorer-style-toolbars/
 - Change the "icon" on the next/prev search for RTL desktops: next points to the right, and previous points to the right
 - Various RightToLeft fixes for for Mozilla's bug https://bugzilla.mozilla.org/show_bug.cgi?id=219070
 - When the url scheme is https make the location bar background turn yellow.
@@ -531,20 +487,21 @@ Interface
 - When dropping text on the webpage load the url
 - When the location bar has focus don't change the text.
 
-Behind the scenes
+### Behind the scenes
 - Make a dedicated SingleApplication class
 - Tweak HistoryManager API to be easier to read.
 - Improvements to the code style to be more consistent
 - Move the binaries for autotests and manual tests into the .gitignore in that directory rather then all in one file at the top.
 - Update manualtest for the location bar now that the urllineedit class has become the new location bar class and add a new git hook to make sure manual tests build.
 
-Build system
+### Build system
 - Move locale build instructions to its own pri file in the locale directory
 - Correctly detect qt3's qmake on Debian
 - Enhance support for building with WebKit trunk
 
 
-0.3
+## 0.3
+### Interface
 - With Qt 4.5 use movable tabs
 - With Qt 4.5 use disk cache
 - Created a new LineEdit that handles adding side widgets in a clean, simple and elegant way.
@@ -566,23 +523,23 @@ Build system
 - Improve a number of the strings (feedback from MentalMaelstrom)
 - Tweak action accelerators (the same ones were being used)
 
-Build system
-- Allow building Endorphin with both Debug/Release of WebKit trunk
+### Build system
+- Allow building Arora with both Debug/Release of WebKit trunk
 - Only include the sha1 and change number in the version when using git.
-- Create utils directory to contain non-Endorphin specific classes
+- Create utils directory to contain non-Arora specific classes
 - Run desktop file through desktop-file-validate and correct the errors
 
-Autotests
+#### Autotests
 - Add QTRY_COMPARE and QTRY_VERIFY for the autotests to use.
-- add AUTOTESTS define when running autotests to prevent accessing running endorphin's and sending url's to it
-- Fix autotest failures (test related, not endorphin)
+- add AUTOTESTS define when running autotests to prevent accessing running Arora's and sending url's to it
+- Fix autotest failures (test related, not Arora)
 - Detect which version of qmake to use when building the autotests
 - Give a 1 second punishment if there is no autotest for the source file that was changed
 - Emit a warning of a file doesn't have a matching autotest
 - Update modeltest code to match Trolltech's svn
 
 
-0.2
+## 0.2
  - Many Bug fixes and improvements.
  - Add make install on unix
  - Improved tabs
@@ -590,6 +547,6 @@ Autotests
  - New reset dialog
  - New about dialog
  - Add search banner
- - Rename to Endorphin and a new application icon
+ - Rename to Arora and a new application icon
  - Project specific git hooks
  - Branch from the Qt demo browser with new autotests and manualtests
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 00000000..69eda065
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,55 @@
+## Changelog
+
+## 0.13.0
+
+The first official Endorphin release. Contains many new features, a new engine, and bug fixes.
+**Not released yet.**
+
+### Fixed issues
+- endorphin-placesimport sometimes resulted in an "Invalid cross-device link" error.
+
+### Behind the scene
+- Port to CMake
+- Update the Engine from WebKit to WebEngine
+
+### Other
+- Remove ClickToFlash: Flash is no longer supported
+- Prepare for Qt6
+
+## 0.12.1
+
+This release contained some small changes to 0.12.0.
+
+### Interface
+- Add note about this being an inofficial fork
+- Update included user agents
+- Improve placeholder text of the searchbox on the front page
+
+### Fixed issues
+     Fix language fallback
+
+## 0.12.0
+
+An update that contains all changes that were made to Arora after 0.11.0, and QT5 support.
+
+### Interface
+- Show the number of downloads in the download manager dialog title
+    
+### Fixed issues
+- When the 'delete' button is pressed, the downloaded item count was not updated.
+- Issue: 912: Autofill manager was always storing forms.
+- Issue: 915: Fixed ssl certificate problem with sites like https://webmail.us.army.mil:
+        By default QSSLConfiguration was only accepting SSLv3 while we want to
+        accept all of them.
+- Issue: 918: "Autofill webforms" in Preferences was always checked.
+- Issue: 931: Fix for fullscreen on Mac
+- Issue: 957: Workaround for a bug in QCompleter
+    
+### Behind the scene
+- Support persistent data storage (HTML5 localStorage)
+- Update to QT5 & latest WebKit
+- Update some internal pages to HTML5
+- Code cleanup
+
+### Other
+- Remove OS2 support
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2f1c34a3..ebc041f7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,12 @@
 project(Endorphin)
 cmake_minimum_required(VERSION 3.16)
+include(CTest)
+include(definitions.cmake)
+include(src/bookmarks/xbel/libxbel.cmake)
+include(endorphinbase.cmake)
+if(BUILD_TESTING)
+    add_subdirectory(autotests)
+endif()
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
diff --git a/GPLHEADER b/GPLHEADER
index b932cb3d..9b16c98c 100644
--- a/GPLHEADER
+++ b/GPLHEADER
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008  Name <email@domain.com>
+ * Copyright 2020  Name <email@domain.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 00000000..4ef1e630
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,351 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
+
+-------------------------------------------------------------------------
+
+In addition, as a special exception, permission is given to link the
+code of its release with the OpenSSL project's "OpenSSL" library (or
+modified versions of it that use the same license as the "OpenSSL"
+library), and distribute the linked executables. You must comply with the GNU
+General Public License version 2 or the GNU General Public License version 3
+in all respects for all of the code used other than the "OpenSSL" code.  If
+you modify this file, you may extend this exception to your version of the
+file, but you are not obligated to do so.  If you do not wish to do so,
+delete this exception statement from your version of this file.
\ No newline at end of file
diff --git a/README.md b/README.md
index 88a4f7d2..df7ce330 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,12 @@
 Endorphin is a cross platform web browser built using Qt and WebKit.
 
 This is a fork of the [Arora browser](https://github.com/Arora/arora).
-This fork was created by Aaron Dewes.
+This fork was created by Aaron Dewes with the goal of contnuing the development of this old browser and further improving it.
 
-## Contributing
+### Contributing
 
 If you want to contribute, feel free to open an issue or a PR.
 
-
 ### Building
-Endorphin uses the cmake build system.  If you already have Qt 5.14 or newer on your system building is as easy as running the command 'cmake' and then 'make'.
+Endorphin uses the cmake build system.  If you already have Qt 5.15 or newer on your system building is as easy as running the command 'cmake' and then 'make'.
 For more detailed information see the [Building guide](BUILDING.md).
diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
new file mode 100644
index 00000000..c981becf
--- /dev/null
+++ b/autotests/CMakeLists.txt
@@ -0,0 +1,19 @@
+project(autotests)
+add_subdirectory(addbookmarkdialog)
+add_subdirectory(autosaver)
+add_subdirectory(bookmarknode)
+#add_subdirectory(downloadmanager)
+add_subdirectory(historyfiltermodel)
+add_subdirectory(historymanager)
+add_subdirectory(modeltoolbar)
+add_subdirectory(opensearchengine)
+add_subdirectory(opensearchmanager)
+add_subdirectory(opensearchreader)
+add_subdirectory(opensearchwriter)
+add_subdirectory(searchlineedit)
+add_subdirectory(tabbar)
+add_subdirectory(tabwidget)
+add_subdirectory(utils)
+add_subdirectory(webactionmapper)
+#add_subdirectory(webpage)
+add_subdirectory(xbel)
\ No newline at end of file
diff --git a/autotests/adblock/adblock.pro b/autotests/adblock/adblock.pro
deleted file mode 100644
index e00136d1..00000000
--- a/autotests/adblock/adblock.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS  = \
-    adblockmanager \
-    adblocknetwork \
-    adblockpage \
-    adblockrule \
-    adblocksubscription
-
-CONFIG += ordered
diff --git a/autotests/adblock/adblockmanager/.gitignore b/autotests/adblock/adblockmanager/.gitignore
deleted file mode 100644
index 956108dc..00000000
--- a/autotests/adblock/adblockmanager/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-adblockmanager
diff --git a/autotests/adblock/adblockmanager/adblockmanager.pro b/autotests/adblock/adblockmanager/adblockmanager.pro
deleted file mode 100644
index 025c3a5a..00000000
--- a/autotests/adblock/adblockmanager/adblockmanager.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../autotests.pri)
-
-# Input
-SOURCES += tst_adblockmanager.cpp
-HEADERS +=
diff --git a/autotests/adblock/adblockmanager/tst_adblockmanager.cpp b/autotests/adblock/adblockmanager/tst_adblockmanager.cpp
deleted file mode 100644
index 658b9f6f..00000000
--- a/autotests/adblock/adblockmanager/tst_adblockmanager.cpp
+++ /dev/null
@@ -1,240 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <qtry.h>
-
-#include "adblockdialog.h"
-#include "adblockmanager.h"
-#include "adblocksubscription.h"
-
-#include <qdebug.h>
-#include <QSignalSpy>
-#include <QTest>
-#include <QUrl>
-
-
-class tst_AdBlockManager : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
-    void adblockmanager_data();
-    void adblockmanager();
-
-    void addSubscription();
-    void customRules();
-    void isEnabled_data();
-    void isEnabled();
-    void load();
-    void removeSubscription();
-    void showDialog();
-    void rulesChanged();
-};
-
-// Subclass that exposes the protected functions.
-class SubAdBlockManager : public AdBlockManager
-{
-public:
-    ~SubAdBlockManager() {
-        QList<AdBlockSubscription*> list = subscriptions();
-        foreach (AdBlockSubscription *s, list)
-            removeSubscription(s);
-        setEnabled(false);
-    }
-
-    void call_rulesChanged()
-        { return SubAdBlockManager::rulesChanged(); }
-};
-
-// This will be called before the first test function is executed.
-// It is only called once.
-void tst_AdBlockManager::initTestCase()
-{
-}
-
-// This will be called after the last test function is executed.
-// It is only called once.
-void tst_AdBlockManager::cleanupTestCase()
-{
-}
-
-// This will be called before each test function is executed.
-void tst_AdBlockManager::init()
-{
-}
-
-// This will be called after every test function.
-void tst_AdBlockManager::cleanup()
-{
-}
-
-void tst_AdBlockManager::adblockmanager_data()
-{
-}
-
-void tst_AdBlockManager::adblockmanager()
-{
-    SubAdBlockManager manager;
-    manager.addSubscription((AdBlockSubscription*)0);
-    QVERIFY(manager.customRules());
-    QVERIFY(manager.instance() != (AdBlockManager*)0);
-    QCOMPARE(manager.isEnabled(), true);
-    manager.load();
-    QVERIFY(manager.network());
-    QVERIFY(manager.page());
-    manager.removeSubscription((AdBlockSubscription*)0);
-    manager.setEnabled(false);
-    QVERIFY(manager.showDialog());
-    QList<AdBlockSubscription*> list;
-    list.append(manager.customRules());
-    QCOMPARE(manager.subscriptions(), list);
-}
-
-// public void addSubscription(AdBlockSubscription *subscription)
-void tst_AdBlockManager::addSubscription()
-{
-    SubAdBlockManager manager;
-
-    QList<AdBlockSubscription*> list = manager.subscriptions();
-
-    QSignalSpy spy0(&manager, SIGNAL(rulesChanged()));
-
-    AdBlockSubscription *subscription = new AdBlockSubscription(QUrl(), &manager);
-    manager.addSubscription(subscription);
-    QCOMPARE(manager.subscriptions(), (list += subscription));
-
-    QCOMPARE(spy0.count(), 1);
-}
-
-// public AdBlockSubscription *customRules()
-void tst_AdBlockManager::customRules()
-{
-    SubAdBlockManager manager;
-    QSignalSpy spy0(&manager, SIGNAL(rulesChanged()));
-
-    AdBlockSubscription *subscription = manager.customRules();
-    QVERIFY(subscription);
-    QVERIFY(!subscription->title().isEmpty());
-    QVERIFY(subscription->allRules().isEmpty());
-
-    QCOMPARE(spy0.count(), 1);
-
-    subscription = manager.customRules();
-    QCOMPARE(spy0.count(), 1);
-}
-
-void tst_AdBlockManager::isEnabled_data()
-{
-    QTest::addColumn<bool>("isEnabled");
-    QTest::newRow("true") << true;
-    QTest::newRow("false") << false;
-}
-
-// public bool isEnabled() const
-void tst_AdBlockManager::isEnabled()
-{
-    QFETCH(bool, isEnabled);
-
-    SubAdBlockManager manager;
-
-    QSignalSpy spy0(&manager, SIGNAL(rulesChanged()));
-
-    bool before = manager.isEnabled();
-
-    manager.setEnabled(isEnabled);
-    manager.setEnabled(isEnabled);
-    QCOMPARE(manager.isEnabled(), isEnabled);
-
-    QCOMPARE(spy0.count(), before == isEnabled ? 0 : 1);
-}
-
-// public void load()
-void tst_AdBlockManager::load()
-{
-    SubAdBlockManager manager;
-
-    QSignalSpy spy0(&manager, SIGNAL(rulesChanged()));
-
-    manager.load();
-
-    QCOMPARE(spy0.count(), 0);
-}
-
-// public void removeSubscription(AdBlockSubscription *subscription)
-void tst_AdBlockManager::removeSubscription()
-{
-    SubAdBlockManager manager;
-
-    QSignalSpy spy0(&manager, SIGNAL(rulesChanged()));
-
-    QList<AdBlockSubscription*> list = manager.subscriptions();
-    AdBlockSubscription *subscription = new AdBlockSubscription(QUrl(), &manager);
-    manager.addSubscription(subscription);
-    manager.removeSubscription(subscription);
-    QCOMPARE(manager.subscriptions(), list);
-
-    QCOMPARE(spy0.count(), 2);
-}
-
-
-// public AdBlockDialog *showDialog()
-void tst_AdBlockManager::showDialog()
-{
-    SubAdBlockManager manager;
-
-    QSignalSpy spy0(&manager, SIGNAL(rulesChanged()));
-
-    AdBlockDialog *dialog = manager.showDialog();
-    QVERIFY(dialog);
-    QTRY_VERIFY(dialog->isVisible());
-}
-
-void tst_AdBlockManager::rulesChanged()
-{
-    SubAdBlockManager manager;
-
-    QSignalSpy spy0(&manager, SIGNAL(rulesChanged()));
-
-
-    AdBlockSubscription *subscription = new AdBlockSubscription(QUrl(), &manager);
-    manager.addSubscription(subscription);
-    subscription->setEnabled(true);
-    subscription->addRule(AdBlockRule());
-
-    QCOMPARE(spy0.count(), 3);
-}
-
-QTEST_MAIN(tst_AdBlockManager)
-#include "tst_adblockmanager.moc"
-
diff --git a/autotests/adblock/adblocknetwork/.gitignore b/autotests/adblock/adblocknetwork/.gitignore
deleted file mode 100644
index dcb473fd..00000000
--- a/autotests/adblock/adblocknetwork/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-adblocknetwork
diff --git a/autotests/adblock/adblocknetwork/adblocknetwork.pro b/autotests/adblock/adblocknetwork/adblocknetwork.pro
deleted file mode 100644
index 2ae14cc2..00000000
--- a/autotests/adblock/adblocknetwork/adblocknetwork.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../autotests.pri)
-
-# Input
-SOURCES += tst_adblocknetwork.cpp
-HEADERS +=
diff --git a/autotests/adblock/adblocknetwork/tst_adblocknetwork.cpp b/autotests/adblock/adblocknetwork/tst_adblocknetwork.cpp
deleted file mode 100644
index 9ade541f..00000000
--- a/autotests/adblock/adblocknetwork/tst_adblocknetwork.cpp
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <qtest.h>
-
-#include "adblocknetwork.h"
-#include "adblockmanager.h"
-#include "adblocksubscription.h"
-#include "adblockrule.h"
-
-#include <qnetworkrequest.h>
-
-class tst_AdBlockNetwork : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
-    void adblocknetwork_data();
-    void adblocknetwork();
-
-    void data();
-
-    void enabled_data();
-    void enabled();
-
-    void block_data();
-    void block();
-};
-
-// Subclass that exposes the protected functions.
-class SubAdBlockNetwork : public AdBlockNetwork
-{
-public:
-
-};
-
-// This will be called before the first test function is executed.
-// It is only called once.
-void tst_AdBlockNetwork::initTestCase()
-{
-}
-
-// This will be called after the last test function is executed.
-// It is only called once.
-void tst_AdBlockNetwork::cleanupTestCase()
-{
-}
-
-// This will be called before each test function is executed.
-void tst_AdBlockNetwork::init()
-{
-}
-
-// This will be called after every test function.
-void tst_AdBlockNetwork::cleanup()
-{
-    AdBlockManager *manager = AdBlockManager::instance();
-    QList<AdBlockSubscription*> list = manager->subscriptions();
-    foreach (AdBlockSubscription *s, list)
-        manager->removeSubscription(s);
-}
-
-void tst_AdBlockNetwork::adblocknetwork_data()
-{
-}
-
-void tst_AdBlockNetwork::adblocknetwork()
-{
-    SubAdBlockNetwork network;
-    QCOMPARE(network.block(QNetworkRequest()), (QNetworkReply*)0);
-}
-
-void tst_AdBlockNetwork::data()
-{
-    SubAdBlockNetwork network;
-
-    AdBlockManager *manager = AdBlockManager::instance();
-    manager->setEnabled(true);
-
-    AdBlockSubscription *subscription = new AdBlockSubscription(QUrl(), manager);
-    subscription->setEnabled(true);
-    manager->addSubscription(subscription);
-
-    AdBlockRule rule("/");
-    rule.setEnabled(true);
-    subscription->addRule(rule);
-
-    QNetworkReply *reply = 0;
-    QNetworkRequest request = QNetworkRequest(QUrl("data://foobar"));
-
-    reply = network.block(request);
-    QVERIFY(!reply);
-}
-
-void tst_AdBlockNetwork::enabled_data()
-{
-    QTest::addColumn<bool>("enableManager");
-    QTest::addColumn<bool>("enableSubscription");
-    QTest::addColumn<bool>("enableRule");
-    QTest::addColumn<bool>("block");
-    QTest::newRow("null") << true << true << true << true;
-    QTest::newRow("m") << false << true << true << false;
-    QTest::newRow("s") << true << false << true << false;
-    QTest::newRow("r") << true << true << false << false;
-}
-
-void tst_AdBlockNetwork::enabled()
-{
-    QFETCH(bool, enableManager);
-    QFETCH(bool, enableSubscription);
-    QFETCH(bool, enableRule);
-    QFETCH(bool, block);
-
-    SubAdBlockNetwork network;
-
-    AdBlockManager *manager = AdBlockManager::instance();
-    manager->setEnabled(enableManager);
-
-    AdBlockSubscription *subscription = new AdBlockSubscription(QUrl(), manager);
-    subscription->setEnabled(enableSubscription);
-    manager->addSubscription(subscription);
-
-    AdBlockRule rule("/");
-    rule.setEnabled(enableRule);
-    subscription->addRule(rule);
-
-    QNetworkReply *reply = 0;
-    QNetworkRequest grequest = QNetworkRequest(QUrl("http://www.google.com"));
-
-    reply = network.block(grequest);
-    QCOMPARE((reply != 0), block);
-}
-
-// check that block block and !block blocks other sites
-void tst_AdBlockNetwork::block_data()
-{
-    QTest::addColumn<QString>("ruleList");
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<bool>("block");
-
-    QTest::newRow("null") << QString()
-                          << QUrl()
-                          << false;
-
-    QUrl google("http://www.google.com");
-    QTest::newRow("google") << QString("/")
-                          << google
-                          << true;
-
-    // defining exception rules
-    QTest::newRow("exception0") << QString("@@advice,advice")
-                                << QUrl("http://example.com/advice.html")
-                                << false;
-    QTest::newRow("exception1") << QString("@@|http://example.com")
-                                << QUrl("http://example.com/advice.html")
-                                << false;
-    QTest::newRow("exception2") << QString("@@http://example.com")
-                                << QUrl("http://example.com/advice.html")
-                                << false;
-
-    QTest::newRow("order0") << QString("advice,@@advice")
-                            << QUrl("http://example.com/advice.html")
-                            << false;
-}
-
-// public QNetworkReply *block(QNetworkRequest const &request)
-void tst_AdBlockNetwork::block()
-{
-    QFETCH(QString, ruleList);
-    QFETCH(QUrl, url);
-    QFETCH(bool, block);
-
-    SubAdBlockNetwork network;
-
-    AdBlockManager *manager = AdBlockManager::instance();
-    manager->setEnabled(true);
-
-    AdBlockSubscription *subscription = new AdBlockSubscription(QUrl(), manager);
-    subscription->setEnabled(true);
-    manager->addSubscription(subscription);
-
-    QStringList rules = ruleList.split(",");
-    foreach (const QString &rule, rules)
-        subscription->addRule(AdBlockRule(rule));
-
-    QNetworkReply *reply = network.block(QNetworkRequest(url));
-    bool blocked = (reply != 0);
-    QCOMPARE(blocked, block);
-}
-
-QTEST_MAIN(tst_AdBlockNetwork)
-#include "tst_adblocknetwork.moc"
-
diff --git a/autotests/adblock/adblockpage/.gitignore b/autotests/adblock/adblockpage/.gitignore
deleted file mode 100644
index ed880152..00000000
--- a/autotests/adblock/adblockpage/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-adblockpage
diff --git a/autotests/adblock/adblockpage/adblockpage.pro b/autotests/adblock/adblockpage/adblockpage.pro
deleted file mode 100644
index a6a6b207..00000000
--- a/autotests/adblock/adblockpage/adblockpage.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../autotests.pri)
-
-# Input
-SOURCES += tst_adblockpage.cpp
-HEADERS +=
diff --git a/autotests/adblock/adblockpage/test.html b/autotests/adblock/adblockpage/test.html
deleted file mode 100644
index 39cb99d1..00000000
--- a/autotests/adblock/adblockpage/test.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
-<div class="textad">Cheapest tofu, only here and now!</div>
-<div id="sponsorad">Really cheap tofu, click here!</div>
-<textad>Only here you get the best tofu!</textad>
-<table width=80%><tr><td>tofu!</tr></td></table>
-<div title="adv">Cheapest tofu, only here and now!</div>
-<div title="advert">Cheapest tofu, only here and now!</div>
-<table width=80% bgcolor=white><tr><td>tofu!</tr></td></table>
diff --git a/autotests/adblock/adblockpage/tst_adblockpage.cpp b/autotests/adblock/adblockpage/tst_adblockpage.cpp
deleted file mode 100644
index a8071830..00000000
--- a/autotests/adblock/adblockpage/tst_adblockpage.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <qtest.h>
-#include <qsignalspy.h>
-#include <qtry.h>
-
-#include "adblockpage.h"
-
-#include "adblockmanager.h"
-#include "adblocksubscription.h"
-#include "adblockrule.h"
-
-#include <qwebview.h>
-#include <qwebframe.h>
-#include <qdebug.h>
-#include <qdir.h>
-
-class tst_AdBlockPage : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
-    void adblockpage_data();
-    void adblockpage();
-
-    void applyRulesToPage_data();
-    void applyRulesToPage();
-};
-
-// Subclass that exposes the protected functions.
-class SubAdBlockPage : public AdBlockPage
-{
-public:
-
-};
-
-// This will be called before the first test function is executed.
-// It is only called once.
-void tst_AdBlockPage::initTestCase()
-{
-}
-
-// This will be called after the last test function is executed.
-// It is only called once.
-void tst_AdBlockPage::cleanupTestCase()
-{
-}
-
-// This will be called before each test function is executed.
-void tst_AdBlockPage::init()
-{
-}
-
-// This will be called after every test function.
-void tst_AdBlockPage::cleanup()
-{
-    AdBlockManager *manager = AdBlockManager::instance();
-    QList<AdBlockSubscription*> list = manager->subscriptions();
-    foreach (AdBlockSubscription *s, list)
-        manager->removeSubscription(s);
-}
-
-void tst_AdBlockPage::adblockpage_data()
-{
-}
-
-void tst_AdBlockPage::adblockpage()
-{
-    SubAdBlockPage page;
-    page.applyRulesToPage((QWebPage*)0);
-}
-
-void tst_AdBlockPage::applyRulesToPage_data()
-{
-    QTest::addColumn<QString>("ruleList");
-    QTest::addColumn<int>("count");
-
-    int start = 7;
-    QTest::newRow("null") << QString() << start;
-
-    //Examples taken from http://adblockplus.org/en/filters
-
-    QTest::newRow("basic-0") << QString("##div.textad") << start - 1;
-    QTest::newRow("basic-1") << QString("##div#sponsorad") << start - 1;
-    QTest::newRow("basic-2") << QString("##*#sponsorad") << start - 1;
-    QTest::newRow("basic-3") << QString("##textad") << start -1;
-
-    // Attribute selectors
-    QTest::newRow("attribute-0") << QString("##table[width=\"80%\"]") << start - 2;
-    QTest::newRow("attribute-1") << QString("##table[width=\"80%\"][bgcolor=\"white\"]") << start - 1;
-    QTest::newRow("attribute-2") << QString("##div[title*=\"adv\"]") << start - 2;
-    QTest::newRow("attribute-3") << QString("##div[title^=\"adv\"][title$=\"ert\"]") << start - 1;
-
-    // Advanced selectors
-}
-
-// public void applyRulesToPage(QWebPage *page)
-void tst_AdBlockPage::applyRulesToPage()
-{
-    QFETCH(QString, ruleList);
-    QFETCH(int, count);
-
-    AdBlockManager *manager = AdBlockManager::instance();
-    manager->setEnabled(true);
-
-    AdBlockSubscription *subscription = new AdBlockSubscription(QUrl(), manager);
-    subscription->setEnabled(true);
-    manager->addSubscription(subscription);
-
-    QStringList rules = ruleList.split(",");
-    foreach (const QString &rule, rules)
-        subscription->addRule(AdBlockRule(rule));
-
-    QWebView view;
-    QSignalSpy spy1(view.page(), SIGNAL(loadFinished(bool)));
-    view.load(QUrl::fromLocalFile(QDir::currentPath() + "/test.html"));
-    QTRY_COMPARE(spy1.count(), 1);
-
-    SubAdBlockPage page;
-    page.applyRulesToPage(view.page());
-    if (view.page()->mainFrame()->toHtml().count("tofu") != count)
-        qDebug() << view.page()->mainFrame()->toHtml();
-    QCOMPARE(view.page()->mainFrame()->toHtml().count("tofu"), count);
-}
-
-QTEST_MAIN(tst_AdBlockPage)
-#include "tst_adblockpage.moc"
-
diff --git a/autotests/adblock/adblockrule/.gitignore b/autotests/adblock/adblockrule/.gitignore
deleted file mode 100644
index 3b9e3229..00000000
--- a/autotests/adblock/adblockrule/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-adblockrule
diff --git a/autotests/adblock/adblockrule/adblockrule.pro b/autotests/adblock/adblockrule/adblockrule.pro
deleted file mode 100644
index 52435394..00000000
--- a/autotests/adblock/adblockrule/adblockrule.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../autotests.pri)
-
-# Input
-SOURCES += tst_adblockrule.cpp
-HEADERS +=
diff --git a/autotests/adblock/adblockrule/tst_adblockrule.cpp b/autotests/adblock/adblockrule/tst_adblockrule.cpp
deleted file mode 100644
index 25896c2a..00000000
--- a/autotests/adblock/adblockrule/tst_adblockrule.cpp
+++ /dev/null
@@ -1,385 +0,0 @@
-/*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
- * Copyright 2009 Zsombor Gegesy <gzsombor@gmail.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qtest.h>
-
-#include "adblockrule.h"
-
-#include <qbuffer.h>
-#include <qdebug.h>
-
-class tst_AdBlockRule : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
-    void regexpCreation_data();
-    void regexpCreation();
-    void networkMatch_data();
-    void networkMatch();
-
-};
-
-// Subclass that exposes the protected functions.
-class SubAdBlockRule : public AdBlockRule
-{
-public:
-    SubAdBlockRule(const QString &filter);
-};
-
-SubAdBlockRule::SubAdBlockRule(const QString &filter)
-    : AdBlockRule(filter)
-{
-}
-
-// This will be called before the first test function is executed.
-// It is only called once.
-void tst_AdBlockRule::initTestCase()
-{
-}
-
-// This will be called after the last test function is executed.
-// It is only called once.
-void tst_AdBlockRule::cleanupTestCase()
-{
-}
-
-// This will be called before each test function is executed.
-void tst_AdBlockRule::init()
-{
-}
-
-// This will be called after every test function.
-void tst_AdBlockRule::cleanup()
-{
-}
-
-void tst_AdBlockRule::networkMatch_data()
-{
-    QTest::addColumn<QString>("filter");
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<bool>("networkMatch");
-    QTest::newRow("null") << QString() << QUrl() << false;
-
-    //Examples taken from http://adblockplus.org/en/filters
-
-    // Basic filter rules
-    QTest::newRow("basic0") << QString("http://example.com/ads/banner123.gif")
-                            << QUrl("http://example.com/ads/banner123.gif")
-                            << true;
-    QTest::newRow("basic1") << QString("http://example.com/ads/banner*.gif")
-                            << QUrl("http://example.com/ads/banner123.gif")
-                            << true;
-    QTest::newRow("basic2") << QString("http://example.com/ads/*")
-                            << QUrl("http://example.com/ads/banner123.gif")
-                            << true;
-    QTest::newRow("basic3") << QString("http://example.com/*")
-                            << QUrl("http://example.com/ads/banner123.gif")
-                            << true;
-
-    // defining exception rules
-    QTest::newRow("exception0") << QString("@@advice")
-                                << QUrl("http://example.com/advice.html")
-                                << true;
-    QTest::newRow("exception1") << QString("@@|http://example.com")
-                                << QUrl("http://example.com/advice.html")
-                                << true;
-    QTest::newRow("exception2") << QString("@@http://example.com")
-                                << QUrl("http://example.com/advice.html")
-                                << true;
-
-    // matching at beginning/end of an address
-    QTest::newRow("m0") << QString("ad")
-                        << QUrl("http://example.com/advice.html")
-                        << true;
-    QTest::newRow("m1") << QString("*ad*")
-                        << QUrl("http://example.com/advice.html")
-                        << true;
-    QTest::newRow("m2") << QString("swf")
-                        << QUrl("http://example.com/swf/index.html")
-                        << true;
-    QTest::newRow("m3") << QString("swf|")
-                    << QUrl("http://example.com/annoyingflash.swf")
-                    << true;
-    QTest::newRow("m4") << QString("swf|")
-                    << QUrl("http://example.com/swf/index.html")
-                    << false;
-
-    QTest::newRow("m5") << QString("http://baddomain.example/")
-                    << QUrl("http://baddomain.example/banner.gif")
-                    << true;
-    QTest::newRow("m6") << QString("http://baddomain.example/")
-                    << QUrl("http://gooddomain.example/analyze?http://baddomain.example.")
-                    << false;
-
-    QTest::newRow("m7") << QString("||example.com/banner.gif")
-                    << QUrl("http://example.com/banner.gif")
-                    << true;
-    QTest::newRow("m8") << QString("||example.com/banner.gif")
-                    << QUrl("https://example.com/banner.gif")
-                    << true;
-    QTest::newRow("m9") << QString("||example.com/banner.gif")
-                    << QUrl("http://www.example.com/banner.gif")
-                    << true;
-
-    QTest::newRow("m10") << QString("||example.com/banner.gif")
-                    << QUrl("http://badexample.com/banner.gif")
-                    << false;
-    QTest::newRow("m10") << QString("||example.com/banner.gif")
-                    << QUrl("http://gooddomain.example/analyze?http://example.com/banner.gif")
-                    << false;
-
-    QTest::newRow("m11") << QString("/getad.php|")
-                    << QUrl("http://adblockplus.mozdev.org/easylist/easylist.txt")
-                    << false;
-
-    // Matching separators
-    QTest::newRow("sep_1") << QString("a^")
-                         << QUrl("a/")
-                         << true;
-    QTest::newRow("sep_2") << QString("a^")
-                         << QUrl("a:")
-                         << true;
-    QTest::newRow("sep_3") << QString("a^")
-                         << QUrl("a.")
-                         << false;
-    QTest::newRow("sep_4") << QString("a^")
-                         << QUrl("a?")
-                         << true;
-    QTest::newRow("sep_5") << QString("a^")
-                         << QUrl("a=")
-                         << true;
-    QTest::newRow("sep_6") << QString("a^")
-                         << QUrl("a&")
-                         << true;
-
-    QTest::newRow("s1_s") << QString("com^")
-                         << QUrl("com:")
-                         << true;
-    QTest::newRow("s2_s") << QString("ab^cd")
-                         << QUrl("ab.cd")
-                         << false;
-
-    // Marking separate characters
-    QTest::newRow("s0") << QString("http://example.com^")
-                         << QUrl("http://example.com/")
-                         << true;
-    QTest::newRow("s1") << QString("http://example.com^")
-                         << QUrl("http://example.com:8000/")
-                         << true;
-    QTest::newRow("s2") << QString("http://example.com^")
-                         << QUrl("http://example.com.ar/")
-                         << false;
-    QTest::newRow("s3") << QString("^example.com^")
-                         << QUrl("http://example.com:8000/foo.bar?a=12&b=%D1%82%D0%B5%D1%81%D1%82")
-                         << true;
-    QTest::newRow("s4") << QString("^%D1^")
-                         << QUrl::fromEncoded("http://example.com:8000/foo.bar?a=12&b=%D1")
-                         << true;
-    QTest::newRow("s5") << QString("^foo.bar^")
-                         << QUrl("http://example.com:8000/foo.bar?a=12&b=%D1%82%D0%B5%D1%81%D1%82")
-                         << true;
-    QTest::newRow("s6") << QString("^%D1%82%D0%B5%D1%81%D1%82^")
-                         << QUrl::fromEncoded("http://example.com:8000/foo.bar?a=12&b=%D1%82%D0%B5%D1%81%D1%82")
-                         << true;
-    // Comments
-    QTest::newRow("c0") << QString("!foo.bar")
-                        << QUrl("!foo.bar")
-                        << false;
-    QTest::newRow("c1") << QString("!foo.bar")
-                        << QUrl("foo.bar")
-                        << false;
-
-    // Specifying filter options
-    // type
-    QTest::newRow("o0") << QString("*/ads/*$script,image,background,stylesheet,object,xbl,ping,xmlhttprequest,object-subrequest,object-subrequest,dtd,subdocument,document,other")
-                        << QUrl("foo.bar/ads/foo.jpg")
-                        << false;
-    // Inverse type
-    QTest::newRow("o1") << QString("*/ads/*$~script, ~image, ~background, ~stylesheet, ~object, ~xbl, ~ping, ~xmlhttprequest, ~object-subrequest, ~dtd, ~subdocument, ~document, ~other")
-                        << QUrl("foo.bar/ads/foo.jpg")
-                        << false;
-    // Restriction to third-party/first-party requests
-    QTest::newRow("o2") << QString("*/ads/*$third-party")
-                        << QUrl("foo.bar/ads/foo.jpg")
-                        << false;
-    QTest::newRow("o3") << QString("*/ads/*$first-party")
-                        << QUrl("foo.bar/ads/foo.jpg")
-                        << false;
-    // Domain restrictions
-    QTest::newRow("o4") << QString("*/ads/*$domain=example.com|example.net")
-                        << QUrl("http://example.com/ads/foo.jpg")
-                        << true;
-    QTest::newRow("o5") << QString("*/ads/*$domain=example.com")
-                        << QUrl("http://foo.com/ads/foo.jpg")
-                        << false;
-
-    QTest::newRow("o6") << QString("*/ads/*$domain=~example.com")
-                        << QUrl("http://foo.com/ads/foo.jpg")
-                        << true;
-    QTest::newRow("o7") << QString("*/ads/*$domain=~example.com")
-                        << QUrl("http://example.com/ads/foo.jpg")
-                        << false;
-    QTest::newRow("o8") << QString("*/ads/*$domain=example.com|~foo.example.com")
-                        << QUrl("http://example.com/ads/foo.jpg")
-                        << true;
-    QTest::newRow("o9") << QString("*/ads/*$domain=example.com|~foo.example.com")
-                        << QUrl("http://foo.example.com/ads/foo.jpg")
-                        << false;
-    QTest::newRow("o10") << QString("*/ads/*$domain=example.com|~foo.example.com")
-                        << QUrl("http://bar.example.com/ads/foo.jpg")
-                        << true;
-    // match-case
-    QTest::newRow("o11") << QString("*/BannerAd.gif$match-case")
-                         << QUrl("http://example.com/BannerAd.gif")
-                         << true;
-    QTest::newRow("o12") << QString("*/BannerAd.gif$match-case")
-                         << QUrl("http://example.com/bannerad.gif")
-                         << false;
-    // collapse
-    // TODO test collapse somehow
-    QTest::newRow("o13") << QString("*/BannerAd.gif$collapse")
-                         << QUrl("http://example.com/bannerad.gif")
-                         << false;
-    QTest::newRow("o14") << QString("*/BannerAd.gif$~collapse")
-                         << QUrl("http://example.com/bannerad.gif")
-                         << false;
-    // Regular expressions
-    QTest::newRow("r0") << QString("/banner\\d+/")
-                         << QUrl("banner123")
-                         << true;
-    QTest::newRow("r1") << QString("/banner\\d+/")
-                         << QUrl("banner321")
-                         << true;
-    QTest::newRow("r2") << QString("/banner\\d+/")
-                         << QUrl("banners")
-                         << false;
-
-    // See the AdBlockPage autotest for CSS testing
-    // Basic Element hiding the network matching should never pass
-    QTest::newRow("e0") << QString("##div.textad")
-                        << QUrl()
-                        << false;
-    QTest::newRow("e1") << QString("##div#sponsorad")
-                        << QUrl()
-                        << false;
-    QTest::newRow("e1") << QString("##*#sponsorad")
-                        << QUrl()
-                        << false;
-    QTest::newRow("e1") << QString("##textad")
-                        << QUrl()
-                        << false;
-    QTest::newRow("e1") << QString("example.com##*.sponsor")
-                        << QUrl("example.com")
-                        << false;
-    QTest::newRow("e1") << QString("example.com,example.net##*.sponsor")
-                        << QUrl("example.com")
-                        << false;
-
-    // Seen on the internet
-    QTest::newRow("i0") << QString("||snap.com^$third-party")
-                        << QUrl("http://spa.snap.com/snap_preview_anywhere.js?ap=1&key=89743df349c6c38afc3094e9566cb98e&sb=1&link_icon=off&domain=pub-6332280-www.techcrunch.com")
-                        << true;
-
-    QTest::newRow("i1") << QString("|http://ads.")
-                        << QUrl("http://ads.cnn.com/html.ng/site=cnn&cnn_pagetype=main&cnn_position=336x280_adlinks&cnn_rollup=homepage&page.allowcompete=yes&params.styles=fs&tile=8837285713521&domId=463050")
-                        << true;
-
-    QTest::newRow("i2") << QString("/adverti$~object_subrequest,~stylesheet,domain=~advertise4free.org|~amarillas.cl|~bnet.com|~catalysttelecom.com|~cod4central.com|~scansource.com|~scansourcecommunications.com|~scansourcesecurity.com")
-                        << QUrl("http://i2.cdn.turner.com/cnn/.element/img/2.0/content/ads/advertisement.gif")
-                        << true;
-
-    QTest::newRow("i3") << QString("/adspace")
-                        << QUrl("http://i.cdn.turner.com/cnn/cnn_adspaces/cnn_adspaces.js")
-                        << false;
-}
-
-// public bool networkMatch(const QUrl &url) const
-void tst_AdBlockRule::networkMatch()
-{
-    QFETCH(QString, filter);
-    QFETCH(QUrl, url);
-    QFETCH(bool, networkMatch);
-
-    SubAdBlockRule AdBlockRule(filter);
-    bool result = AdBlockRule.networkMatch(url.toEncoded());
-    if (result != networkMatch) {
-        qDebug() << "Match error.";
-        qDebug() << "\tFilter:" << filter;
-        qDebug() << "\tUrl: " << url;
-        qDebug() << "\tResult : " << (result ? "match" : "NOT match");
-    }
-    QCOMPARE(AdBlockRule.networkMatch(url.toEncoded()), networkMatch);
-}
-
-void tst_AdBlockRule::regexpCreation_data()
-{
-    QTest::addColumn<QString>("input");
-    QTest::addColumn<QString>("output");
-
-    QTest::newRow("null") << QString("test") << QString("test");
-    QTest::newRow("m1") << QString("abc*") << QString("abc");
-    QTest::newRow("m2") << QString("*abc*") << QString("abc");
-    QTest::newRow("m3") << QString("abc**") << QString("abc");
-    QTest::newRow("m4") << QString("abc***") << QString("abc");
-    QTest::newRow("m5") << QString("**abc**") << QString("abc");
-    QTest::newRow("m6") << QString("**a*bc**") << QString("a.*bc");
-    QTest::newRow("h1") << QString("abc.com") << QString("abc\\.com");
-
-    QTest::newRow("a2") << QString("abc^|def") << QString("abc(?:[^\\w\\d\\-.%]|$)\\|def");
-    QTest::newRow("a3") << QString("^|def") << QString("(?:[^\\w\\d\\-.%]|$)\\|def");
-
-    QTest::newRow("s1") << QString("de|f") << QString("de\\|f");
-
-    QTest::newRow("e1") << QString("|abc") << QString("^abc");
-    QTest::newRow("e2") << QString("d|abc") << QString("d\\|abc");
-    QTest::newRow("e3") << QString("abc|") << QString("abc$");
-
-    QTest::newRow("z1") << QString("^abc") << QString("(?:[^\\w\\d\\-.%]|$)abc");
-    QTest::newRow("z2") << QString("a^bc") << QString("a(?:[^\\w\\d\\-.%]|$)bc");
-    QTest::newRow("z3") << QString("abc^|") << QString("abc(?:[^\\w\\d\\-.%]|$)");
-    QTest::newRow("z4") << QString("http://example.com^")
-            << QString("http\\:\\/\\/example\\.com(?:[^\\w\\d\\-.%]|$)");
-
-
-    QTest::newRow("d0") << QString("||example.com")
-            << QString("^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?example\\.com");
-    QTest::newRow("d1") << QString("||example.com/banner.gif")
-            << QString("^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?example\\.com\\/banner\\.gif");
-}
-
-void tst_AdBlockRule::regexpCreation()
-{
-     QFETCH(QString, input);
-     QFETCH(QString, output);
-
-     SubAdBlockRule rule(input);
-     QCOMPARE(rule.regExpPattern(), output);
-}
-
-QTEST_MAIN(tst_AdBlockRule)
-#include "tst_adblockrule.moc"
-
diff --git a/autotests/adblock/adblocksubscription/.gitignore b/autotests/adblock/adblocksubscription/.gitignore
deleted file mode 100644
index aea23ae2..00000000
--- a/autotests/adblock/adblocksubscription/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-adblocksubscription
-rules2.txt
diff --git a/autotests/adblock/adblocksubscription/adblocksubscription.pro b/autotests/adblock/adblocksubscription/adblocksubscription.pro
deleted file mode 100644
index 2ad5e053..00000000
--- a/autotests/adblock/adblocksubscription/adblocksubscription.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../autotests.pri)
-
-# Input
-SOURCES += tst_adblocksubscription.cpp
-HEADERS +=
diff --git a/autotests/adblock/adblocksubscription/rules.txt b/autotests/adblock/adblocksubscription/rules.txt
deleted file mode 100644
index 6a13a94c..00000000
--- a/autotests/adblock/adblocksubscription/rules.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[Adblock Plus 0.7.1]
-http://example.com/ads/*
-@@advice
diff --git a/autotests/adblock/adblocksubscription/tst_adblocksubscription.cpp b/autotests/adblock/adblocksubscription/tst_adblocksubscription.cpp
deleted file mode 100644
index 475ee467..00000000
--- a/autotests/adblock/adblocksubscription/tst_adblocksubscription.cpp
+++ /dev/null
@@ -1,358 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <qtest.h>
-#include <qsignalspy.h>
-#include <qtry.h>
-
-#include <adblocksubscription.h>
-
-#include <qdir.h>
-
-class tst_AdBlockSubscription : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
-    void adblocksubscription_data();
-    void adblocksubscription();
-
-    void isEnabled_data();
-    void isEnabled();
-    void location_data();
-    void location();
-    void saveRules_data();
-    void saveRules();
-    void title_data();
-    void title();
-    void updateNow_data();
-    void updateNow();
-    void allow_data();
-    void allow();
-    void block_data();
-    void block();
-    void addRule();
-    void removeRule();
-};
-
-// Subclass that exposes the protected functions.
-class SubAdBlockSubscription : public AdBlockSubscription
-{
-public:
-    SubAdBlockSubscription(const QUrl &url = QUrl()) : AdBlockSubscription(url) {}
-
-};
-
-// This will be called before the first test function is executed.
-// It is only called once.
-void tst_AdBlockSubscription::initTestCase()
-{
-}
-
-// This will be called after the last test function is executed.
-// It is only called once.
-void tst_AdBlockSubscription::cleanupTestCase()
-{
-}
-
-// This will be called before each test function is executed.
-void tst_AdBlockSubscription::init()
-{
-}
-
-// This will be called after every test function.
-void tst_AdBlockSubscription::cleanup()
-{
-}
-
-void tst_AdBlockSubscription::adblocksubscription_data()
-{
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<QString>("title");
-    QTest::addColumn<QUrl>("location");
-    QTest::addColumn<bool>("enabled");
-    QTest::addColumn<QDateTime>("lastUpdate");
-    QTest::newRow("basic0") << QUrl::fromEncoded("abp:subscribe?location=http://easylist.adblockplus.org/easylist.txt&title=EasyList")
-                            << "EasyList"
-                            << QUrl("http://easylist.adblockplus.org/easylist.txt")
-                            << true
-                            << QDateTime();
-
-
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<QString>("title");
-    QTest::addColumn<QUrl>("location");
-    QTest::addColumn<bool>("enabled");
-    QTest::addColumn<QDateTime>("lastUpdate");
-    QTest::newRow("basic1") << QUrl::fromEncoded("abp:subscribe?location=http://easylist.adblockplus.org/easylist.txt&title=EasyList&enabled=false&lastUpdate=2009-01-16T12%3A10%3A55")
-                            << "EasyList"
-                            << QUrl("http://easylist.adblockplus.org/easylist.txt")
-                            << false
-                            << QDateTime(QDate(2009, 1, 16), QTime(12, 10, 55));
-}
-
-void tst_AdBlockSubscription::adblocksubscription()
-{
-    QFETCH(QUrl, url);
-    QFETCH(QString, title);
-    QFETCH(QUrl, location);
-    QFETCH(bool, enabled);
-    QFETCH(QDateTime, lastUpdate);
-
-    SubAdBlockSubscription subscription(url);
-    QCOMPARE(subscription.title(), title);
-    QCOMPARE(subscription.location(), location);
-    QCOMPARE(subscription.isEnabled(), enabled);
-    QCOMPARE(subscription.lastUpdate(), lastUpdate);
-    QVERIFY(subscription.url().isValid());
-    //QCOMPARE(subscription.url(), url);
-    QCOMPARE(subscription.block(QString()), (AdBlockRule const*)0);
-    subscription.saveRules();
-    subscription.setEnabled(false);
-    subscription.setLocation(QUrl());
-    subscription.setTitle(QString());
-    subscription.updateNow();
-    subscription.allRules();
-    subscription.removeRule(-1);
-    subscription.removeRule(0);
-    subscription.removeRule(1);
-    subscription.addRule(AdBlockRule());
-}
-
-Q_DECLARE_METATYPE(AdBlockRule const*)
-void tst_AdBlockSubscription::allow_data()
-{
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<bool>("allow");
-    QTest::newRow("block") << QUrl("http://example.com/ads/banner123.gif") << false;
-    QTest::newRow("allow") << QUrl("http://example.com/ads/advice.html") << true;
-}
-
-// public AdBlockRule const *block(QString const &urlString) const
-void tst_AdBlockSubscription::allow()
-{
-    QFETCH(QUrl, url);
-    QFETCH(bool, allow);
-
-    SubAdBlockSubscription subscription;
-    subscription.setLocation(QUrl::fromLocalFile(QDir::currentPath() + "/rules.txt"));
-    subscription.setEnabled(true);
-    subscription.updateNow();
-
-    const AdBlockRule *rule = subscription.allow(QString::fromUtf8(url.toEncoded()));
-    if (rule)
-        QVERIFY(rule->isException());
-    QCOMPARE((0 != rule), allow);
-}
-
-void tst_AdBlockSubscription::block_data()
-{
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<bool>("block");
-    QTest::newRow("block") << QUrl("http://example.com/ads/banner123.gif") << true;
-    QTest::newRow("allow") << QUrl("http://example.com/ads/advice.html") << true;
-}
-
-// public AdBlockRule const *block(QString const &urlString) const
-void tst_AdBlockSubscription::block()
-{
-    QFETCH(QUrl, url);
-    QFETCH(bool, block);
-
-    SubAdBlockSubscription subscription;
-    subscription.setLocation(QUrl::fromLocalFile(QDir::currentPath() + "/rules.txt"));
-    subscription.setEnabled(true);
-    subscription.updateNow();
-
-    const AdBlockRule *rule = subscription.block(QString::fromUtf8(url.toEncoded()));
-    if (rule)
-        QVERIFY(!rule->isException());
-    QCOMPARE((0 != rule), block);
-}
-
-void tst_AdBlockSubscription::isEnabled_data()
-{
-    QTest::addColumn<bool>("isEnabled");
-    QTest::newRow("true") << true;
-    QTest::newRow("false") << false;
-}
-
-// public bool isEnabled() const
-void tst_AdBlockSubscription::isEnabled()
-{
-    QFETCH(bool, isEnabled);
-
-    SubAdBlockSubscription subscription;
-
-    QSignalSpy spy0(&subscription, SIGNAL(rulesChanged()));
-    QSignalSpy spy1(&subscription, SIGNAL(changed()));
-
-    bool changed = subscription.isEnabled() != isEnabled;
-    subscription.setEnabled(isEnabled);
-    QCOMPARE(subscription.isEnabled(), isEnabled);
-
-    QCOMPARE(spy0.count(), 0);
-    QCOMPARE(spy1.count(), changed ? 1 : 0);
-}
-
-void tst_AdBlockSubscription::location_data()
-{
-    QTest::addColumn<QUrl>("location");
-    QTest::newRow("null") << QUrl();
-    QTest::newRow("x") << QUrl("x");
-}
-
-// public QUrl location() const
-void tst_AdBlockSubscription::location()
-{
-    QFETCH(QUrl, location);
-
-    SubAdBlockSubscription subscription(QUrl("abp:subscribe"));
-
-    QSignalSpy spy0(&subscription, SIGNAL(rulesChanged()));
-    QSignalSpy spy1(&subscription, SIGNAL(changed()));
-
-    bool changed = location != subscription.location();
-    subscription.setLocation(location);
-    QCOMPARE(subscription.location(), location);
-    QCOMPARE(subscription.url(), QUrl(QString("abp:subscribe?location=%1&title=").arg(location.toString())));
-
-    QCOMPARE(spy0.count(), 0);
-    QCOMPARE(spy1.count(), changed ? 1 : 0);
-}
-
-void tst_AdBlockSubscription::saveRules_data()
-{
-    QTest::addColumn<QUrl>("location");
-    QTest::newRow("file") << QUrl::fromLocalFile(QDir::currentPath() + "/rules2.txt");
-}
-
-// public void saveRules()
-void tst_AdBlockSubscription::saveRules()
-{
-    QFETCH(QUrl, location);
-    SubAdBlockSubscription subscription;
-    subscription.setLocation(location);
-
-    subscription.addRule(AdBlockRule());
-    subscription.saveRules();
-    subscription.removeRule(0);
-    subscription.updateNow();
-    QCOMPARE(subscription.allRules().count(), 1);
-}
-
-void tst_AdBlockSubscription::title_data()
-{
-    QTest::addColumn<QString>("title");
-    QTest::newRow("null") << QString();
-    QTest::newRow("foo") << QString("foo");
-}
-
-// public QString title() const
-void tst_AdBlockSubscription::title()
-{
-    QFETCH(QString, title);
-
-    SubAdBlockSubscription subscription;
-
-    QSignalSpy spy0(&subscription, SIGNAL(rulesChanged()));
-    QSignalSpy spy1(&subscription, SIGNAL(changed()));
-
-    bool changed = title != subscription.title();
-    subscription.setTitle(title);
-    QCOMPARE(subscription.title(), title);
-
-    QCOMPARE(spy0.count(), 0);
-    QCOMPARE(spy1.count(), changed ? 1 : 0);
-}
-
-void tst_AdBlockSubscription::updateNow_data()
-{
-    QTest::addColumn<QUrl>("location");
-    QTest::newRow("file") << QUrl::fromLocalFile(QDir::currentPath() + "/rules.txt");
-}
-
-// public void updateNow()
-void tst_AdBlockSubscription::updateNow()
-{
-    QFETCH(QUrl, location);
-
-    SubAdBlockSubscription subscription;
-    subscription.setLocation(location);
-
-    QSignalSpy spy0(&subscription, SIGNAL(rulesChanged()));
-    QSignalSpy spy1(&subscription, SIGNAL(changed()));
-
-    subscription.updateNow();
-
-    QTRY_COMPARE(spy0.count(), 1);
-    QCOMPARE(spy1.count(), 1);
-    QVERIFY(subscription.lastUpdate() != QDateTime());
-    QCOMPARE(subscription.allRules().count(), 2);
-}
-
-void tst_AdBlockSubscription::addRule()
-{
-    SubAdBlockSubscription subscription;
-
-    QSignalSpy spy0(&subscription, SIGNAL(rulesChanged()));
-    QSignalSpy spy1(&subscription, SIGNAL(changed()));
-
-    subscription.addRule(AdBlockRule());
-    subscription.addRule(AdBlockRule("/test"));
-
-    QTRY_COMPARE(spy0.count(), 2);
-    QCOMPARE(spy1.count(), 0);
-    QCOMPARE(subscription.allRules().count(), 2);
-}
-
-void tst_AdBlockSubscription::removeRule()
-{
-    SubAdBlockSubscription subscription;
-
-    QSignalSpy spy0(&subscription, SIGNAL(rulesChanged()));
-    QSignalSpy spy1(&subscription, SIGNAL(changed()));
-
-    subscription.addRule(AdBlockRule("/test"));
-    subscription.removeRule(0);
-
-    QTRY_COMPARE(spy0.count(), 2);
-    QCOMPARE(spy1.count(), 0);
-    QCOMPARE(subscription.allRules().count(), 0);
-}
-
-
-QTEST_MAIN(tst_AdBlockSubscription)
-#include "tst_adblocksubscription.moc"
-
diff --git a/autotests/addbookmarkdialog/CMakeLists.txt b/autotests/addbookmarkdialog/CMakeLists.txt
new file mode 100644
index 00000000..3e0db452
--- /dev/null
+++ b/autotests/addbookmarkdialog/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(test-addbookmarkdialog)
+find_package(Qt5Test REQUIRED)
+
+QT5_WRAP_UI(UIS ../../src/bookmarks/addbookmarkdialog.ui)
+
+add_executable(test-addbookmarkdialog tst_addbookmarkdialog.cpp ${UIS})
+target_link_libraries(test-addbookmarkdialog endorphin-base Qt5::Test)
diff --git a/autotests/addbookmarkdialog/addbookmarkdialog.pro b/autotests/addbookmarkdialog/addbookmarkdialog.pro
deleted file mode 100644
index b23b95df..00000000
--- a/autotests/addbookmarkdialog/addbookmarkdialog.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_addbookmarkdialog.cpp
diff --git a/autotests/addbookmarkdialog/tst_addbookmarkdialog.cpp b/autotests/addbookmarkdialog/tst_addbookmarkdialog.cpp
index 0f2e6d49..500d5950 100644
--- a/autotests/addbookmarkdialog/tst_addbookmarkdialog.cpp
+++ b/autotests/addbookmarkdialog/tst_addbookmarkdialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,20 +24,20 @@
 #include "bookmarknode.h"
 #include "browserapplication.h"
 
-#include <qpushbutton.h>
-#include <qabstractitemview.h>
+#include <QPushButton>
+#include <QAbstractItemView>
 
 class tst_AddBookmarkDialog : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void addbookmarkdialog_data();
     void addbookmarkdialog();
 };
diff --git a/autotests/autosaver/CMakeLists.txt b/autotests/autosaver/CMakeLists.txt
new file mode 100644
index 00000000..fa885fbc
--- /dev/null
+++ b/autotests/autosaver/CMakeLists.txt
@@ -0,0 +1,5 @@
+project(test-autosaver)
+find_package(Qt5Test REQUIRED)
+
+add_executable(test-autosaver tst_autosaver.cpp)
+target_link_libraries(test-autosaver endorphin-base Qt5::Test)
diff --git a/autotests/autosaver/autosaver.pro b/autotests/autosaver/autosaver.pro
deleted file mode 100644
index 2ca5ec4f..00000000
--- a/autotests/autosaver/autosaver.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-# Input
-SOURCES = tst_autosaver.cpp autosaver.cpp
-HEADERS = autosaver.h
diff --git a/autotests/autosaver/tst_autosaver.cpp b/autotests/autosaver/tst_autosaver.cpp
index 5e942746..9119c399 100644
--- a/autotests/autosaver/tst_autosaver.cpp
+++ b/autotests/autosaver/tst_autosaver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,7 +24,7 @@ class tst_AutoSaver : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
@@ -32,7 +32,7 @@ public slots:
 
     void save();
 
-private slots:
+private Q_SLOTS:
     void AutoSaver_data();
     void AutoSaver();
     void changeOccurred_data();
@@ -53,7 +53,7 @@ class TestClass : public QObject
 {
 Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void saveCalled();
 
 public:
@@ -68,9 +68,9 @@ Q_OBJECT
 
     SubAutoSaver *AutoSaver;
 
-public slots:
+public Q_SLOTS:
     void save() {
-        emit saveCalled();
+        Q_EMIT saveCalled();
     }
 };
 
diff --git a/autotests/autotests.pri b/autotests/autotests.pri
deleted file mode 100644
index f72584ad..00000000
--- a/autotests/autotests.pri
+++ /dev/null
@@ -1,21 +0,0 @@
-win32: CONFIG += console
-mac:CONFIG -= app_bundle
-
-CONFIG += qtestlib
-
-include($$PWD/../src/src.pri)
-include($$PWD/modeltest/modeltest.pri)
-
-HEADERS += qtest_endorphin.h
-
-DEFINES += AUTOTESTS
-
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-
-RCC_DIR     = $$PWD/.rcc
-UI_DIR      = $$PWD/.ui
-MOC_DIR     = $$PWD/.moc
-OBJECTS_DIR = $$PWD/.obj
-
-
diff --git a/autotests/autotests.pro b/autotests/autotests.pro
deleted file mode 100644
index fdd32901..00000000
--- a/autotests/autotests.pro
+++ /dev/null
@@ -1,23 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS  = \
-    adblock \
-    addbookmarkdialog \
-    autosaver \
-    bookmarknode \
-    cookiejar \
-    historyfiltermodel \
-    historymanager \
-    modeltoolbar \
-    opensearchengine \
-    opensearchmanager \
-    opensearchreader \
-    opensearchwriter \
-    searchlineedit \
-    tabbar \
-    tabwidget \
-    utils \
-    webactionmapper \
-    webpage \
-    xbel
-
-CONFIG += ordered
diff --git a/autotests/bookmarknode/CMakeLists.txt b/autotests/bookmarknode/CMakeLists.txt
new file mode 100644
index 00000000..88295a9b
--- /dev/null
+++ b/autotests/bookmarknode/CMakeLists.txt
@@ -0,0 +1,6 @@
+project(test-bookmarknode)
+find_package(Qt5Test REQUIRED)
+
+add_executable(test-bookmarknode tst_bookmarknode.cpp)
+target_link_libraries(test-bookmarknode endorphin-base Qt5::Test)
+
diff --git a/autotests/bookmarknode/bookmarknode.pro b/autotests/bookmarknode/bookmarknode.pro
deleted file mode 100644
index b796c019..00000000
--- a/autotests/bookmarknode/bookmarknode.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += . ../
-
-include(../autotests.pri)
-
-QT = core
-
-# Input
-SOURCES = bookmarknode.cpp tst_bookmarknode.cpp
-HEADERS = bookmarknode.h
-FORMS =
-RESOURCE =
diff --git a/autotests/bookmarknode/tst_bookmarknode.cpp b/autotests/bookmarknode/tst_bookmarknode.cpp
index 15cdda19..8bf77ac1 100644
--- a/autotests/bookmarknode/tst_bookmarknode.cpp
+++ b/autotests/bookmarknode/tst_bookmarknode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright (c) 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -33,13 +33,13 @@ class tst_BookmarkNode : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void bookmarknode_data();
     void bookmarknode();
 
diff --git a/autotests/cookiejar/.gitignore b/autotests/cookiejar/.gitignore
deleted file mode 100644
index b4440a70..00000000
--- a/autotests/cookiejar/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-cookiejar
diff --git a/autotests/cookiejar/cookiejar.pro b/autotests/cookiejar/cookiejar.pro
deleted file mode 100644
index bc4d22b0..00000000
--- a/autotests/cookiejar/cookiejar.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_cookiejar.cpp
-HEADERS +=
diff --git a/autotests/cookiejar/tst_cookiejar.cpp b/autotests/cookiejar/tst_cookiejar.cpp
deleted file mode 100644
index e7a99a67..00000000
--- a/autotests/cookiejar/tst_cookiejar.cpp
+++ /dev/null
@@ -1,556 +0,0 @@
-/*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <QtTest/QtTest>
-#include <cookiejar.h>
-
-class tst_CookieJar : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
-    void cookiejar_data();
-    void cookiejar();
-
-    void acceptPolicy_data();
-    void acceptPolicy();
-    void allowedCookies_data();
-    void allowedCookies();
-    void allowForSessionCookies_data();
-    void allowForSessionCookies();
-    void blockedCookies_data();
-    void blockedCookies();
-    void clear_data();
-    void clear();
-    void cookiesForUrl_data();
-    void cookiesForUrl();
-    void keepPolicy_data();
-    void keepPolicy();
-    void loadSettings_data();
-    void loadSettings();
-    void setAcceptPolicy_data();
-    void setAcceptPolicy();
-    void setAllowedCookies_data();
-    void setAllowedCookies();
-    void setAllowForSessionCookies_data();
-    void setAllowForSessionCookies();
-    void setBlockedCookies_data();
-    void setBlockedCookies();
-    void setCookiesFromUrl_data();
-    void setCookiesFromUrl();
-    void setKeepPolicy_data();
-    void setKeepPolicy();
-    void cookiesChanged_data();
-    void cookiesChanged();
-    void isOnDomainList_data();
-    void isOnDomainList();
-};
-
-// Subclass that exposes the protected functions.
-class SubCookieJar : public CookieJar
-{
-public:
-    void call_cookiesChanged()
-        { return SubCookieJar::cookiesChanged(); }
-
-    static bool call_isOnDomainList(QStringList const &list, QString const &domain)
-        { return SubCookieJar::isOnDomainList(list, domain); }
-};
-
-// This will be called before the first test function is executed.
-// It is only called once.
-void tst_CookieJar::initTestCase()
-{
-}
-
-// This will be called after the last test function is executed.
-// It is only called once.
-void tst_CookieJar::cleanupTestCase()
-{
-}
-
-// This will be called before each test function is executed.
-void tst_CookieJar::init()
-{
-}
-
-// This will be called after every test function.
-void tst_CookieJar::cleanup()
-{
-}
-
-void tst_CookieJar::cookiejar_data()
-{
-}
-
-void tst_CookieJar::cookiejar()
-{
-    SubCookieJar jar;
-#if 0
-    QCOMPARE(jar.acceptPolicy(), CookieJar::AcceptPolicy);
-    QCOMPARE(jar.allowedCookies(), QStringList);
-    QCOMPARE(jar.allowForSessionCookies(), QStringList);
-    QCOMPARE(jar.blockedCookies(), QStringList);
-    jar.clear();
-    QCOMPARE(jar.cookiesForUrl(QUrl()), QList<QNetworkCookie>());
-    QCOMPARE(jar.keepPolicy(), CookieJar::KeepPolicy);
-    jar.loadSettings();
-    jar.setAcceptPolicy(CookieJar::AcceptPolicy);
-    jar.setAllowedCookies(QStringList());
-    jar.setAllowForSessionCookies(QStringList());
-    jar.setBlockedCookies(QStringList());
-    QCOMPARE(jar.setCookiesFromUrl(QList<QNetworkCookie>(), QUrl()), false);
-    jar.setKeepPolicy(CookieJar::KeepPolicy);
-    jar.call_cookiesChanged();
-    QCOMPARE(jar.call_isOnDomainList(QStringList(), QString()), false);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-Q_DECLARE_METATYPE(CookieJar::AcceptPolicy)
-void tst_CookieJar::acceptPolicy_data()
-{
-#if 0
-    QTest::addColumn<CookieJar::AcceptPolicy>("acceptPolicy");
-    QTest::newRow("null") << CookieJar::AcceptPolicy();
-#endif
-}
-
-// public CookieJar::AcceptPolicy acceptPolicy() const
-void tst_CookieJar::acceptPolicy()
-{
-#if 0
-    QFETCH(CookieJar::AcceptPolicy, acceptPolicy);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    QCOMPARE(jar.acceptPolicy(), acceptPolicy);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::allowedCookies_data()
-{
-#if 0
-    QTest::addColumn<QStringList>("allowedCookies");
-    QTest::newRow("null") << QStringList();
-#endif
-}
-
-// public QStringList allowedCookies() const
-void tst_CookieJar::allowedCookies()
-{
-#if 0
-    QFETCH(QStringList, allowedCookies);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    QCOMPARE(jar.allowedCookies(), allowedCookies);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::allowForSessionCookies_data()
-{
-#if 0
-    QTest::addColumn<QStringList>("allowForSessionCookies");
-    QTest::newRow("null") << QStringList();
-#endif
-}
-
-// public QStringList allowForSessionCookies() const
-void tst_CookieJar::allowForSessionCookies()
-{
-#if 0
-    QFETCH(QStringList, allowForSessionCookies);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    QCOMPARE(jar.allowForSessionCookies(), allowForSessionCookies);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::blockedCookies_data()
-{
-#if 0
-    QTest::addColumn<QStringList>("blockedCookies");
-    QTest::newRow("null") << QStringList();
-#endif
-}
-
-// public QStringList blockedCookies() const
-void tst_CookieJar::blockedCookies()
-{
-#if 0
-    QFETCH(QStringList, blockedCookies);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    QCOMPARE(jar.blockedCookies(), blockedCookies);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::clear_data()
-{
-    QTest::addColumn<int>("foo");
-    QTest::newRow("0") << 0;
-    QTest::newRow("-1") << -1;
-}
-
-// public void clear()
-void tst_CookieJar::clear()
-{
-#if 0
-    QFETCH(int, foo);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    jar.clear();
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::cookiesForUrl_data()
-{
-#if 0
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<QList<QNetworkCookie>>("cookiesForUrl");
-    QTest::newRow("null") << QUrl() << QList<QNetworkCookie>();
-#endif
-}
-
-// public QList<QNetworkCookie> cookiesForUrl(QUrl const &url) const
-void tst_CookieJar::cookiesForUrl()
-{
-#if 0
-    QFETCH(QUrl, url);
-    QFETCH(QList<QNetworkCookie>, cookiesForUrl);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    QCOMPARE(jar.cookiesForUrl(url), cookiesForUrl);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-Q_DECLARE_METATYPE(CookieJar::KeepPolicy)
-void tst_CookieJar::keepPolicy_data()
-{
-#if 0
-    QTest::addColumn<CookieJar::KeepPolicy>("keepPolicy");
-    QTest::newRow("null") << CookieJar::KeepPolicy();
-#endif
-}
-
-// public CookieJar::KeepPolicy keepPolicy() const
-void tst_CookieJar::keepPolicy()
-{
-#if 0
-    QFETCH(CookieJar::KeepPolicy, keepPolicy);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    QCOMPARE(jar.keepPolicy(), keepPolicy);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::loadSettings_data()
-{
-    QTest::addColumn<int>("foo");
-    QTest::newRow("0") << 0;
-    QTest::newRow("-1") << -1;
-}
-
-// public void loadSettings()
-void tst_CookieJar::loadSettings()
-{
-#if 0
-    QFETCH(int, foo);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    jar.loadSettings();
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::setAcceptPolicy_data()
-{
-#if 0
-    QTest::addColumn<CookieJar::AcceptPolicy>("policy");
-    QTest::newRow("null") << CookieJar::AcceptPolicy();
-#endif
-}
-
-// public void setAcceptPolicy(CookieJar::AcceptPolicy policy)
-void tst_CookieJar::setAcceptPolicy()
-{
-#if 0
-    QFETCH(CookieJar::AcceptPolicy, policy);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    jar.setAcceptPolicy(policy);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::setAllowedCookies_data()
-{
-#if 0
-    QTest::addColumn<QStringList>("list");
-    QTest::newRow("null") << QStringList();
-#endif
-}
-
-// public void setAllowedCookies(QStringList const &list)
-void tst_CookieJar::setAllowedCookies()
-{
-#if 0
-    QFETCH(QStringList, list);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    jar.setAllowedCookies(list);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::setAllowForSessionCookies_data()
-{
-#if 0
-    QTest::addColumn<QStringList>("list");
-    QTest::newRow("null") << QStringList();
-#endif
-}
-
-// public void setAllowForSessionCookies(QStringList const &list)
-void tst_CookieJar::setAllowForSessionCookies()
-{
-#if 0
-    QFETCH(QStringList, list);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    jar.setAllowForSessionCookies(list);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::setBlockedCookies_data()
-{
-#if 0
-    QTest::addColumn<QStringList>("list");
-    QTest::newRow("null") << QStringList();
-#endif
-}
-
-// public void setBlockedCookies(QStringList const &list)
-void tst_CookieJar::setBlockedCookies()
-{
-#if 0
-    QFETCH(QStringList, list);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    jar.setBlockedCookies(list);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::setCookiesFromUrl_data()
-{
-#if 0
-    QTest::addColumn<QList<QNetworkCookie>>("cookieList");
-    QTest::addColumn<QUrl>("url");
-    QTest::addColumn<bool>("setCookiesFromUrl");
-    QTest::newRow("null") << QList<QNetworkCookie>() << QUrl() << false;
-#endif
-}
-
-// public bool setCookiesFromUrl(QList<QNetworkCookie> const &cookieList, QUrl const &url)
-void tst_CookieJar::setCookiesFromUrl()
-{
-#if 0
-    QFETCH(QList<QNetworkCookie>, cookieList);
-    QFETCH(QUrl, url);
-    QFETCH(bool, setCookiesFromUrl);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    QCOMPARE(jar.setCookiesFromUrl(cookieList, url), setCookiesFromUrl);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::setKeepPolicy_data()
-{
-#if 0
-    QTest::addColumn<CookieJar::KeepPolicy>("policy");
-    QTest::newRow("null") << CookieJar::KeepPolicy();
-#endif
-}
-
-// public void setKeepPolicy(CookieJar::KeepPolicy policy)
-void tst_CookieJar::setKeepPolicy()
-{
-#if 0
-    QFETCH(CookieJar::KeepPolicy, policy);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    jar.setKeepPolicy(policy);
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::cookiesChanged_data()
-{
-    QTest::addColumn<int>("foo");
-    QTest::newRow("0") << 0;
-    QTest::newRow("-1") << -1;
-}
-
-// protected void cookiesChanged()
-void tst_CookieJar::cookiesChanged()
-{
-#if 0
-    QFETCH(int, foo);
-
-    SubCookieJar jar;
-
-    QSignalSpy spy0(&jar, SIGNAL(cookiesChanged()));
-
-    jar.call_cookiesChanged();
-
-    QCOMPARE(spy0.count(), 0);
-#endif
-    QSKIP("Test is not implemented.");
-}
-
-void tst_CookieJar::isOnDomainList_data()
-{
-    QTest::addColumn<QStringList>("list");
-    QTest::addColumn<QString>("domain");
-    QTest::addColumn<bool>("isOnDomainList");
-
-    QTest::newRow("null") << QStringList() << QString() << false;
-    QTest::newRow("exact-match") << (QStringList() << "foo.com") << "foo.com" << true;
-
-    QTest::newRow("check-0") << (QStringList() << "foo.com") << "foo.com" << true;
-    QTest::newRow("check-1") << (QStringList() << "foo.com") << ".foo.com" << true;
-    QTest::newRow("check-2") << (QStringList() << ".foo.com") << "foo.com" << true;
-    QTest::newRow("check-3") << (QStringList() << ".foo.com") << ".foo.com" << true;
-    QTest::newRow("check-4") << (QStringList() << "foo.com") << "abcfoo.com" << false;
-    QTest::newRow("check-5") << (QStringList() << "foo.com") << "abc.foo.com" << true;
-    QTest::newRow("check-6") << (QStringList() << ".foo.com") << "abcfoo.com" << false;
-    QTest::newRow("check-7") << (QStringList() << ".foo.com") << "abc.foo.com" << true;
-
-    QTest::newRow("check-4") << (QStringList() << "abc.foo.com") << "foo.com" << false;
-    QTest::newRow("check-5") << (QStringList() << "abc.foo.com") << ".foo.com" << false;
-
-
-    QTest::newRow("edgecheck-0") << (QStringList() << "") << ".foo.com" << false;
-    QTest::newRow("edgecheck-1") << (QStringList() << "") << "foo.com" << false;
-    QTest::newRow("edgecheck-2") << (QStringList() << ".") << ".foo.com" << false;
-    QTest::newRow("edgecheck-3") << (QStringList() << ".") << "foo.com" << false;
-    QTest::newRow("edgecheck-4") << (QStringList() << "abc.foo.com") << "" << false;
-    QTest::newRow("edgecheck-5") << (QStringList() << "a") << "ab" << false;
-}
-
-// protected static bool isOnDomainList(QStringList const &list, QString const &domain)
-void tst_CookieJar::isOnDomainList()
-{
-    QFETCH(QStringList, list);
-    QFETCH(QString, domain);
-    QFETCH(bool, isOnDomainList);
-
-    SubCookieJar jar;
-
-    QCOMPARE(jar.call_isOnDomainList(list, domain), isOnDomainList);
-}
-
-QTEST_MAIN(tst_CookieJar)
-#include "tst_cookiejar.moc"
-
diff --git a/autotests/downloadmanager/CMakeLists.txt b/autotests/downloadmanager/CMakeLists.txt
new file mode 100644
index 00000000..f1bfdcae
--- /dev/null
+++ b/autotests/downloadmanager/CMakeLists.txt
@@ -0,0 +1,5 @@
+project(test-downloadmanager)
+find_package(Qt5Test REQUIRED)
+
+add_executable(test-downloadmanager tst_downloadmanager.cpp)
+target_link_libraries(test-downloadmanager endorphin-base Qt5::Test)
\ No newline at end of file
diff --git a/autotests/downloadmanager/downloadmanager.pro b/autotests/downloadmanager/downloadmanager.pro
deleted file mode 100644
index f53cddff..00000000
--- a/autotests/downloadmanager/downloadmanager.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_downloadmanager.cpp
-HEADERS +=
diff --git a/autotests/downloadmanager/tst_downloadmanager.cpp b/autotests/downloadmanager/tst_downloadmanager.cpp
index 6e142f6c..69d080e0 100644
--- a/autotests/downloadmanager/tst_downloadmanager.cpp
+++ b/autotests/downloadmanager/tst_downloadmanager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,21 +22,21 @@
 #include <QtGui/QtGui>
 #include "downloadmanager.h"
 
-#define BIGFILE "http://10.0.0.3/~ben/distccKNOPPIX-1.3-2004-08-20-gcc-3.3.iso"
-#define BIGFILENAME "distccKNOPPIX-1.3-2004-08-20-gcc-3.3.iso"
-#define BIGFILENAME2 "distccKNOPPIX-1.3-2004-08-20-gcc-3.3-1.iso"
+#define BIGFILE "http://ftp.uni-kl.de/pub/linux/knoppix/KNOPPIX_V7.2.0CD-2013-06-16-DE.iso"
+#define BIGFILENAME "KNOPPIX_V7.2.0CD-2013-06-16-DE.iso"
+#define BIGFILENAME2 "KNOPPIX_V7.2.0CD-2013-06-16-DE.iso"
 
 class tst_DownloadManager : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void downloadmanager_data();
     void downloadmanager();
     void cleanupButton_data();
diff --git a/autotests/historyfiltermodel/CMakeLists.txt b/autotests/historyfiltermodel/CMakeLists.txt
new file mode 100644
index 00000000..224d5055
--- /dev/null
+++ b/autotests/historyfiltermodel/CMakeLists.txt
@@ -0,0 +1,6 @@
+project(test-historyfiltermodel)
+find_package(Qt5Test REQUIRED)
+QT5_WRAP_UI(UIS ../../src/history/history.ui)
+
+add_executable(test-historyfiltermodel tst_historyfiltermodel.cpp ${UIS})
+target_link_libraries(test-historyfiltermodel endorphin-base Qt5::Test)
\ No newline at end of file
diff --git a/autotests/historyfiltermodel/historyfiltermodel.pro b/autotests/historyfiltermodel/historyfiltermodel.pro
deleted file mode 100644
index 2315b830..00000000
--- a/autotests/historyfiltermodel/historyfiltermodel.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_historyfiltermodel.cpp
-HEADERS +=
diff --git a/autotests/historyfiltermodel/tst_historyfiltermodel.cpp b/autotests/historyfiltermodel/tst_historyfiltermodel.cpp
index b753239f..4fe37db7 100644
--- a/autotests/historyfiltermodel/tst_historyfiltermodel.cpp
+++ b/autotests/historyfiltermodel/tst_historyfiltermodel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,7 +17,8 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include <QtTest/QtTest>
+#include <QtTest>
+#include <QRandomGenerator>
 #include <history.h>
 #include <historymanager.h>
 
@@ -25,13 +26,13 @@ class tst_HistoryFilterModel : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void historyfiltermodel_data();
     void historyfiltermodel();
 
@@ -111,14 +112,14 @@ HistoryList makeHistoryList(int count)
     QDateTime dateTime = QDateTime::currentDateTime();
     for (int i = 0; i < count; ++i) {
         HistoryEntry item;
-        QString url = QString("http://%1host-%2.com/")
-            .arg(qrand() % 2 ? "www." : "")
+        QString url = QStringLiteral("http://%1host-%2.com/")
+                      .arg(QRandomGenerator::global()->generate() % 2 ? "www." : "")
             .arg(QString::number(i));
         item.url = url;
-        item.title = QString("title %1").arg(i);
+        item.title = QStringLiteral("title %1").arg(i);
         item.dateTime = dateTime;
         list.append(item);
-        dateTime = dateTime.addSecs(-1 * qrand() % (60 * 60));
+        dateTime = dateTime.addSecs(-1 * QRandomGenerator::global()->generate() % (60 * 60));
     }
     return list;
 }
@@ -129,7 +130,7 @@ void tst_HistoryFilterModel::historyContains_data()
     QTest::addColumn<QString>("url");
     QTest::addColumn<bool>("historyContains");
 
-    QTest::newRow("null") << HistoryList() << QString("foo") << false;
+    QTest::newRow("null") << HistoryList() << QStringLiteral("foo") << false;
 
     HistoryList list1 = makeHistoryList(1);
     QTest::newRow("one") << list1 << list1.at(0).url << true;
@@ -138,7 +139,7 @@ void tst_HistoryFilterModel::historyContains_data()
     QTest::newRow("many-0") << list2 << list2.at(0).url << true;
     QTest::newRow("many-1") << list2 << list2.at(1).url << true;
     QTest::newRow("many-2") << list2 << list2.at(4).url << true;
-    QTest::newRow("many-3") << list2 << QString("foo") << false;
+    QTest::newRow("many-3") << list2 << QStringLiteral("foo") << false;
 }
 
 // public bool historyContains(QString const &url) const
@@ -284,8 +285,8 @@ void tst_HistoryFilterModel::addRow()
     }
 
     if (history.count() > 0)
-        for (int i = 0; i < qrand() % 15; ++i)
-            model.history->addHistoryEntry(history[qrand() % history.count()].url);
+        for (uint i = 0; i < QRandomGenerator::global()->generate() % 15; ++i)
+            model.history->addHistoryEntry(history[QRandomGenerator::global()->generate() % history.count()].url);
     QStringList urls;
     for (int i = 0; i < model.rowCount(); ++i) {
         QModelIndex idx = model.index(i, 0);
diff --git a/autotests/historymanager/CMakeLists.txt b/autotests/historymanager/CMakeLists.txt
new file mode 100644
index 00000000..073264b9
--- /dev/null
+++ b/autotests/historymanager/CMakeLists.txt
@@ -0,0 +1,10 @@
+project(test-historymanager)
+find_package(Qt5Test REQUIRED)
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../modeltest
+)
+QT5_WRAP_UI(UIS ../../src/history/history.ui)
+
+add_executable(test-historymanager tst_historymanager.cpp ../modeltest/modeltest.cpp ${UIS})
+target_link_libraries(test-historymanager endorphin-base Qt5::Test)
\ No newline at end of file
diff --git a/autotests/historymanager/historymanager.pro b/autotests/historymanager/historymanager.pro
deleted file mode 100644
index 92e9c624..00000000
--- a/autotests/historymanager/historymanager.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_historymanager.cpp
-HEADERS +=
diff --git a/autotests/historymanager/tst_historymanager.cpp b/autotests/historymanager/tst_historymanager.cpp
index 48d06671..1a3c20cc 100644
--- a/autotests/historymanager/tst_historymanager.cpp
+++ b/autotests/historymanager/tst_historymanager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2014 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,29 +20,29 @@
 #include <QtTest/QtTest>
 #include "qtest_endorphin.h"
 
-#include <historymanager.h>
-#include <history.h>
-#include <historycompleter.h>
+#include "historymanager.h"
+#include "history.h"
+#include "locationcompleter.h"
 #include <modeltest.h>
 
-#include <qwebsettings.h>
+#include <QWebEngineSettings>
 
 class tst_HistoryManager : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void history_data();
     void history();
     void addHistoryEntry_data();
     void addHistoryEntry();
-    void addHistoryEntry_private();
+    //void addHistoryEntry_private();
     void addHistoryEntry_url();
     void updateHistoryEntry_data();
     void updateHistoryEntry();
@@ -73,8 +73,6 @@ class SubHistory : public HistoryManager
     {
         QWidget w;
         setParent(&w);
-        if (QWebHistoryInterface::defaultInterface() == this)
-            QWebHistoryInterface::setDefaultInterface(0);
         setParent(0);
     }
 
@@ -208,7 +206,7 @@ void tst_HistoryManager::addHistoryEntry()
     QCOMPARE(history.history().count(), expected.count());
     QCOMPARE(history.history(), expected);
 }
-
+/*
 void tst_HistoryManager::addHistoryEntry_private()
 {
     SubHistory history;
@@ -219,7 +217,7 @@ void tst_HistoryManager::addHistoryEntry_private()
     globalSettings->setAttribute(QWebSettings::PrivateBrowsingEnabled, false);
     QVERIFY(history.history().isEmpty());
 }
-
+*/
 void tst_HistoryManager::addHistoryEntry_url()
 {
     SubHistory history;
@@ -236,8 +234,8 @@ void tst_HistoryManager::updateHistoryEntry_data()
     QTest::addColumn<QString>("title");
 
     QTest::newRow("null") << HistoryList() << QUrl() << QString();
-    QTest::newRow("one") << (HistoryList() << HistoryEntry()) << QUrl() << QString("foo");
-    QTest::newRow("two") << (HistoryList() << HistoryEntry() << HistoryEntry("http://foo.com")) << QUrl() << QString("foo");
+    QTest::newRow("one") << (HistoryList() << HistoryEntry()) << QUrl() << QStringLiteral("foo");
+    QTest::newRow("two") << (HistoryList() << HistoryEntry() << HistoryEntry("http://foo.com")) << QUrl() << QStringLiteral("foo");
 }
 
 // public void updateHistoryEntry(QUrl const &url, QString const title)
@@ -289,7 +287,7 @@ void tst_HistoryManager::daysToExpire()
     SubHistory history;
 
     history.setHistory(list);
-    qSort(list.begin(), list.end());
+    std::sort(list.begin(), list.end());
     QCOMPARE(history.history(), list);
 
     history.setDaysToExpire(daysToExpire);
@@ -434,7 +432,7 @@ void tst_HistoryManager::big()
     ModelTest test(&model);
     QCOMPARE(model.rowCount(), bigHistory.count());
 
-    HistoryCompletionModel completionModel;
+    LocationCompletionModel completionModel;
     completionModel.setSourceModel(&model);
     ModelTest test2(&completionModel);
     QCOMPARE(completionModel.rowCount(), bigHistory.count());
diff --git a/autotests/modeltest/modeltest.cpp b/autotests/modeltest/modeltest.cpp
index a107e661..d7170280 100644
--- a/autotests/modeltest/modeltest.cpp
+++ b/autotests/modeltest/modeltest.cpp
@@ -22,6 +22,7 @@
 ****************************************************************************/
 
 #include <QtGui/QtGui>
+#include <QMetaType>
 
 #include "modeltest.h"
 
@@ -34,44 +35,28 @@ ModelTest::ModelTest(QAbstractItemModel *_model, QObject *parent) : QObject(pare
 {
     Q_ASSERT(model);
 
-    connect(model, SIGNAL(columnsAboutToBeInserted(const QModelIndex &, int, int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(columnsAboutToBeRemoved(const QModelIndex &, int, int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(columnsInserted(const QModelIndex &, int, int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(columnsRemoved(const QModelIndex &, int, int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(dataChanged(const QModelIndex &, const QModelIndex &)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(headerDataChanged(Qt::Orientation, int, int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(layoutAboutToBeChanged ()), this, SLOT(runAllTests()));
-    connect(model, SIGNAL(layoutChanged ()), this, SLOT(runAllTests()));
-    connect(model, SIGNAL(modelReset ()), this, SLOT(runAllTests()));
-    connect(model, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-            this, SLOT(runAllTests()));
-    connect(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
-            this, SLOT(runAllTests()));
+    connect(model, &QAbstractItemModel::columnsAboutToBeInserted, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::columnsAboutToBeRemoved, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::columnsInserted, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::columnsRemoved, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::dataChanged, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::headerDataChanged, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::layoutAboutToBeChanged, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::layoutChanged, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::modelReset, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::rowsAboutToBeInserted, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::rowsAboutToBeRemoved, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::rowsInserted, this, &ModelTest::runAllTests);
+    connect(model, &QAbstractItemModel::rowsRemoved, this, &ModelTest::runAllTests);
 
     // Special checks for inserting/removing
-    connect(model, SIGNAL(layoutAboutToBeChanged()),
-            this, SLOT(layoutAboutToBeChanged()));
-    connect(model, SIGNAL(layoutChanged()),
-            this, SLOT(layoutChanged()));
-
-    connect(model, SIGNAL(rowsAboutToBeInserted(const QModelIndex &, int, int)),
-            this, SLOT(rowsAboutToBeInserted(const QModelIndex &, int, int)));
-    connect(model, SIGNAL(rowsAboutToBeRemoved(const QModelIndex &, int, int)),
-            this, SLOT(rowsAboutToBeRemoved(const QModelIndex &, int, int)));
-    connect(model, SIGNAL(rowsInserted(const QModelIndex &, int, int)),
-            this, SLOT(rowsInserted(const QModelIndex &, int, int)));
-    connect(model, SIGNAL(rowsRemoved(const QModelIndex &, int, int)),
-            this, SLOT(rowsRemoved(const QModelIndex &, int, int)));
+    connect(model, &QAbstractItemModel::layoutAboutToBeChanged, this, &ModelTest::layoutAboutToBeChanged);
+    connect(model, &QAbstractItemModel::layoutChanged, this, &ModelTest::layoutChanged);
+
+    connect(model, &QAbstractItemModel::rowsAboutToBeInserted, this, &ModelTest::rowsAboutToBeInserted);
+    connect(model, &QAbstractItemModel::rowsAboutToBeRemoved, this, &ModelTest::rowsAboutToBeRemoved);
+    connect(model, &QAbstractItemModel::rowsInserted, this, &ModelTest::rowsInserted);
+    connect(model, &QAbstractItemModel::rowsRemoved, this, &ModelTest::rowsRemoved);
 
     runAllTests();
 }
@@ -384,50 +369,50 @@ void ModelTest::data()
     Q_ASSERT(model->index(0, 0).isValid());
 
     // shouldn't be able to set data on an invalid index
-    Q_ASSERT(model->setData(QModelIndex(), QLatin1String("foo"), Qt::DisplayRole) == false);
+    Q_ASSERT(model->setData(QModelIndex(), QStringLiteral("foo"), Qt::DisplayRole) == false);
 
     // General Purpose roles that should return a QString
     QVariant variant = model->data(model->index(0, 0), Qt::ToolTipRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert(QMetaType::QString));
     }
     variant = model->data(model->index(0, 0), Qt::StatusTipRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert(QMetaType::QString));
     }
     variant = model->data(model->index(0, 0), Qt::WhatsThisRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QString>(variant));
+        Q_ASSERT(variant.canConvert(QMetaType::QString));
     }
 
     // General Purpose roles that should return a QSize
     variant = model->data(model->index(0, 0), Qt::SizeHintRole);
     if (variant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QSize>(variant));
+        Q_ASSERT(variant.canConvert(QMetaType::QSize));
     }
 
     // General Purpose roles that should return a QFont
     QVariant fontVariant = model->data(model->index(0, 0), Qt::FontRole);
     if (fontVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QFont>(fontVariant));
+        Q_ASSERT(fontVariant.canConvert(QMetaType::QFont));
     }
 
     // Check that the alignment is one we know about
     QVariant textAlignmentVariant = model->data(model->index(0, 0), Qt::TextAlignmentRole);
     if (textAlignmentVariant.isValid()) {
         int alignment = textAlignmentVariant.toInt();
-       Q_ASSERT(alignment == (alignment & (Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask)));
+        Q_ASSERT(alignment == (alignment & (Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask)));
     }
 
     // General Purpose roles that should return a QColor
     QVariant colorVariant = model->data(model->index(0, 0), Qt::BackgroundColorRole);
     if (colorVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
+        Q_ASSERT(colorVariant.canConvert(QMetaType::QColor));
     }
 
     colorVariant = model->data(model->index(0, 0), Qt::TextColorRole);
     if (colorVariant.isValid()) {
-        Q_ASSERT(qVariantCanConvert<QColor>(colorVariant));
+        Q_ASSERT(colorVariant.canConvert(QMetaType::QColor));
     }
 
     // Check that the "check state" is one we know about.
diff --git a/autotests/modeltest/modeltest.pri b/autotests/modeltest/modeltest.pri
deleted file mode 100644
index 358a0778..00000000
--- a/autotests/modeltest/modeltest.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-SOURCES += $$PWD/modeltest.cpp
-HEADERS += $$PWD/modeltest.h
diff --git a/autotests/modeltoolbar/CMakeLists.txt b/autotests/modeltoolbar/CMakeLists.txt
new file mode 100644
index 00000000..2a39ac30
--- /dev/null
+++ b/autotests/modeltoolbar/CMakeLists.txt
@@ -0,0 +1,10 @@
+project(test-modeltoolbar)
+find_package(Qt5Test REQUIRED)
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../modeltest
+)
+
+
+add_executable(test-modeltoolbar tst_modeltoolbar.cpp)
+target_link_libraries(test-modeltoolbar endorphin-base Qt5::Test)
diff --git a/autotests/modeltoolbar/modeltoolbar.pro b/autotests/modeltoolbar/modeltoolbar.pro
deleted file mode 100644
index 2a63be59..00000000
--- a/autotests/modeltoolbar/modeltoolbar.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-SOURCES += \
-    tst_modeltoolbar.cpp
diff --git a/autotests/modeltoolbar/tst_modeltoolbar.cpp b/autotests/modeltoolbar/tst_modeltoolbar.cpp
index 4682090c..39eb8935 100644
--- a/autotests/modeltoolbar/tst_modeltoolbar.cpp
+++ b/autotests/modeltoolbar/tst_modeltoolbar.cpp
@@ -24,22 +24,22 @@
 #include "browserapplication.h"
 #include "modelmenu.h"
 
-#include <qaction.h>
-#include <qcolor.h>
-#include <qstandarditemmodel.h>
-#include <qstringlistmodel.h>
+#include <QAction>
+#include <QColor>
+#include <QStandardItemModel>
+#include <QStringListModel>
 
 class tst_ModelToolBar : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void modeltoolbar();
     void index();
     void model();
@@ -56,13 +56,20 @@ class SubModelToolBar : public ModelToolBar
 {
 public:
     void call_activated(QModelIndex const &index)
-        { return SubModelToolBar::activated(index); }
+    {
+        return SubModelToolBar::activated(index);
+    }
 
     void call_build()
-        { SubModelToolBar::build(); resize(sizeHint()); }
+    {
+        SubModelToolBar::build();
+        resize(sizeHint());
+    }
 
     ModelMenu *call_createMenu()
-        { return SubModelToolBar::createMenu(); }
+    {
+        return SubModelToolBar::createMenu();
+    }
 };
 
 class ColorModel : public QAbstractItemModel
@@ -274,11 +281,6 @@ void tst_ModelToolBar::activated()
         if (spy.count())
             QCOMPARE(spy.at(0).at(0).value<QModelIndex>(), bar.index(action));
 
-        if (action) {
-            QCOMPARE(BrowserApplication::instance()->eventMouseButtons(), Qt::MidButton);
-            QCOMPARE(BrowserApplication::instance()->eventKeyboardModifiers(), Qt::ShiftModifier);
-        }
-
         spy.clear();
 
         point.setX(point.x() + 50);
diff --git a/autotests/opensearchengine/CMakeLists.txt b/autotests/opensearchengine/CMakeLists.txt
new file mode 100644
index 00000000..0b5f3812
--- /dev/null
+++ b/autotests/opensearchengine/CMakeLists.txt
@@ -0,0 +1,9 @@
+project(test-opensearchengine)
+find_package(Qt5Test REQUIRED)
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../modeltest
+)
+
+add_executable(test-opensearchengine tst_opensearchengine.cpp)
+target_link_libraries(test-opensearchengine endorphin-base Qt5::Test)
\ No newline at end of file
diff --git a/autotests/opensearchengine/opensearchengine.pro b/autotests/opensearchengine/opensearchengine.pro
deleted file mode 100644
index 9a5b215a..00000000
--- a/autotests/opensearchengine/opensearchengine.pro
+++ /dev/null
@@ -1,20 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-SOURCES = \
-    opensearchengine.cpp \
-    opensearchenginedelegate.cpp \
-    tst_opensearchengine.cpp
-
-HEADERS = \
-    opensearchengine.h \
-    opensearchenginedelegate.h
-
-FORMS =
-
-RESOURCES = \
-    opensearchengine.qrc
diff --git a/autotests/opensearchengine/tst_opensearchengine.cpp b/autotests/opensearchengine/tst_opensearchengine.cpp
index 3a3bd205..3f30d64f 100644
--- a/autotests/opensearchengine/tst_opensearchengine.cpp
+++ b/autotests/opensearchengine/tst_opensearchengine.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -24,12 +24,12 @@
 #include "opensearchenginedelegate.h"
 
 #include <qbuffer.h>
-#include <qfile.h>
+#include <QFile>
 #include <qlocale.h>
 #include <qnetworkaccessmanager.h>
-#include <qnetworkreply.h>
-#include <qnetworkrequest.h>
-#include <qtimer.h>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QTimer>
 
 typedef OpenSearchEngine::Parameters Parameters;
 typedef OpenSearchEngine::Parameter Parameter;
@@ -38,13 +38,13 @@ class tst_OpenSearchEngine : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void opensearchengine_data();
     void opensearchengine();
 
@@ -90,16 +90,24 @@ class SubOpenSearchEngine : public OpenSearchEngine
 {
 public:
     void call_imageChanged()
-        { return SubOpenSearchEngine::imageChanged(); }
+    {
+        return SubOpenSearchEngine::imageChanged();
+    }
 
     void call_loadImage() const
-        { return SubOpenSearchEngine::loadImage(); }
+    {
+        return SubOpenSearchEngine::loadImage();
+    }
 
     QString call_parseTemplate(QString const &searchTerm, QString const &searchTemplate) const
-        { return SubOpenSearchEngine::parseTemplate(searchTerm, searchTemplate); }
+    {
+        return SubOpenSearchEngine::parseTemplate(searchTerm, searchTemplate);
+    }
 
     void call_suggestions(QStringList const &suggestions)
-        { return SubOpenSearchEngine::suggestions(suggestions); }
+    {
+        return SubOpenSearchEngine::suggestions(suggestions);
+    }
 };
 
 class SuggestionsTestNetworkReply : public QNetworkReply
@@ -146,7 +154,7 @@ class SuggestionsTestNetworkReply : public QNetworkReply
     {
     }
 
-private slots:
+private Q_SLOTS:
     void sendSuggestions()
     {
         // Publish result
@@ -155,10 +163,10 @@ private slots:
         setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 200);
         setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, QByteArray("Ok"));
 
-        emit metaDataChanged();
-        emit readyRead();
-        emit downloadProgress(expectedResult.size(), expectedResult.size());
-        emit finished();
+        Q_EMIT metaDataChanged();
+        Q_EMIT readyRead();
+        Q_EMIT downloadProgress(expectedResult.size(), expectedResult.size());
+        Q_EMIT finished();
     }
 
 private:
@@ -285,7 +293,7 @@ void tst_OpenSearchEngine::description_data()
 {
     QTest::addColumn<QString>("description");
     QTest::newRow("null") << QString();
-    QTest::newRow("foo") << QString("foo");
+    QTest::newRow("foo") << QStringLiteral("foo");
 }
 
 // public QString description() const
@@ -324,7 +332,7 @@ void tst_OpenSearchEngine::image()
     QPixmap image(1, 1);
     image.fill();
     image.save(&imageBuffer, "PNG");
-    QString imageUrl = QString("data:image/png;base64,").append(imageBuffer.buffer().toBase64());
+    QString imageUrl = QStringLiteral("data:image/png;base64,").append(imageBuffer.buffer().toBase64());
     engine.setImageUrl(imageUrl);
     QCOMPARE(engine.image(), QImage());
 
@@ -346,7 +354,7 @@ void tst_OpenSearchEngine::imageUrl_data()
 {
     QTest::addColumn<QString>("imageUrl");
     QTest::newRow("null") << QString();
-    QTest::newRow("foo") << QString("foo");
+    QTest::newRow("foo") << QStringLiteral("foo");
 }
 
 // public QString imageUrl() const
@@ -375,9 +383,9 @@ void tst_OpenSearchEngine::isValid_data()
     QTest::addColumn<QString>("searchUrlTemplate");
     QTest::addColumn<bool>("isValid");
     QTest::newRow("false-0") << QString() << QString() << false;
-    QTest::newRow("false-1") << QString() << QString("x") << false;
-    QTest::newRow("false-2") << QString("x") << QString() << false;
-    QTest::newRow("true") << QString("x") << QString("y") << true;
+    QTest::newRow("false-1") << QString() << QStringLiteral("x") << false;
+    QTest::newRow("false-2") << QStringLiteral("x") << QString() << false;
+    QTest::newRow("true") << QStringLiteral("x") << QStringLiteral("y") << true;
 }
 
 // public bool isValid() const
@@ -404,7 +412,7 @@ void tst_OpenSearchEngine::name_data()
 {
     QTest::addColumn<QString>("name");
     QTest::newRow("null") << QString();
-    QTest::newRow("foo") << QString("foo");
+    QTest::newRow("foo") << QStringLiteral("foo");
 }
 
 // public QString name() const
@@ -452,13 +460,13 @@ void tst_OpenSearchEngine::operatorequal_data()
     QTest::newRow("null") << QString() << QString() << QString() << QString() << QString()
                           << Parameters() << Parameters()
                           << true;
-    QTest::newRow("name") << QString("x") << QString() << QString() << QString() << QString()
+    QTest::newRow("name") << QStringLiteral("x") << QString() << QString() << QString() << QString()
                           << Parameters() << Parameters()
                           << false;
-    QTest::newRow("description") << QString() << QString("x") << QString() << QString() << QString()
+    QTest::newRow("description") << QString() << QStringLiteral("x") << QString() << QString() << QString()
                           << Parameters() << Parameters()
                           << false;
-    QTest::newRow("imageUrl") << QString() << QString() << QString("x") << QString() << QString()
+    QTest::newRow("imageUrl") << QString() << QString() << QStringLiteral("x") << QString() << QString()
                           << Parameters() << Parameters()
                           << false;
     QTest::newRow("parameters") << QString() << QString() << QString() << QString() << QString()
@@ -496,7 +504,7 @@ void tst_OpenSearchEngine::providesSuggestions_data()
     QTest::addColumn<QString>("suggestionsUrlTemplate");
     QTest::addColumn<bool>("providesSuggestions");
     QTest::newRow("false") << QString() << false;
-    QTest::newRow("true") << QString("foo") << true;
+    QTest::newRow("true") << QStringLiteral("foo") << true;
 }
 
 // public bool providesSuggestions() const
@@ -523,9 +531,9 @@ void tst_OpenSearchEngine::requestSuggestions_data()
     QTest::addColumn<QString>("method");
     QTest::addColumn<QNetworkAccessManager::Operation>("lastOperation");
     QTest::newRow("null") << QString() << QString() << QNetworkAccessManager::GetOperation;
-    QTest::newRow("foo") << QString("foo") << QString("get") << QNetworkAccessManager::GetOperation;
-    QTest::newRow("bar") << QString("bar") << QString("post") << QNetworkAccessManager::PostOperation;
-    QTest::newRow("baz") << QString("baz") << QString("put") << QNetworkAccessManager::GetOperation;
+    QTest::newRow("foo") << QStringLiteral("foo") << QStringLiteral("get") << QNetworkAccessManager::GetOperation;
+    QTest::newRow("bar") << QStringLiteral("bar") << QStringLiteral("post") << QNetworkAccessManager::PostOperation;
+    QTest::newRow("baz") << QStringLiteral("baz") << QStringLiteral("put") << QNetworkAccessManager::GetOperation;
 }
 
 Q_DECLARE_METATYPE(QNetworkAccessManager::Operation)
@@ -619,13 +627,13 @@ void tst_OpenSearchEngine::searchUrl_data()
     QTest::addColumn<Parameters>("parameters");
     QTest::addColumn<QUrl>("searchUrl");
     QTest::newRow("null") << QString() << QString() << Parameters() << QUrl();
-    QTest::newRow("foo") << QString("foo") << QString("http://foobar.baz/?q={searchTerms}")
-                    << Parameters() << QUrl(QString("http://foobar.baz/?q=foo"));
-    QTest::newRow("empty") << QString() << QString("http://foobar.baz/?q={searchTerms}")
-                    << Parameters() << QUrl(QString("http://foobar.baz/?q="));
-    QTest::newRow("parameters") << QString("baz") << QString("http://foobar.baz/?q={searchTerms}")
+    QTest::newRow("foo") << QStringLiteral("foo") << QStringLiteral("http://foobar.baz/?q={searchTerms}")
+                    << Parameters() << QUrl(QStringLiteral("http://foobar.baz/?q=foo"));
+    QTest::newRow("empty") << QString() << QStringLiteral("http://foobar.baz/?q={searchTerms}")
+                    << Parameters() << QUrl(QStringLiteral("http://foobar.baz/?q="));
+    QTest::newRow("parameters") << QStringLiteral("baz") << QStringLiteral("http://foobar.baz/?q={searchTerms}")
                     << (Parameters() << Parameter("abc", "{searchTerms}") << Parameter("x", "yz"))
-                    << QUrl(QString("http://foobar.baz/?q=baz&abc=baz&x=yz"));
+                    << QUrl(QStringLiteral("http://foobar.baz/?q=baz&abc=baz&x=yz"));
 }
 
 // public QUrl searchUrl(QString const &searchTerm) const
@@ -647,7 +655,7 @@ void tst_OpenSearchEngine::searchUrlTemplate_data()
 {
     QTest::addColumn<QString>("searchUrlTemplate");
     QTest::newRow("null") << QString();
-    QTest::newRow("foo") << QString("foo");
+    QTest::newRow("foo") << QStringLiteral("foo");
 }
 
 // public QString searchUrlTemplate() const
@@ -702,13 +710,13 @@ void tst_OpenSearchEngine::suggestionsUrl_data()
     QTest::addColumn<Parameters>("parameters");
     QTest::addColumn<QUrl>("suggestionsUrl");
     QTest::newRow("null") << QString() << QString() << Parameters() << QUrl();
-    QTest::newRow("foo") << QString("foo") << QString("http://foobar.baz/?q={searchTerms}")
-                    << Parameters() << QUrl(QString("http://foobar.baz/?q=foo"));
-    QTest::newRow("empty") << QString() << QString("http://foobar.baz/?q={searchTerms}")
-                    << Parameters() << QUrl(QString("http://foobar.baz/?q="));
-    QTest::newRow("parameters") << QString("baz") << QString("http://foobar.baz/?q={searchTerms}")
+    QTest::newRow("foo") << QStringLiteral("foo") << QStringLiteral("http://foobar.baz/?q={searchTerms}")
+                    << Parameters() << QUrl(QStringLiteral("http://foobar.baz/?q=foo"));
+    QTest::newRow("empty") << QString() << QStringLiteral("http://foobar.baz/?q={searchTerms}")
+                    << Parameters() << QUrl(QStringLiteral("http://foobar.baz/?q="));
+    QTest::newRow("parameters") << QStringLiteral("baz") << QStringLiteral("http://foobar.baz/?q={searchTerms}")
                     << (Parameters() << Parameter("a", "bc"))
-                    << QUrl(QString("http://foobar.baz/?q=baz&a=bc"));
+                    << QUrl(QStringLiteral("http://foobar.baz/?q=baz&a=bc"));
 }
 
 // public QUrl suggestionsUrl(QString const &searchTerm) const
@@ -730,7 +738,7 @@ void tst_OpenSearchEngine::suggestionsUrlTemplate_data()
 {
     QTest::addColumn<QString>("suggestionsUrlTemplate");
     QTest::newRow("null") << QString();
-    QTest::newRow("foo") << QString("foo");
+    QTest::newRow("foo") << QStringLiteral("foo");
 }
 
 // public QString suggestionsUrlTemplate() const
@@ -752,33 +760,33 @@ void tst_OpenSearchEngine::suggestionsUrlTemplate()
 
 void tst_OpenSearchEngine::parseTemplate_data()
 {
-    QString lang = QLocale().name().replace(QLatin1Char('_'), QLatin1Char('-'));
+    QString lang = QLocale().name().replace(QChar('_'), QChar('-'));
 
     QTest::addColumn<QString>("searchTerm");
     QTest::addColumn<QString>("searchTemplate");
     QTest::addColumn<QString>("parseTemplate");
     QTest::addColumn<bool>("valid");
     QTest::newRow("null") << QString() << QString() << QString() << false;
-    QTest::newRow("foo") << QString("foo") << QString("http://foobar.baz/?q={searchTerms}")
-                    << QString("http://foobar.baz/?q=foo") << true;
-    QTest::newRow("allParameters") << QString("bar")
-                    << QString("http://foobar.baz/?st={searchTerms}&amp;c={count}"
+    QTest::newRow("foo") << QStringLiteral("foo") << QStringLiteral("http://foobar.baz/?q={searchTerms}")
+                    << QStringLiteral("http://foobar.baz/?q=foo") << true;
+    QTest::newRow("allParameters") << QStringLiteral("bar")
+                    << QStringLiteral("http://foobar.baz/?st={searchTerms}&amp;c={count}"
                                "&amp;si={startIndex}&amp;sp={startPage}&amp;l={language}"
                                "&amp;ie={inputEncoding}&amp;oe={outputEncoding}")
-                    << QString("http://foobar.baz/?st=bar&amp;c=20&amp;si=0&amp;"
+                    << QStringLiteral("http://foobar.baz/?st=bar&amp;c=20&amp;si=0&amp;"
                                "sp=0&amp;l=%1&amp;ie=UTF-8&amp;oe=UTF-8").arg(lang)
                     << true;
-    QTest::newRow("tricky") << QString("{count}") << QString("http://foobar.baz/q={searchTerms}&amp;count={count}")
-                    << QString("http://foobar.baz/q=%7Bcount%7D&amp;count=20") << true;
-    QTest::newRow("multiple") << QString("abc") << QString("http://foobar.baz/?q={searchTerms}&amp;x={searchTerms}")
-                    << QString("http://foobar.baz/?q=abc&amp;x=abc") << true;
-    QTest::newRow("referrer") << QString("foo")
-                    << QString("http://foobar.baz/?q={searchTerms}&amp;a={source}&amp;b={ref:source}&amp;c={referrer:source?}")
-                    << QString("http://foobar.baz/?q=foo&amp;a=tst_opensearchengine"
+    QTest::newRow("tricky") << QStringLiteral("{count}") << QStringLiteral("http://foobar.baz/q={searchTerms}&amp;count={count}")
+                    << QStringLiteral("http://foobar.baz/q=%7Bcount%7D&amp;count=20") << true;
+    QTest::newRow("multiple") << QStringLiteral("abc") << QStringLiteral("http://foobar.baz/?q={searchTerms}&amp;x={searchTerms}")
+                    << QStringLiteral("http://foobar.baz/?q=abc&amp;x=abc") << true;
+    QTest::newRow("referrer") << QStringLiteral("foo")
+                    << QStringLiteral("http://foobar.baz/?q={searchTerms}&amp;a={source}&amp;b={ref:source}&amp;c={referrer:source?}")
+                    << QStringLiteral("http://foobar.baz/?q=foo&amp;a=tst_opensearchengine"
                                "&amp;b=tst_opensearchengine&amp;c=tst_opensearchengine")
                     << true;
-    QTest::newRow("inputEncoding") << QString("c++") << QString("http://foobar.baz/?q={searchTerms}")
-                    << QString("http://foobar.baz/?q=c%2B%2B") << true;
+    QTest::newRow("inputEncoding") << QStringLiteral("c++") << QStringLiteral("http://foobar.baz/?q={searchTerms}")
+                    << QStringLiteral("http://foobar.baz/?q=c%2B%2B") << true;
 }
 
 // protected QString parseTemplate(QString const &searchTerm, QString const &searchTemplate) const
@@ -800,8 +808,8 @@ void tst_OpenSearchEngine::languageCodes_data()
     QTest::addColumn<QString>("languageCode");
     QTest::addColumn<QString>("url");
 
-    QTest::newRow("es") << QString("es") << QString("http://foobar.baz/?l=es-ES");
-    QTest::newRow("pt_BR") << QString("pt_BR") << QString("http://foobar.baz/?l=pt-BR");
+    QTest::newRow("es") << QStringLiteral("es") << QStringLiteral("http://foobar.baz/?l=es-ES");
+    QTest::newRow("pt_BR") << QStringLiteral("pt_BR") << QStringLiteral("http://foobar.baz/?l=pt-BR");
 }
 
 void tst_OpenSearchEngine::languageCodes()
@@ -812,66 +820,66 @@ void tst_OpenSearchEngine::languageCodes()
     QLocale::setDefault(QLocale(languageCode));
 
     SubOpenSearchEngine engine;
-    QCOMPARE(engine.call_parseTemplate(QString("foo"), QString("http://foobar.baz/?l={language}")), url);
+    QCOMPARE(engine.call_parseTemplate(QStringLiteral("foo"), QStringLiteral("http://foobar.baz/?l={language}")), url);
 }
 
 void tst_OpenSearchEngine::requestMethods()
 {
     SubOpenSearchEngine engine;
 
-    QCOMPARE(engine.searchMethod(), QString("get"));
-    QCOMPARE(engine.suggestionsMethod(), QString("get"));
+    QCOMPARE(engine.searchMethod(), QStringLiteral("get"));
+    QCOMPARE(engine.suggestionsMethod(), QStringLiteral("get"));
 
     engine.setSearchMethod("post");
-    QCOMPARE(engine.searchMethod(), QString("post"));
-    QCOMPARE(engine.suggestionsMethod(), QString("get"));
+    QCOMPARE(engine.searchMethod(), QStringLiteral("post"));
+    QCOMPARE(engine.suggestionsMethod(), QStringLiteral("get"));
 
     engine.setSearchMethod("get");
-    QCOMPARE(engine.searchMethod(), QString("get"));
-    QCOMPARE(engine.suggestionsMethod(), QString("get"));
+    QCOMPARE(engine.searchMethod(), QStringLiteral("get"));
+    QCOMPARE(engine.suggestionsMethod(), QStringLiteral("get"));
 
     engine.setSuggestionsMethod("PoSt");
-    QCOMPARE(engine.searchMethod(), QString("get"));
-    QCOMPARE(engine.suggestionsMethod(), QString("post"));
+    QCOMPARE(engine.searchMethod(), QStringLiteral("get"));
+    QCOMPARE(engine.suggestionsMethod(), QStringLiteral("post"));
 
     engine.setSearchMethod("foo");
-    QCOMPARE(engine.searchMethod(), QString("get"));
-    QCOMPARE(engine.suggestionsMethod(), QString("post"));
+    QCOMPARE(engine.searchMethod(), QStringLiteral("get"));
+    QCOMPARE(engine.suggestionsMethod(), QStringLiteral("post"));
 
     engine.setSuggestionsMethod("bar");
-    QCOMPARE(engine.searchMethod(), QString("get"));
-    QCOMPARE(engine.suggestionsMethod(), QString("post"));
+    QCOMPARE(engine.searchMethod(), QStringLiteral("get"));
+    QCOMPARE(engine.suggestionsMethod(), QStringLiteral("post"));
 }
 
 void tst_OpenSearchEngine::delegate()
 {
     SubOpenSearchEngine engine;
-    engine.setName(QString("foo"));
-    engine.setDescription(QString("bar"));
-    engine.setSearchUrlTemplate(QString("http://foobar.baz/?q={searchTerms}"));
+    engine.setName(QStringLiteral("foo"));
+    engine.setDescription(QStringLiteral("bar"));
+    engine.setSearchUrlTemplate(QStringLiteral("http://foobar.baz/?q={searchTerms}"));
 
     QCOMPARE(engine.delegate(), (Delegate*)0);
     engine.setDelegate(0);
     QCOMPARE(engine.delegate(), (Delegate*)0);
-    engine.requestSearchResults(QString("baz"));
+    engine.requestSearchResults(QStringLiteral("baz"));
 
     Delegate delegate;
     engine.setDelegate(&delegate);
     QCOMPARE(engine.delegate(), &delegate);
-    engine.requestSearchResults(QString("baz"));
+    engine.requestSearchResults(QStringLiteral("baz"));
 
     QCOMPARE(delegate.callsCount, 1);
     QCOMPARE(delegate.lastOperation, QNetworkAccessManager::GetOperation);
     QCOMPARE(delegate.lastData, QByteArray());
-    QNetworkRequest request(QUrl(engine.call_parseTemplate(QString("baz"), engine.searchUrlTemplate())));
+    QNetworkRequest request(QUrl(engine.call_parseTemplate(QStringLiteral("baz"), engine.searchUrlTemplate())));
     QCOMPARE(delegate.lastRequest, request);
 
     QUrlQuery urlQuery(delegate.lastRequest.url().query());
     QVERIFY(urlQuery.hasQueryItem("q"));
-    QCOMPARE(urlQuery.queryItemValue("q"), QString("baz"));
+    QCOMPARE(urlQuery.queryItemValue("q"), QStringLiteral("baz"));
 
     engine.setSearchParameters(Parameters() << Parameter("a", "b") << Parameter("b", "c"));
-    engine.requestSearchResults(QString("baz"));
+    engine.requestSearchResults(QStringLiteral("baz"));
 
     QCOMPARE(delegate.callsCount, 2);
     QCOMPARE(delegate.lastOperation, QNetworkAccessManager::GetOperation);
@@ -879,26 +887,26 @@ void tst_OpenSearchEngine::delegate()
 
     QUrlQuery q2(delegate.lastRequest.url().query());
     QVERIFY(q2.hasQueryItem("a"));
-    QCOMPARE(q2.queryItemValue("a"), QString("b"));
+    QCOMPARE(q2.queryItemValue("a"), QStringLiteral("b"));
     QVERIFY(q2.hasQueryItem("b"));
-    QCOMPARE(q2.queryItemValue("b"), QString("c"));
+    QCOMPARE(q2.queryItemValue("b"), QStringLiteral("c"));
     QVERIFY(q2.hasQueryItem("q"));
-    QCOMPARE(q2.queryItemValue("q"), QString("baz"));
+    QCOMPARE(q2.queryItemValue("q"), QStringLiteral("baz"));
 
-    QUrl url(engine.call_parseTemplate(QString("baz"), engine.searchUrlTemplate()));
+    QUrl url(engine.call_parseTemplate(QStringLiteral("baz"), engine.searchUrlTemplate()));
     QCOMPARE(delegate.lastRequest.url().toString(QUrl::RemoveQuery), url.toString(QUrl::RemoveQuery));
 
-    engine.setSearchMethod(QString("post"));
-    engine.requestSearchResults(QString("baz"));
+    engine.setSearchMethod(QStringLiteral("post"));
+    engine.requestSearchResults(QStringLiteral("baz"));
 
     QCOMPARE(delegate.callsCount, 3);
     QCOMPARE(delegate.lastOperation, QNetworkAccessManager::PostOperation);
-    request = QNetworkRequest(QUrl(engine.call_parseTemplate(QString("baz"), engine.searchUrlTemplate())));
+    request = QNetworkRequest(QUrl(engine.call_parseTemplate(QStringLiteral("baz"), engine.searchUrlTemplate())));
     QCOMPARE(delegate.lastRequest, request);
 
     QUrlQuery q3(delegate.lastRequest.url().query());
     QVERIFY(q3.hasQueryItem("q"));
-    QCOMPARE(q3.queryItemValue("q"), QString("baz"));
+    QCOMPARE(q3.queryItemValue("q"), QStringLiteral("baz"));
 
     QVERIFY(!delegate.lastData.isEmpty());
     QStringList query = QString(delegate.lastData).split('&');
diff --git a/autotests/opensearchmanager/CMakeLists.txt b/autotests/opensearchmanager/CMakeLists.txt
new file mode 100644
index 00000000..5d48e071
--- /dev/null
+++ b/autotests/opensearchmanager/CMakeLists.txt
@@ -0,0 +1,10 @@
+project(test-opensearchmanager)
+find_package(Qt5Test REQUIRED)
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../modeltest
+)
+
+
+add_executable(test-opensearchmanager tst_opensearchmanager.cpp)
+target_link_libraries(test-opensearchmanager endorphin-base Qt5::Test)
\ No newline at end of file
diff --git a/autotests/opensearchmanager/opensearchmanager.pro b/autotests/opensearchmanager/opensearchmanager.pro
deleted file mode 100644
index 8ba76ebd..00000000
--- a/autotests/opensearchmanager/opensearchmanager.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-SOURCES += \
-    tst_opensearchmanager.cpp
\ No newline at end of file
diff --git a/autotests/opensearchmanager/tst_opensearchmanager.cpp b/autotests/opensearchmanager/tst_opensearchmanager.cpp
index 6f060533..03264af3 100644
--- a/autotests/opensearchmanager/tst_opensearchmanager.cpp
+++ b/autotests/opensearchmanager/tst_opensearchmanager.cpp
@@ -28,13 +28,13 @@ class tst_OpenSearchManager : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void addRemoveEngine_data();
     void addRemoveEngine();
     void setCurrentEngine_data();
@@ -68,7 +68,7 @@ void tst_OpenSearchManager::initTestCase()
     QCoreApplication::setApplicationName("opensearchtest");
 
     SubOpenSearchManager manager;
-    foreach (const QString &name, manager.allEnginesNames())
+    Q_FOREACH (const QString &name, manager.allEnginesNames())
         manager.removeEngine(name);
     QCOMPARE(manager.enginesCount(), 1);
 }
@@ -92,7 +92,7 @@ void tst_OpenSearchManager::init()
 void tst_OpenSearchManager::cleanup()
 {
     SubOpenSearchManager manager;
-    foreach (const QString &name, manager.allEnginesNames())
+    Q_FOREACH (const QString &name, manager.allEnginesNames())
         manager.removeEngine(name);
     QCOMPARE(manager.enginesCount(), 1);
 }
@@ -214,7 +214,7 @@ void tst_OpenSearchManager::restoreDefaults()
     manager.restoreDefaults();
     QCOMPARE(manager.enginesCount(), manager.defaultCount());
 
-    foreach (const QString &name, manager.allEnginesNames())
+    Q_FOREACH (const QString &name, manager.allEnginesNames())
         manager.removeEngine(name);
 
     // Never let the manager have no engines.
diff --git a/autotests/opensearchreader/CMakeLists.txt b/autotests/opensearchreader/CMakeLists.txt
new file mode 100644
index 00000000..e8360569
--- /dev/null
+++ b/autotests/opensearchreader/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(test-opensearchreader)
+find_package(Qt5Test REQUIRED)
+
+QT5_ADD_RESOURCES(RSCS opensearchreader.qrc)
+
+add_executable(test-opensearchreader tst_opensearchreader.cpp ${RSCS})
+target_link_libraries(test-opensearchreader endorphin-base Qt5::Test)
\ No newline at end of file
diff --git a/autotests/opensearchreader/opensearchreader.pro b/autotests/opensearchreader/opensearchreader.pro
deleted file mode 100644
index 392567a3..00000000
--- a/autotests/opensearchreader/opensearchreader.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-SOURCES = \
-    opensearchengine.cpp \
-    opensearchreader.cpp \
-    tst_opensearchreader.cpp
-
-HEADERS = \
-    opensearchengine.h \
-    opensearchreader.h
-
-FORMS =
-
-RESOURCES = \
-    opensearchreader.qrc
-
diff --git a/autotests/opensearchreader/tst_opensearchreader.cpp b/autotests/opensearchreader/tst_opensearchreader.cpp
index 21692a48..dad38752 100644
--- a/autotests/opensearchreader/tst_opensearchreader.cpp
+++ b/autotests/opensearchreader/tst_opensearchreader.cpp
@@ -26,13 +26,13 @@ class tst_OpenSearchReader : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void read_data();
     void read();
 };
@@ -74,38 +74,38 @@ void tst_OpenSearchReader::read_data()
     QTest::addColumn<QString>("searchMethod");
     QTest::addColumn<QString>("suggestionsMethod");
 
-    QTest::newRow("null") << QString(":/doesNotExist") << false << QString() << QString() << QString() << QString()
-            << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QString("get") << QString("get");
+    QTest::newRow("null") << QStringLiteral(":/doesNotExist") << false << QString() << QString() << QString() << QString()
+            << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QStringLiteral("get") << QStringLiteral("get");
 
-    QTest::newRow("testfile1") << QString(":/testfile1.xml") << true << QString("Wikipedia (en)")
-            << QString("Full text search in the English Wikipedia") << QString("http://en.wikipedia.org/bar")
-            << QString("http://en.wikipedia.org/foo") << QString("http://en.wikipedia.org/favicon.ico")
-            << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QString("post") << QString("get");
+    QTest::newRow("testfile1") << QStringLiteral(":/testfile1.xml") << true << QStringLiteral("Wikipedia (en)")
+            << QStringLiteral("Full text search in the English Wikipedia") << QStringLiteral("http://en.wikipedia.org/bar")
+            << QStringLiteral("http://en.wikipedia.org/foo") << QStringLiteral("http://en.wikipedia.org/favicon.ico")
+            << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QStringLiteral("post") << QStringLiteral("get");
 
-    QTest::newRow("testfile2") << QString(":/testfile2.xml") << false << QString("Wikipedia (en)")
-            << QString() << QString() << QString("http://en.wikipedia.org/foo") << QString("http://en.wikipedia.org/favicon.ico")
-            << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QString("get") << QString("get");
+    QTest::newRow("testfile2") << QStringLiteral(":/testfile2.xml") << false << QStringLiteral("Wikipedia (en)")
+            << QString() << QString() << QStringLiteral("http://en.wikipedia.org/foo") << QStringLiteral("http://en.wikipedia.org/favicon.ico")
+            << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QStringLiteral("get") << QStringLiteral("get");
 
-    QTest::newRow("testfile3") << QString(":/testfile3.xml") << true << QString("GitHub") << QString("Search GitHub")
-            << QString("http://github.com/search") << QString("http://github.com/suggestions") << QString()
-            << (OpenSearchEngine::Parameters() << OpenSearchEngine::Parameter(QString("q"), QString("{searchTerms}"))
-                                               << OpenSearchEngine::Parameter(QString("b"), QString("foo")))
-            << (OpenSearchEngine::Parameters() << OpenSearchEngine::Parameter(QString("bar"), QString("baz")))
-            << QString("get") << QString("post");
+    QTest::newRow("testfile3") << QStringLiteral(":/testfile3.xml") << true << QStringLiteral("GitHub") << QStringLiteral("Search GitHub")
+            << QStringLiteral("http://github.com/search") << QStringLiteral("http://github.com/suggestions") << QString()
+            << (OpenSearchEngine::Parameters() << OpenSearchEngine::Parameter(QStringLiteral("q"), QStringLiteral("{searchTerms}"))
+                                               << OpenSearchEngine::Parameter(QStringLiteral("b"), QStringLiteral("foo")))
+            << (OpenSearchEngine::Parameters() << OpenSearchEngine::Parameter(QStringLiteral("bar"), QStringLiteral("baz")))
+            << QStringLiteral("get") << QStringLiteral("post");
 
-    QTest::newRow("testfile4") << QString(":/testfile4.xml") << true << QString("Google") << QString("Google Web Search")
-            << QString("http://www.google.com/search?bar") << QString("http://suggestqueries.google.com/complete/foo")
-            << QString("http://www.google.com/favicon.ico") << OpenSearchEngine::Parameters()
-            << OpenSearchEngine::Parameters() << QString("get") << QString("get");
+    QTest::newRow("testfile4") << QStringLiteral(":/testfile4.xml") << true << QStringLiteral("Google") << QStringLiteral("Google Web Search")
+            << QStringLiteral("http://www.google.com/search?bar") << QStringLiteral("http://suggestqueries.google.com/complete/foo")
+            << QStringLiteral("http://www.google.com/favicon.ico") << OpenSearchEngine::Parameters()
+            << OpenSearchEngine::Parameters() << QStringLiteral("get") << QStringLiteral("get");
 
-    QTest::newRow("testfile5") << QString(":/testfile5.xml") << false << QString() << QString() << QString() << QString()
-            << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QString("get") << QString("get");
+    QTest::newRow("testfile5") << QStringLiteral(":/testfile5.xml") << false << QString() << QString() << QString() << QString()
+            << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters() << QStringLiteral("get") << QStringLiteral("get");
 
-    QTest::newRow("testfile6") << QString(":/testfile6.xml") << false << QString() << QString() << QString() << QString()
-            << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters()  << QString("get") << QString("get");
+    QTest::newRow("testfile6") << QStringLiteral(":/testfile6.xml") << false << QString() << QString() << QString() << QString()
+            << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters()  << QStringLiteral("get") << QStringLiteral("get");
 
-    QTest::newRow("testfile7") << QString(":/testfile7.xml") << false << QString() << QString() << QString() << QString()
-            << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters()  << QString("get") << QString("get");
+    QTest::newRow("testfile7") << QStringLiteral(":/testfile7.xml") << false << QString() << QString() << QString() << QString()
+            << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters()  << QStringLiteral("get") << QStringLiteral("get");
 }
 
 void tst_OpenSearchReader::read()
diff --git a/autotests/opensearchwriter/CMakeLists.txt b/autotests/opensearchwriter/CMakeLists.txt
new file mode 100644
index 00000000..0adb0a99
--- /dev/null
+++ b/autotests/opensearchwriter/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(test-opensearchwriter)
+find_package(Qt5Test REQUIRED)
+
+QT5_ADD_RESOURCES(RSCS opensearchwriter.qrc)
+
+add_executable(test-opensearchwriter tst_opensearchwriter.cpp ${RSCS})
+target_link_libraries(test-opensearchwriter endorphin-base Qt5::Test)
diff --git a/autotests/opensearchwriter/opensearchwriter.pro b/autotests/opensearchwriter/opensearchwriter.pro
deleted file mode 100644
index 13ffaff7..00000000
--- a/autotests/opensearchwriter/opensearchwriter.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-SOURCES = \
-    opensearchengine.cpp \
-    opensearchwriter.cpp \
-    tst_opensearchwriter.cpp
-
-HEADERS = \
-    opensearchengine.h \
-    opensearchwriter.h
-
-FORMS =
-
-RESOURCES = \
-    opensearchwriter.qrc
-
diff --git a/autotests/opensearchwriter/tst_opensearchwriter.cpp b/autotests/opensearchwriter/tst_opensearchwriter.cpp
index 4aba40fb..da305381 100644
--- a/autotests/opensearchwriter/tst_opensearchwriter.cpp
+++ b/autotests/opensearchwriter/tst_opensearchwriter.cpp
@@ -26,13 +26,13 @@ class tst_OpenSearchWriter : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void write_data();
     void write();
 };
@@ -73,20 +73,20 @@ void tst_OpenSearchWriter::write_data()
     QTest::addColumn<QString>("suggestionsMethod");
     QTest::addColumn<QString>("fileName");
 
-    QTest::newRow("testfile1") << QString("Foo Bar") << QString("Bar Foo") << QString("http://foobar.barfoo/search") << QString()
+    QTest::newRow("testfile1") << QStringLiteral("Foo Bar") << QStringLiteral("Bar Foo") << QStringLiteral("http://foobar.barfoo/search") << QString()
             << QString() << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters()
-            << QString() << QString("get") << QString(":/testfile1.xml");
+            << QString() << QStringLiteral("get") << QStringLiteral(":/testfile1.xml");
 
-    QTest::newRow("testfile2") << QString("Endorphin!") << QString("a cross platform web browser built using Qt and WebKit")
-            << QString("http://foobar.barfoo/search") << QString("http://foobar.barfoo/suggest") << QString()
+    QTest::newRow("testfile2") << QStringLiteral("Endorphin!") << QStringLiteral("a cross platform web browser built using Qt and WebKit")
+            << QStringLiteral("http://foobar.barfoo/search") << QStringLiteral("http://foobar.barfoo/suggest") << QString()
             << OpenSearchEngine::Parameters() << OpenSearchEngine::Parameters()
-            << QString("get") << QString("post") << QString(":/testfile2.xml");
+            << QStringLiteral("get") << QStringLiteral("post") << QStringLiteral(":/testfile2.xml");
 
-    QTest::newRow("testile3") << QString("Foo Bar") << QString("Bar Foo") << QString("http://foobar.barfoo/search")
-            << QString("http://foobar.barfoo/suggest") << QString()
+    QTest::newRow("testile3") << QStringLiteral("Foo Bar") << QStringLiteral("Bar Foo") << QStringLiteral("http://foobar.barfoo/search")
+            << QStringLiteral("http://foobar.barfoo/suggest") << QString()
             << (OpenSearchEngine::Parameters() << OpenSearchEngine::Parameter("q", "{searchTerms}") << OpenSearchEngine::Parameter("a", "foo"))
             << (OpenSearchEngine::Parameters() << OpenSearchEngine::Parameter("q", "{searchTerms}"))
-            << QString("post") << QString("foo") << QString(":/testfile3.xml");
+            << QStringLiteral("post") << QStringLiteral("foo") << QStringLiteral(":/testfile3.xml");
 }
 
 void tst_OpenSearchWriter::write()
diff --git a/autotests/qtest_endorphin.h b/autotests/qtest_endorphin.h
index fa6bd9db..2312ee40 100644
--- a/autotests/qtest_endorphin.h
+++ b/autotests/qtest_endorphin.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/autotests/qtry.h b/autotests/qtry.h
index db402728..759fc5a2 100644
--- a/autotests/qtry.h
+++ b/autotests/qtry.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008 - 2009, Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/autotests/searchlineedit/CMakeLists.txt b/autotests/searchlineedit/CMakeLists.txt
new file mode 100644
index 00000000..9fb04fb5
--- /dev/null
+++ b/autotests/searchlineedit/CMakeLists.txt
@@ -0,0 +1,34 @@
+project(test-searchlineedit)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5WebEngine REQUIRED)
+find_package(Qt5WebEngineWidgets REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC_SEARCH_PATHS
+	${CMAKE_CURRENT_SOURCE_DIR}/..
+	${CMAKE_CURRENT_SOURCE_DIR}/../../src
+	${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
+)
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
+	${RUNTIME_OUTPUT_DIRECTORY}
+)
+add_definitions(-DNO_BROWSERAPPLICATION)
+add_definitions(-DFOR_AUTOTEST)
+set(SRCS
+	tst_searchlineedit.cpp
+	../../src/clearbutton.cpp
+	../../src/searchbutton.cpp
+	../../src/searchlineedit.cpp
+	../../src/utils/lineedit.cpp
+)
+
+add_executable(test-searchlineedit ${SRCS} ${UIS} ${MOCS})
+target_link_libraries(test-searchlineedit Qt5::Core Qt5::Test Qt5::Widgets Qt5::WebEngine Qt5::WebEngineWidgets)
diff --git a/autotests/searchlineedit/searchlineedit.pro b/autotests/searchlineedit/searchlineedit.pro
deleted file mode 100644
index 10414922..00000000
--- a/autotests/searchlineedit/searchlineedit.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_searchlineedit.cpp
diff --git a/autotests/searchlineedit/tst_searchlineedit.cpp b/autotests/searchlineedit/tst_searchlineedit.cpp
index 245249e1..295df24c 100644
--- a/autotests/searchlineedit/tst_searchlineedit.cpp
+++ b/autotests/searchlineedit/tst_searchlineedit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -24,13 +24,13 @@ class tst_SearchLineEdit : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void searchlineedit_data();
     void searchlineedit();
 };
@@ -38,7 +38,8 @@ private slots:
 // Subclass that exposes the protected functions.
 class SubSearchLineEdit : public SearchLineEdit
 {
-public:};
+public:
+};
 
 // This will be called before the first test function is executed.
 // It is only called once.
diff --git a/autotests/tabbar/CMakeLists.txt b/autotests/tabbar/CMakeLists.txt
new file mode 100644
index 00000000..67aa5db7
--- /dev/null
+++ b/autotests/tabbar/CMakeLists.txt
@@ -0,0 +1,6 @@
+project(test-tabbar)
+find_package(Qt5Test REQUIRED)
+
+add_executable(test-tabbar tst_tabbar.cpp)
+target_link_libraries(test-tabbar endorphin-base Qt5::Test)
+
diff --git a/autotests/tabbar/tabbar.pro b/autotests/tabbar/tabbar.pro
deleted file mode 100644
index 880ee086..00000000
--- a/autotests/tabbar/tabbar.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += . ../
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_tabbar.cpp
-HEADERS +=
diff --git a/autotests/tabbar/tst_tabbar.cpp b/autotests/tabbar/tst_tabbar.cpp
index aa173062..3e14858c 100644
--- a/autotests/tabbar/tst_tabbar.cpp
+++ b/autotests/tabbar/tst_tabbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@ class tst_TabBar : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void tabbar_data();
     void tabbar();
 
@@ -48,40 +48,64 @@ class SubTabBar : public TabBar
 {
 public:
     void call_cloneTab(int index)
-        { return SubTabBar::cloneTab(index); }
+    {
+        return SubTabBar::cloneTab(index);
+    }
 
     void call_closeOtherTabs(int index)
-        { return SubTabBar::closeOtherTabs(index); }
+    {
+        return SubTabBar::closeOtherTabs(index);
+    }
 
     void call_closeTab(int index)
-        { return SubTabBar::closeTab(index); }
+    {
+        return SubTabBar::closeTab(index);
+    }
 
     void call_dragEnterEvent(QDragEnterEvent *event)
-        { return SubTabBar::dragEnterEvent(event); }
+    {
+        return SubTabBar::dragEnterEvent(event);
+    }
 
     void call_dropEvent(QDropEvent *event)
-        { return SubTabBar::dropEvent(event); }
+    {
+        return SubTabBar::dropEvent(event);
+    }
 
     void call_mouseMoveEvent(QMouseEvent *event)
-        { return SubTabBar::mouseMoveEvent(event); }
+    {
+        return SubTabBar::mouseMoveEvent(event);
+    }
 
     void call_mousePressEvent(QMouseEvent *event)
-        { return SubTabBar::mousePressEvent(event); }
+    {
+        return SubTabBar::mousePressEvent(event);
+    }
 
     void call_newTab()
-        { return SubTabBar::newTab(); }
+    {
+        return SubTabBar::newTab();
+    }
 
     void call_reloadAllTabs()
-        { return SubTabBar::reloadAllTabs(); }
+    {
+        return SubTabBar::reloadAllTabs();
+    }
 
     void call_reloadTab(int index)
-        { return SubTabBar::reloadTab(index); }
+    {
+        return SubTabBar::reloadTab(index);
+    }
 
     void call_tabLayoutChange()
-        { return SubTabBar::tabLayoutChange(); }
+    {
+        return SubTabBar::tabLayoutChange();
+    }
 
     QSize call_tabSizeHint(int index) const
-        { return SubTabBar::tabSizeHint(index); }
+    {
+        return SubTabBar::tabSizeHint(index);
+    }
 };
 
 // This will be called before the first test function is executed.
@@ -136,7 +160,7 @@ void tst_TabBar::showTabBarWhenOneTab()
     bar.setShowTabBarWhenOneTab(showTabBarWhenOneTab);
     QAction *action = bar.viewTabBarAction();
     QVERIFY(action);
-    QCOMPARE(action->text(), (showTabBarWhenOneTab ? QString("Hide Tab Bar") : QString("Show Tab Bar")));
+    QCOMPARE(action->text(), (showTabBarWhenOneTab ? QStringLiteral("Hide Tab Bar") : QStringLiteral("Show Tab Bar")));
     QCOMPARE(bar.showTabBarWhenOneTab(), showTabBarWhenOneTab);
 
     bar.addTab("one");
@@ -146,14 +170,14 @@ void tst_TabBar::showTabBarWhenOneTab()
     bar.addTab("two");
     QCOMPARE(bar.count(), 2);
     QCOMPARE(bar.isVisible(), true);
-    QCOMPARE(action->text(), QString("Hide Tab Bar"));
+    QCOMPARE(action->text(), QStringLiteral("Hide Tab Bar"));
     QCOMPARE(action->isEnabled(), false);
 
     bar.removeTab(0);
     QCOMPARE(bar.count(), 1);
     QCOMPARE(bar.isVisible(), showTabBarWhenOneTab);
     QCOMPARE(action->isEnabled(), true);
-    QCOMPARE(action->text(), (showTabBarWhenOneTab ? QString("Hide Tab Bar") : QString("Show Tab Bar")));
+    QCOMPARE(action->text(), (showTabBarWhenOneTab ? QStringLiteral("Hide Tab Bar") : QStringLiteral("Show Tab Bar")));
 }
 
 void tst_TabBar::tabSizeHint_data()
diff --git a/autotests/tabwidget/CMakeLists.txt b/autotests/tabwidget/CMakeLists.txt
new file mode 100644
index 00000000..ff8ec540
--- /dev/null
+++ b/autotests/tabwidget/CMakeLists.txt
@@ -0,0 +1,9 @@
+project(test-tabwidget)
+find_package(Qt5Test REQUIRED)
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../modeltest
+)
+
+add_executable(test-tabwidget tst_tabwidget.cpp)
+target_link_libraries(test-tabwidget endorphin-base Qt5::Test)
diff --git a/autotests/tabwidget/tabwidget.pro b/autotests/tabwidget/tabwidget.pro
deleted file mode 100644
index b8d1e608..00000000
--- a/autotests/tabwidget/tabwidget.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += . ../
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_tabwidget.cpp
-HEADERS +=
diff --git a/autotests/tabwidget/tst_tabwidget.cpp b/autotests/tabwidget/tst_tabwidget.cpp
index a59ee908..8e1d526f 100644
--- a/autotests/tabwidget/tst_tabwidget.cpp
+++ b/autotests/tabwidget/tst_tabwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -30,13 +30,13 @@ class tst_TabWidget : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void tabwidget_data();
     void tabwidget();
     void addWebAction_data();
@@ -78,19 +78,29 @@ class SubTabWidget : public TabWidget
 {
 public:
     void call_linkHovered(QString const &link)
-        { return SubTabWidget::linkHovered(link); }
+    {
+        return SubTabWidget::linkHovered(link);
+    }
 
     void call_loadProgress(int progress)
-        { return SubTabWidget::loadProgress(progress); }
+    {
+        return SubTabWidget::loadProgress(progress);
+    }
 
     void call_setCurrentTitle(QString const &url)
-        { return SubTabWidget::setCurrentTitle(url); }
+    {
+        return SubTabWidget::setCurrentTitle(url);
+    }
 
     void call_showStatusBarMessage(QString const &message)
-        { return SubTabWidget::showStatusBarMessage(message); }
+    {
+        return SubTabWidget::showStatusBarMessage(message);
+    }
 
     void call_tabsChanged()
-        { return SubTabWidget::tabsChanged(); }
+    {
+        return SubTabWidget::tabsChanged();
+    }
 };
 
 // This will be called before the first test function is executed.
@@ -122,7 +132,7 @@ void tst_TabWidget::tabwidget_data()
 void tst_TabWidget::tabwidget()
 {
     SubTabWidget widget;
-    widget.addWebAction((QAction*)0, QWebPage::Back);
+    widget.addWebAction((QAction*)0, QWebEnginePage::Back);
     widget.closeTab();
     QVERIFY(widget.closeTabAction());
     widget.currentWebView();
@@ -138,17 +148,17 @@ void tst_TabWidget::tabwidget()
     QVERIFY(widget.currentLocationBar());
 }
 
-Q_DECLARE_METATYPE(QWebPage::WebAction)
+Q_DECLARE_METATYPE(QWebEnginePage::WebAction)
 void tst_TabWidget::addWebAction_data()
 {
-    QTest::addColumn<QWebPage::WebAction>("webAction");
-    QTest::newRow("back") << QWebPage::Back;
+    QTest::addColumn<QWebEnginePage::WebAction>("webAction");
+    QTest::newRow("back") << QWebEnginePage::Back;
 }
 
-// public void addWebAction(QAction *action, QWebPage::WebAction webAction)
+// public void addWebAction(QAction *action, QWebEnginePage::WebAction webAction)
 void tst_TabWidget::addWebAction()
 {
-    QFETCH(QWebPage::WebAction, webAction);
+    QFETCH(QWebEnginePage::WebAction, webAction);
 
     SubTabWidget widget;
 
@@ -497,7 +507,7 @@ void tst_TabWidget::recentlyClosedTabsAction()
 void tst_TabWidget::linkHovered_data()
 {
     QTest::addColumn<QString>("link");
-    QTest::newRow("null") << QString("foo");
+    QTest::newRow("null") << QStringLiteral("foo");
 }
 
 // protected void linkHovered(QString const &link)
@@ -563,7 +573,7 @@ void tst_TabWidget::loadProgress(int)
 void tst_TabWidget::setCurrentTitle_data()
 {
     QTest::addColumn<QString>("url");
-    QTest::newRow("null") << QString("foo");
+    QTest::newRow("null") << QStringLiteral("foo");
 }
 
 // protected void setCurrentTitle(QString const &url)
@@ -596,7 +606,7 @@ void tst_TabWidget::setCurrentTitle(const QString &)
 void tst_TabWidget::showStatusBarMessage_data()
 {
     QTest::addColumn<QString>("message");
-    QTest::newRow("null") << QString("foo");
+    QTest::newRow("null") << QStringLiteral("foo");
 }
 
 // protected void showStatusBarMessage(QString const &message)
diff --git a/autotests/utils/CMakeLists.txt b/autotests/utils/CMakeLists.txt
new file mode 100644
index 00000000..a17eeb4e
--- /dev/null
+++ b/autotests/utils/CMakeLists.txt
@@ -0,0 +1,5 @@
+project(utils)
+add_subdirectory(editlistview)
+add_subdirectory(edittreeview)
+add_subdirectory(languagemanager)
+add_subdirectory(lineedit)
\ No newline at end of file
diff --git a/autotests/utils/editlistview/CMakeLists.txt b/autotests/utils/editlistview/CMakeLists.txt
new file mode 100644
index 00000000..a432a7af
--- /dev/null
+++ b/autotests/utils/editlistview/CMakeLists.txt
@@ -0,0 +1,30 @@
+project(test-editlistview)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5WebEngine REQUIRED)
+find_package(Qt5WebEngineWidgets REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC_SEARCH_PATHS
+	${CMAKE_CURRENT_SOURCE_DIR}/..
+	${CMAKE_CURRENT_SOURCE_DIR}/../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
+)
+INCLUDE_DIRECTORIES(
+    ../../
+    ../../../src/
+    ../../../src/utils
+)
+add_definitions(-DNO_BROWSERAPPLICATION)
+add_definitions(-DFOR_AUTOTEST)
+set(SRCS
+	tst_editlistview.cpp
+	../../../src/utils/editlistview.cpp
+)
+
+add_executable(test-editlistview ${SRCS} ${UIS} ${MOCS})
+target_link_libraries(test-editlistview Qt5::Core Qt5::Test Qt5::Gui Qt5::Widgets Qt5::WebEngine Qt5::WebEngineWidgets)
diff --git a/autotests/utils/editlistview/editlistview.pro b/autotests/utils/editlistview/editlistview.pro
deleted file mode 100644
index f089b9c8..00000000
--- a/autotests/utils/editlistview/editlistview.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../autotests.pri)
-
-# Input
-SOURCES = tst_editlistview.cpp editlistview.cpp
-HEADERS = editlistview.h
-FORMS =
-RESOURCES =
diff --git a/autotests/utils/editlistview/tst_editlistview.cpp b/autotests/utils/editlistview/tst_editlistview.cpp
index e3a939da..a2b988c4 100644
--- a/autotests/utils/editlistview/tst_editlistview.cpp
+++ b/autotests/utils/editlistview/tst_editlistview.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,13 +26,13 @@ class tst_EditListView : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void editlistview_data();
     void editlistview();
 
diff --git a/autotests/utils/edittreeview/CMakeLists.txt b/autotests/utils/edittreeview/CMakeLists.txt
new file mode 100644
index 00000000..ba6d7fd6
--- /dev/null
+++ b/autotests/utils/edittreeview/CMakeLists.txt
@@ -0,0 +1,30 @@
+project(test-edittreeview)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5WebEngine REQUIRED)
+find_package(Qt5WebEngineWidgets REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC_SEARCH_PATHS
+	${CMAKE_CURRENT_SOURCE_DIR}/..
+	${CMAKE_CURRENT_SOURCE_DIR}/../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
+)
+INCLUDE_DIRECTORIES(
+    ../../
+    ../../../src/
+    ../../../src/utils
+)
+add_definitions(-DNO_BROWSERAPPLICATION)
+add_definitions(-DFOR_AUTOTEST)
+set(SRCS
+	tst_edittreeview.cpp
+	../../../src/utils/edittreeview.cpp
+)
+
+add_executable(test-edittreeview ${SRCS} ${UIS} ${MOCS})
+target_link_libraries(test-edittreeview Qt5::Core Qt5::Test Qt5::Gui Qt5::Widgets Qt5::WebEngine Qt5::WebEngineWidgets)
diff --git a/autotests/utils/edittreeview/edittreeview.pro b/autotests/utils/edittreeview/edittreeview.pro
deleted file mode 100644
index 00a4dea5..00000000
--- a/autotests/utils/edittreeview/edittreeview.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += . ../
-
-include(../../autotests.pri)
-
-# Input
-SOURCES = tst_edittreeview.cpp edittreeview.cpp
-HEADERS = edittreeview.h
-FORMS =
-RESOURCES =
diff --git a/autotests/utils/edittreeview/tst_edittreeview.cpp b/autotests/utils/edittreeview/tst_edittreeview.cpp
index 8bcfce3f..a1af736c 100644
--- a/autotests/utils/edittreeview/tst_edittreeview.cpp
+++ b/autotests/utils/edittreeview/tst_edittreeview.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,19 +20,19 @@
 #include <qtest.h>
 
 #include <edittreeview.h>
-#include <qstandarditemmodel.h>
+#include <QStandardItemModel>
 
 class tst_EditTreeView : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void edittreeview_data();
     void edittreeview();
 
@@ -56,7 +56,7 @@ class SubEditTreeView : public EditTreeView
         for (int i = 0; i < 4; ++i) {
             QStandardItem *item = 0;
             for (int j = 0; j < 4; ++j) {
-                item = new QStandardItem(QString("item %0").arg(j));
+                item = new QStandardItem(QStringLiteral("item %0").arg(j));
                 parentItem->appendRow(item);
             }
             parentItem = item;
diff --git a/autotests/utils/languagemanager/CMakeLists.txt b/autotests/utils/languagemanager/CMakeLists.txt
new file mode 100644
index 00000000..950e2ad8
--- /dev/null
+++ b/autotests/utils/languagemanager/CMakeLists.txt
@@ -0,0 +1,31 @@
+project(test-languagemanager)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5WebEngine REQUIRED)
+find_package(Qt5WebEngineWidgets REQUIRED)
+find_package(Qt5UiTools REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC_SEARCH_PATHS
+	${CMAKE_CURRENT_SOURCE_DIR}/..
+	${CMAKE_CURRENT_SOURCE_DIR}/../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
+)
+INCLUDE_DIRECTORIES(
+    ../../
+    ../../../src/
+    ../../../src/utils
+)
+add_definitions(-DNO_BROWSERAPPLICATION)
+add_definitions(-DFOR_AUTOTEST)
+set(SRCS
+	tst_languagemanager.cpp
+	../../../src/utils/languagemanager.cpp
+)
+
+add_executable(test-languagemanager ${SRCS} ${UIS} ${MOCS})
+target_link_libraries(test-languagemanager Qt5::Core Qt5::Test Qt5::Gui Qt5::Widgets Qt5::WebEngine Qt5::WebEngineWidgets)
diff --git a/autotests/utils/languagemanager/languagemanager.pro b/autotests/utils/languagemanager/languagemanager.pro
deleted file mode 100644
index 9c0db47f..00000000
--- a/autotests/utils/languagemanager/languagemanager.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += . ../
-
-include(../../autotests.pri)
-include(../../../src/locale/locale.pri)
-
-# Input
-SOURCES = languagemanager.cpp tst_languagemanager.cpp
-HEADERS = languagemanager.h
-FORMS =
-RESOURCES =
diff --git a/autotests/utils/languagemanager/tst_languagemanager.cpp b/autotests/utils/languagemanager/tst_languagemanager.cpp
index 09d3a8f6..6fe7c5a9 100644
--- a/autotests/utils/languagemanager/tst_languagemanager.cpp
+++ b/autotests/utils/languagemanager/tst_languagemanager.cpp
@@ -36,13 +36,13 @@ class tst_LanguageManager : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void languagemanager_data();
     void languagemanager();
 
@@ -59,7 +59,7 @@ class SubLanguageManager : public LanguageManager
 {
 public:
     SubLanguageManager() : LanguageManager() {
-        addLocaleDirectory(qApp->applicationDirPath() + QLatin1String("/.qm/locale"));
+        addLocaleDirectory(qApp->applicationDirPath() + QStringLiteral("/.qm/locale"));
     }
 
 };
@@ -168,7 +168,7 @@ void tst_LanguageManager::setCurrentLanguage_data()
     QTest::addColumn<QString>("language");
     QTest::addColumn<bool>("success");
     QTest::addColumn<QString>("result");
-    QTest::newRow("null-foo") << QString("foo") << false << fallbackLanguage;
+    QTest::newRow("null-foo") << QStringLiteral("foo") << false << fallbackLanguage;
     QTest::newRow("null-null") << QString() << false << fallbackLanguage;
 
     QString validLanguage = manager.languages().value(0);
@@ -187,7 +187,7 @@ void tst_LanguageManager::setCurrentLanguage()
 
     SubLanguageManager manager;
     QString initialLanguage = manager.currentLanguage();
-    QSignalSpy spy(&manager, SIGNAL(languageChanged(const QString &)));
+    QSignalSpy spy(&manager, &LanguageManager::languageChanged);
 
     TestWidget widget;
     widget.retranslate = false;
diff --git a/autotests/utils/lineedit/CMakeLists.txt b/autotests/utils/lineedit/CMakeLists.txt
new file mode 100644
index 00000000..e991c273
--- /dev/null
+++ b/autotests/utils/lineedit/CMakeLists.txt
@@ -0,0 +1,31 @@
+project(test-lineedit)
+
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Test REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5WebEngine REQUIRED)
+find_package(Qt5WebEngineWidgets REQUIRED)
+find_package(Qt5UiTools REQUIRED)
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC_SEARCH_PATHS
+	${CMAKE_CURRENT_SOURCE_DIR}/..
+	${CMAKE_CURRENT_SOURCE_DIR}/../../src
+    ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils
+)
+INCLUDE_DIRECTORIES(
+    ../../
+    ../../../src/
+    ../../../src/utils
+)
+add_definitions(-DNO_BROWSERAPPLICATION)
+add_definitions(-DFOR_AUTOTEST)
+set(SRCS
+	tst_lineedit.cpp
+	../../../src/utils/lineedit.cpp
+)
+
+add_executable(test-lineedit ${SRCS} ${UIS} ${MOCS})
+target_link_libraries(test-lineedit Qt5::Core Qt5::Test Qt5::Gui Qt5::Widgets Qt5::WebEngine Qt5::WebEngineWidgets)
diff --git a/autotests/utils/lineedit/lineedit.pro b/autotests/utils/lineedit/lineedit.pro
deleted file mode 100644
index d829e9f4..00000000
--- a/autotests/utils/lineedit/lineedit.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../autotests.pri)
-
-# Input
-SOURCES = tst_lineedit.cpp lineedit.cpp
-HEADERS = lineedit.h lineedit_p.h
-FORMS =
-RESOURCES =
diff --git a/autotests/utils/lineedit/tst_lineedit.cpp b/autotests/utils/lineedit/tst_lineedit.cpp
index f44c71e1..ec44e591 100644
--- a/autotests/utils/lineedit/tst_lineedit.cpp
+++ b/autotests/utils/lineedit/tst_lineedit.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,19 +20,19 @@
 #include <qtest.h>
 
 #include <lineedit.h>
-#include <qtoolbutton.h>
+#include <QToolButton>
 
 class tst_LineEdit : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void lineedit_data();
     void lineedit();
 
@@ -52,7 +52,9 @@ class SubLineEdit : public LineEdit
 {
 public:
     void call_resizeEvent(QResizeEvent *event)
-        { return SubLineEdit::resizeEvent(event); }
+    {
+        return SubLineEdit::resizeEvent(event);
+    }
 };
 
 // This will be called before the first test function is executed.
@@ -182,7 +184,7 @@ void tst_LineEdit::textMargin()
 void tst_LineEdit::inactiveText_data()
 {
     QTest::addColumn<QString>("inactiveText");
-    QTest::newRow("foo") << QString("foo");
+    QTest::newRow("foo") << QStringLiteral("foo");
 }
 
 // public QString inactiveText() const
diff --git a/autotests/utils/networkaccessmanagerproxy/.gitignore b/autotests/utils/networkaccessmanagerproxy/.gitignore
deleted file mode 100644
index 1b40b446..00000000
--- a/autotests/utils/networkaccessmanagerproxy/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-networkaccessmanagerproxy
diff --git a/autotests/utils/networkaccessmanagerproxy/networkaccessmanagerproxy.pro b/autotests/utils/networkaccessmanagerproxy/networkaccessmanagerproxy.pro
deleted file mode 100644
index 125fc571..00000000
--- a/autotests/utils/networkaccessmanagerproxy/networkaccessmanagerproxy.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../autotests.pri)
-
-# Input
-SOURCES = tst_networkaccessmanagerproxy.cpp networkaccessmanagerproxy.cpp webpageproxy.cpp
-HEADERS = networkaccessmanagerproxy.h networkaccessmanagerproxy_p.h webpageproxy.h
-FORMS =
-RESOURCES =
diff --git a/autotests/utils/networkaccessmanagerproxy/tst_networkaccessmanagerproxy.cpp b/autotests/utils/networkaccessmanagerproxy/tst_networkaccessmanagerproxy.cpp
deleted file mode 100644
index 56c04049..00000000
--- a/autotests/utils/networkaccessmanagerproxy/tst_networkaccessmanagerproxy.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qtest.h>
-
-#include <networkaccessmanagerproxy.h>
-#include <webpageproxy.h>
-
-#include <qnetworkcookie.h>
-#include <qnetworkrequest.h>
-#include <qnetworkreply.h>
-#include <QNetworkCookieJar>
-
-class tst_NetworkAccessManagerProxy : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
-    void networkaccessmanagerproxy_data();
-    void networkaccessmanagerproxy();
-
-    void primaryNetworkAccessManager();
-    void webPage();
-
-    void createRequest_data();
-    void createRequest();
-};
-
-// Subclass that exposes the protected functions.
-class SubNetworkAccessManagerProxy : public NetworkAccessManagerProxy
-{
-public:
-    QNetworkReply *call_createRequest(QNetworkAccessManager::Operation op, QNetworkRequest const &request, QIODevice *outgoingData = 0)
-        { return SubNetworkAccessManagerProxy::createRequest(op, request, outgoingData); }
-};
-
-// This will be called before the first test function is executed.
-// It is only called once.
-void tst_NetworkAccessManagerProxy::initTestCase()
-{
-}
-
-// This will be called after the last test function is executed.
-// It is only called once.
-void tst_NetworkAccessManagerProxy::cleanupTestCase()
-{
-}
-
-// This will be called before each test function is executed.
-void tst_NetworkAccessManagerProxy::init()
-{
-}
-
-// This will be called after every test function.
-void tst_NetworkAccessManagerProxy::cleanup()
-{
-}
-
-void tst_NetworkAccessManagerProxy::networkaccessmanagerproxy_data()
-{
-}
-
-void tst_NetworkAccessManagerProxy::networkaccessmanagerproxy()
-{
-    SubNetworkAccessManagerProxy proxy;
-    QVERIFY(proxy.call_createRequest(QNetworkAccessManager::GetOperation,
-            QNetworkRequest(),
-            (QIODevice*)0));
-}
-
-// public void setPrimaryNetworkAccessManager(NetworkAccessManagerProxy *primaryManager)
-void tst_NetworkAccessManagerProxy::primaryNetworkAccessManager()
-{
-    SubNetworkAccessManagerProxy proxy;
-
-    NetworkAccessManagerProxy primaryManager;
-
-    proxy.setPrimaryNetworkAccessManager(&primaryManager);
-    QCOMPARE(&primaryManager, proxy.primaryNetworkAccessManager());
-    QVERIFY(primaryManager.cookieJar()->parent() == &primaryManager);
-}
-
-// public void setWebPage(WebPageProxy *page)
-void tst_NetworkAccessManagerProxy::webPage()
-{
-    SubNetworkAccessManagerProxy proxy;
-
-    WebPageProxy webPage;
-    proxy.setWebPage(&webPage);
-    QCOMPARE(&webPage, proxy.webPage());
-}
-
-void tst_NetworkAccessManagerProxy::createRequest_data()
-{
-    QTest::addColumn<bool>("primary");
-    QTest::newRow("true") << true;
-    QTest::newRow("false") << false;
-}
-
-// protected QNetworkReply *createRequest(QNetworkAccessManager::Operation op, QNetworkRequest const &request, QIODevice *outgoingData = 0)
-void tst_NetworkAccessManagerProxy::createRequest()
-{
-    QFETCH(bool, primary);
-
-    SubNetworkAccessManagerProxy proxy;
-    SubNetworkAccessManagerProxy primaryManager;
-    WebPageProxy webPage;
-    if (!primary) {
-        proxy.setPrimaryNetworkAccessManager(&primaryManager);
-        proxy.setWebPage(&webPage);
-    }
-
-    QIODevice *outgoingData = 0;
-    QNetworkRequest request;
-    QNetworkReply *reply = proxy.call_createRequest(QNetworkAccessManager::GetOperation, request, outgoingData);
-    QVERIFY(reply);
-    if (primary)
-        QCOMPARE(reply->request(), request);
-    else
-        QVERIFY(reply->request() != request);
-}
-
-QTEST_MAIN(tst_NetworkAccessManagerProxy)
-#include "tst_networkaccessmanagerproxy.moc"
-
diff --git a/autotests/utils/utils.pro b/autotests/utils/utils.pro
deleted file mode 100644
index 08666cd6..00000000
--- a/autotests/utils/utils.pro
+++ /dev/null
@@ -1,8 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS  = \
-    editlistview \
-    edittreeview \
-    languagemanager \
-    lineedit
-
-CONFIG += ordered
diff --git a/autotests/utils/webpageproxy/.gitignore b/autotests/utils/webpageproxy/.gitignore
deleted file mode 100644
index 76350346..00000000
--- a/autotests/utils/webpageproxy/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-webpageproxy
diff --git a/autotests/utils/webpageproxy/tst_webpageproxy.cpp b/autotests/utils/webpageproxy/tst_webpageproxy.cpp
deleted file mode 100644
index e66d6b83..00000000
--- a/autotests/utils/webpageproxy/tst_webpageproxy.cpp
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qtest.h>
-
-#include <webpageproxy.h>
-#include <qnetworkrequest.h>
-
-class tst_WebPageProxy : public QObject
-{
-    Q_OBJECT
-
-public slots:
-    void initTestCase();
-    void cleanupTestCase();
-    void init();
-    void cleanup();
-
-private slots:
-    void webpageproxy_data();
-    void webpageproxy();
-
-    void populateNetworkRequest();
-};
-
-// Subclass that exposes the protected functions.
-class SubWebPageProxy : public WebPageProxy
-{
-public:
-    void call_populateNetworkRequest(QNetworkRequest &request)
-        { return SubWebPageProxy::populateNetworkRequest(request); }
-};
-
-// This will be called before the first test function is executed.
-// It is only called once.
-void tst_WebPageProxy::initTestCase()
-{
-}
-
-// This will be called after the last test function is executed.
-// It is only called once.
-void tst_WebPageProxy::cleanupTestCase()
-{
-}
-
-// This will be called before each test function is executed.
-void tst_WebPageProxy::init()
-{
-}
-
-// This will be called after every test function.
-void tst_WebPageProxy::cleanup()
-{
-}
-
-void tst_WebPageProxy::webpageproxy_data()
-{
-}
-
-void tst_WebPageProxy::webpageproxy()
-{
-    SubWebPageProxy proxy;
-    QCOMPARE(proxy.pageAttributeId(), 1100);
-    QNetworkRequest request;
-    proxy.call_populateNetworkRequest(request);
-}
-
-// protected void populateNetworkRequest(QNetworkRequest &request)
-void tst_WebPageProxy::populateNetworkRequest()
-{
-    SubWebPageProxy proxy;
-
-    QNetworkRequest emptyRequest;
-    QNetworkRequest request = emptyRequest;
-    proxy.call_populateNetworkRequest(request);
-
-    QVERIFY(request != emptyRequest);
-    QVariant v = request.attribute((QNetworkRequest::Attribute)(proxy.pageAttributeId()));
-    QVERIFY(v.isValid());
-    QWebPage *webPage = (QWebPage*)(v.value<void*>());
-    QVERIFY(webPage);
-    QCOMPARE(webPage, &proxy);
-}
-
-QTEST_MAIN(tst_WebPageProxy)
-#include "tst_webpageproxy.moc"
-
diff --git a/autotests/utils/webpageproxy/webpageproxy.pro b/autotests/utils/webpageproxy/webpageproxy.pro
deleted file mode 100644
index 2c3b1913..00000000
--- a/autotests/utils/webpageproxy/webpageproxy.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../autotests.pri)
-
-# Input
-SOURCES = tst_webpageproxy.cpp webpageproxy.cpp
-HEADERS = webpageproxy.h
-FORMS =
-RESOURCES =
diff --git a/autotests/webactionmapper/CMakeLists.txt b/autotests/webactionmapper/CMakeLists.txt
new file mode 100644
index 00000000..61261637
--- /dev/null
+++ b/autotests/webactionmapper/CMakeLists.txt
@@ -0,0 +1,10 @@
+project(test-webactionmapper)
+find_package(Qt5Test REQUIRED)
+INCLUDE_DIRECTORIES(
+    ${CMAKE_CURRENT_SOURCE_DIR}/..
+    ${CMAKE_CURRENT_SOURCE_DIR}/../modeltest
+)
+
+
+add_executable(test-webactionmapper tst_webactionmapper.cpp)
+target_link_libraries(test-webactionmapper endorphin-base Qt5::Test)
diff --git a/autotests/webactionmapper/tst_webactionmapper.cpp b/autotests/webactionmapper/tst_webactionmapper.cpp
index 3622a602..b79ba8c1 100644
--- a/autotests/webactionmapper/tst_webactionmapper.cpp
+++ b/autotests/webactionmapper/tst_webactionmapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include <QtTest/QtTest>
 #include <QtCore/QtCore>
 #include <QtGui/QtGui>
-#include <QtWebKit/QtWebKit>
+#include <QWebEnginePage>
 #include <QAction>
 
 #include <webactionmapper.h>
@@ -32,13 +32,13 @@ class tst_WebActionMapper : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void webactionmapper_data();
     void webactionmapper();
     void addChild();
@@ -56,7 +56,7 @@ private slots:
 class SubWebActionMapper : public WebActionMapper
 {
 public:
-    SubWebActionMapper(QAction *root, QWebPage::WebAction webAction, QObject *parent)
+    SubWebActionMapper(QAction *root, QWebEnginePage::WebAction webAction, QObject *parent)
         : WebActionMapper(root, webAction, parent) {}
 
 };
@@ -89,17 +89,17 @@ void tst_WebActionMapper::webactionmapper_data()
 
 void tst_WebActionMapper::webactionmapper()
 {
-    SubWebActionMapper mapper(0, QWebPage::Stop, 0);
+    SubWebActionMapper mapper(0, QWebEnginePage::Stop, 0);
     mapper.addChild(0);
     mapper.updateCurrent(0);
-    QCOMPARE(mapper.webAction(), QWebPage::Stop);
+    QCOMPARE(mapper.webAction(), QWebEnginePage::Stop);
 }
 
 // public void addChild(QAction *action)
 void tst_WebActionMapper::addChild()
 {
     QAction *root = new QAction(this);
-    SubWebActionMapper mapper(root, QWebPage::Stop, 0);
+    SubWebActionMapper mapper(root, QWebEnginePage::Stop, 0);
     QVERIFY(!root->isEnabled());
 
     QAction *child = new QAction(this);
@@ -119,7 +119,7 @@ void tst_WebActionMapper::updateCurrent_data()
 void tst_WebActionMapper::updateCurrent()
 {
     QAction *root = new QAction(this);
-    SubWebActionMapper mapper(root, QWebPage::Stop, 0);
+    SubWebActionMapper mapper(root, QWebEnginePage::Stop, 0);
     QVERIFY(!root->isEnabled());
 
     WebView webView;
@@ -138,7 +138,7 @@ void tst_WebActionMapper::updateCurrent()
 void tst_WebActionMapper::triggerRoot()
 {
     QAction *root = new QAction(this);
-    SubWebActionMapper mapper(root, QWebPage::Reload, 0);
+    SubWebActionMapper mapper(root, QWebEnginePage::Reload, 0);
 
     WebView webView;
     QAction *childAction = webView.page()->action(mapper.webAction());
@@ -155,7 +155,7 @@ void tst_WebActionMapper::triggerRoot()
 void tst_WebActionMapper::destroyRoot()
 {
     QAction *root = new QAction(this);
-    SubWebActionMapper mapper(root, QWebPage::Reload, 0);
+    SubWebActionMapper mapper(root, QWebEnginePage::Reload, 0);
 
     WebView webView;
     QAction *childAction = webView.page()->action(mapper.webAction());
@@ -174,7 +174,7 @@ void tst_WebActionMapper::destroyRoot()
 void tst_WebActionMapper::destroyCurrent()
 {
     QAction *root = new QAction(this);
-    SubWebActionMapper mapper(root, QWebPage::Reload, 0);
+    SubWebActionMapper mapper(root, QWebEnginePage::Reload, 0);
 
     WebView *webView = new WebView;
     QAction *childAction = webView->page()->action(mapper.webAction());
@@ -197,7 +197,7 @@ void tst_WebActionMapper::childChanged()
 {
     QFETCH(bool, isCurrent);
     QAction *root = new QAction(this);
-    SubWebActionMapper mapper(root, QWebPage::Reload, 0);
+    SubWebActionMapper mapper(root, QWebEnginePage::Reload, 0);
 
     WebView webView;
     QAction *childAction = webView.page()->action(mapper.webAction());
diff --git a/autotests/webactionmapper/webactionmapper.pro b/autotests/webactionmapper/webactionmapper.pro
deleted file mode 100644
index 08c7da89..00000000
--- a/autotests/webactionmapper/webactionmapper.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_webactionmapper.cpp
-HEADERS +=
diff --git a/autotests/webpage/CMakeLists.txt b/autotests/webpage/CMakeLists.txt
new file mode 100644
index 00000000..34741181
--- /dev/null
+++ b/autotests/webpage/CMakeLists.txt
@@ -0,0 +1,5 @@
+project(test-webpage)
+find_package(Qt5Test REQUIRED)
+
+add_executable(test-webpage tst_webpage.cpp)
+target_link_libraries(test-webpage endorphin-base Qt5::Test)
diff --git a/autotests/webpage/tst_webpage.cpp b/autotests/webpage/tst_webpage.cpp
index bf3941e5..5d3e3341 100644
--- a/autotests/webpage/tst_webpage.cpp
+++ b/autotests/webpage/tst_webpage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,9 +19,8 @@
 
 #include <QtTest/QtTest>
 #include <QtGui/QtGui>
-#include <QtWebKit/QtWebKit>
 #include <QtNetwork/QtNetwork>
-#include <QWebFrame>
+#include <QWebEnginePage>
 
 #include <webpage.h>
 #include "qtest_endorphin.h"
@@ -30,30 +29,30 @@ class tst_WebPage : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void webpage_data();
     void webpage();
 
     void loadSettings_data();
     void loadSettings();
-    void webPluginFactory_data();
-    void webPluginFactory();
-    void acceptNavigationRequest_data();
-    void acceptNavigationRequest();
-    void createPlugin_data();
-    void createPlugin();
+    //void webPluginFactory_data();
+    //void webPluginFactory();
+    //void acceptNavigationRequest_data();
+    //void acceptNavigationRequest();
+    //void createPlugin_data();
+    //void createPlugin();
     void createWindow_data();
     void createWindow();
     void handleUnsupportedContent();
-    void linkedResources();
-    void javaScriptObjects_data();
-    void javaScriptObjects();
+    //void linkedResources();
+    //void javaScriptObjects_data();
+    //void javaScriptObjects();
     void userAgent();
 };
 
@@ -62,19 +61,26 @@ class SubWebPage : public WebPage
 {
 public:
     QString call_userAgentForUrl(const QUrl &url) const
-        { return SubWebPage::userAgentForUrl(url); }
+    {
+        return SubWebPage::userAgentForUrl(url);
+    }
 
     void call_aboutToLoadUrl(QUrl const &url)
-        { return SubWebPage::aboutToLoadUrl(url); }
-
-    bool call_acceptNavigationRequest(QWebFrame *frame, QNetworkRequest const &request, NavigationType type)
-        { return SubWebPage::acceptNavigationRequest(frame, request, type); }
-
-    QObject *call_createPlugin(QString const &classId, QUrl const &url, QStringList const &paramNames, QStringList const &paramValues)
-        { return SubWebPage::createPlugin(classId, url, paramNames, paramValues); }
-
-    QWebPage *call_createWindow(QWebPage::WebWindowType type)
-        { return SubWebPage::createWindow(type); }
+    {
+        return SubWebPage::aboutToLoadUrl(url);
+    }
+
+    /*
+        bool call_acceptNavigationRequest(QWebFrame *frame, QNetworkRequest const &request, NavigationType type)
+            { return SubWebPage::acceptNavigationRequest(frame, request, type); }
+
+        QObject *call_createPlugin(QString const &classId, QUrl const &url, QStringList const &paramNames, QStringList const &paramValues)
+            { return SubWebPage::createPlugin(classId, url, paramNames, paramValues); }
+    */
+    QWebEnginePage *call_createWindow(QWebEnginePage::WebWindowType type)
+    {
+        return SubWebPage::createWindow(type);
+    }
 };
 
 // This will be called before the first test function is executed.
@@ -83,8 +89,8 @@ void tst_WebPage::initTestCase()
 {
     QCoreApplication::setApplicationName("tst_webpage");
 
-    QDesktopServices::setUrlHandler(QLatin1String("mailto"), this, "openUrl");
-    QDesktopServices::setUrlHandler(QLatin1String("ftp"), this, "openUrl");
+    QDesktopServices::setUrlHandler(QStringLiteral("mailto"), this, "openUrl");
+    QDesktopServices::setUrlHandler(QStringLiteral("ftp"), this, "openUrl");
 }
 
 // This will be called after the last test function is executed.
@@ -113,11 +119,11 @@ void tst_WebPage::webpage()
 {
     SubWebPage page;
     page.loadSettings();
-    QVERIFY(page.webPluginFactory());
+    //QVERIFY(page.webPluginFactory());
     page.call_aboutToLoadUrl(QUrl());
-    QCOMPARE(page.call_acceptNavigationRequest((QWebFrame*)0, QNetworkRequest(), QWebPage::NavigationTypeLinkClicked), true);
-    QCOMPARE(page.call_createPlugin(QString(), QUrl(), QStringList(), QStringList()), (QObject*)0);
-    QCOMPARE(page.call_createWindow(QWebPage::WebBrowserWindow), (QWebPage*)0);
+    // QCOMPARE(page.call_acceptNavigationRequest((QWebFrame*)0, QNetworkRequest(), QWebEnginePage::NavigationTypeLinkClicked), true);
+    // QCOMPARE(page.call_createPlugin(QString(), QUrl(), QStringList(), QStringList()), (QObject*)0);
+    QCOMPARE(page.call_createWindow(QWebEnginePage::WebBrowserWindow), (QWebEnginePage*)0);
 }
 
 void tst_WebPage::loadSettings_data()
@@ -144,6 +150,7 @@ void tst_WebPage::loadSettings()
     QSKIP("Test is not implemented.");
 }
 
+/*
 // Q_DECLARE_METATYPE(WebPluginFactory*)
 void tst_WebPage::webPluginFactory_data()
 {
@@ -169,46 +176,49 @@ void tst_WebPage::webPluginFactory()
 #endif
     QSKIP("Test is not implemented.");
 }
-
-Q_DECLARE_METATYPE(QWebPage::WebWindowType)
-Q_DECLARE_METATYPE(QWebPage::NavigationType)
+*/
+Q_DECLARE_METATYPE(QWebEnginePage::WebWindowType)
+Q_DECLARE_METATYPE(QWebEnginePage::NavigationType)
 Q_DECLARE_METATYPE(Qt::MouseButton)
 Q_DECLARE_METATYPE(Qt::KeyboardModifier)
+/*
 void tst_WebPage::acceptNavigationRequest_data()
 {
     QTest::addColumn<Qt::MouseButton>("pressedButton");
     QTest::addColumn<Qt::KeyboardModifier>("pressedKeys");
     QTest::addColumn<bool>("validFrame");
     QTest::addColumn<QNetworkRequest>("request");
-    QTest::addColumn<QWebPage::NavigationType>("type");
+    QTest::addColumn<QWebEnginePage::NavigationType>("type");
     QTest::addColumn<bool>("acceptNavigationRequest");
     QTest::addColumn<int>("spyCount");
 
-    QTest::newRow("null-noframe") << Qt::NoButton << Qt::NoModifier << false << QNetworkRequest() << QWebPage::NavigationTypeLinkClicked << true << 0;
-    QTest::newRow("null-frame")   << Qt::NoButton << Qt::NoModifier << true << QNetworkRequest() << QWebPage::NavigationTypeLinkClicked << true << 1;
+    QTest::newRow("null-noframe") << Qt::NoButton << Qt::NoModifier << false << QNetworkRequest() << QWebEnginePage::NavigationTypeLinkClicked << true << 0;
+    QTest::newRow("null-frame")   << Qt::NoButton << Qt::NoModifier << true << QNetworkRequest() << QWebEnginePage::NavigationTypeLinkClicked << true << 1;
 
-    QTest::newRow("mailto-0") << Qt::NoButton << Qt::NoModifier << true << QNetworkRequest(QUrl("mailto:foo@bar.com")) << QWebPage::NavigationTypeLinkClicked << false << 0;
-    QTest::newRow("mailto-1") << Qt::NoButton << Qt::NoModifier << false << QNetworkRequest(QUrl("mailto:foo@bar.com")) << QWebPage::NavigationTypeLinkClicked << false << 0;
-    QTest::newRow("ftp-0") << Qt::NoButton << Qt::NoModifier << true << QNetworkRequest(QUrl("ftp:foo@bar.com")) << QWebPage::NavigationTypeLinkClicked << false << 0;
-    QTest::newRow("ftp-1") << Qt::NoButton << Qt::NoModifier << false << QNetworkRequest(QUrl("ftp:foo@bar.com")) << QWebPage::NavigationTypeLinkClicked << false << 0;
+    QTest::newRow("mailto-0") << Qt::NoButton << Qt::NoModifier << true << QNetworkRequest(QUrl("mailto:foo@bar.com")) << QWebEnginePage::NavigationTypeLinkClicked << false << 0;
+    QTest::newRow("mailto-1") << Qt::NoButton << Qt::NoModifier << false << QNetworkRequest(QUrl("mailto:foo@bar.com")) << QWebEnginePage::NavigationTypeLinkClicked << false << 0;
+    QTest::newRow("ftp-0") << Qt::NoButton << Qt::NoModifier << true << QNetworkRequest(QUrl("ftp:foo@bar.com")) << QWebEnginePage::NavigationTypeLinkClicked << false << 0;
+    QTest::newRow("ftp-1") << Qt::NoButton << Qt::NoModifier << false << QNetworkRequest(QUrl("ftp:foo@bar.com")) << QWebEnginePage::NavigationTypeLinkClicked << false << 0;
 
 
-    QTest::newRow("normal-0") << Qt::NoButton << Qt::NoModifier << false << QNetworkRequest(QUrl("http://www.foo.com")) << QWebPage::NavigationTypeLinkClicked << true << 0;
-    QTest::newRow("normal-1") << Qt::NoButton << Qt::NoModifier << true << QNetworkRequest(QUrl("http://www.foo.com")) << QWebPage::NavigationTypeLinkClicked << true << 1;
+    QTest::newRow("normal-0") << Qt::NoButton << Qt::NoModifier << false << QNetworkRequest(QUrl("http://www.foo.com")) << QWebEnginePage::NavigationTypeLinkClicked << true << 0;
+    QTest::newRow("normal-1") << Qt::NoButton << Qt::NoModifier << true << QNetworkRequest(QUrl("http://www.foo.com")) << QWebEnginePage::NavigationTypeLinkClicked << true << 1;
 
-    QTest::newRow("midclick-0") << Qt::MidButton << Qt::NoModifier << true << QNetworkRequest(QUrl("http://www.foo.com")) << QWebPage::NavigationTypeLinkClicked << false << 0;
-    QTest::newRow("midclick-1") << Qt::MidButton << Qt::ShiftModifier << true << QNetworkRequest(QUrl("http://www.foo.com")) << QWebPage::NavigationTypeLinkClicked << false << 0;
-    QTest::newRow("midclick-2") << Qt::MidButton << Qt::AltModifier << true << QNetworkRequest(QUrl("http://www.foo.com")) << QWebPage::NavigationTypeLinkClicked << false << 0;
+    QTest::newRow("midclick-0") << Qt::MidButton << Qt::NoModifier << true << QNetworkRequest(QUrl("http://www.foo.com")) << QWebEnginePage::NavigationTypeLinkClicked << false << 0;
+    QTest::newRow("midclick-1") << Qt::MidButton << Qt::ShiftModifier << true << QNetworkRequest(QUrl("http://www.foo.com")) << QWebEnginePage::NavigationTypeLinkClicked << false << 0;
+    QTest::newRow("midclick-2") << Qt::MidButton << Qt::AltModifier << true << QNetworkRequest(QUrl("http://www.foo.com")) << QWebEnginePage::NavigationTypeLinkClicked << false << 0;
 }
 
-// protected bool acceptNavigationRequest(QWebFrame *frame, QNetworkRequest const &request, NavigationType type)
+
+// WebKit: protected bool acceptNavigationRequest(QWebFrame *frame, QNetworkRequest const &request, NavigationType type)
+// WebEngine: protected bool acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame)
 void tst_WebPage::acceptNavigationRequest()
 {
     QFETCH(Qt::MouseButton, pressedButton);
     QFETCH(Qt::KeyboardModifier, pressedKeys);
     QFETCH(bool, validFrame);
     QFETCH(QNetworkRequest, request);
-    QFETCH(QWebPage::NavigationType, type);
+    QFETCH(QWebEnginePage::NavigationType, type);
     QFETCH(bool, acceptNavigationRequest);
     QFETCH(int, spyCount);
 
@@ -224,7 +234,8 @@ void tst_WebPage::acceptNavigationRequest()
     BrowserApplication::instance()->setEventMouseButtons(Qt::NoButton);
     BrowserApplication::instance()->setEventKeyboardModifiers(Qt::NoModifier);
 }
-
+*/
+/*
 Q_DECLARE_METATYPE(QStringList)
 Q_DECLARE_METATYPE(QObject*)
 void tst_WebPage::createPlugin_data()
@@ -259,23 +270,23 @@ void tst_WebPage::createPlugin()
 #endif
     QSKIP("Test is not implemented.");
 }
-
-Q_DECLARE_METATYPE(QWebPage*)
+*/
+Q_DECLARE_METATYPE(QWebEnginePage*)
 void tst_WebPage::createWindow_data()
 {
 #if 0
-    QTest::addColumn<QWebPage::WebWindowType>("type");
-    QTest::addColumn<QWebPage*>("createWindow");
-    QTest::newRow("null") << QWebPage::WebWindowType() << QWebPage*();
+    QTest::addColumn<QWebEnginePage::WebWindowType>("type");
+    QTest::addColumn<QWebEnginePage*>("createWindow");
+    QTest::newRow("null") << QWebEnginePage::WebWindowType() << QWebEnginePage*();
 #endif
 }
 
-// protected QWebPage *createWindow(QWebPage::WebWindowType type)
+// protected QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type)
 void tst_WebPage::createWindow()
 {
 #if 0
-    QFETCH(QWebPage::WebWindowType, type);
-    QFETCH(QWebPage*, createWindow);
+    QFETCH(QWebEnginePage::WebWindowType, type);
+    QFETCH(QWebEnginePage*, createWindow);
 
     SubWebPage page;
 
@@ -292,10 +303,11 @@ void tst_WebPage::handleUnsupportedContent()
 {
     SubWebPage page;
     QSignalSpy spy(&page, SIGNAL(loadFinished(bool)));
-    page.mainFrame()->load(QUrl("http://exampletesttesttesttesttesttes.com/test.html"));
+    page.load(QUrl("http://exampletesttesttesttesttesttes.com/test.html"));
     QTRY_COMPARE(spy.count(), 1);
 }
 
+/*
 void tst_WebPage::linkedResources()
 {
     SubWebPage page;
@@ -312,25 +324,25 @@ void tst_WebPage::linkedResources()
         "</body>"
     "</html>";
 
-    page.mainFrame()->setHtml(html, QUrl("http://foobar.baz/foo/"));
+    page->setHtml(html, QUrl("http://foobar.baz/foo/"));
 
     QList<WebPageLinkedResource> resources = page.linkedResources();
     QCOMPARE(resources.count(), 4);
 
-    QCOMPARE(resources.at(0).rel, QString("stylesheet"));
-    QCOMPARE(resources.at(0).type, QString("text/css"));
+    QCOMPARE(resources.at(0).rel, QStringLiteral("stylesheet"));
+    QCOMPARE(resources.at(0).type, QStringLiteral("text/css"));
     QCOMPARE(resources.at(0).href, QUrl("http://foobar.baz/foo/styles/common.css"));
     QCOMPARE(resources.at(0).title, QString());
 
-    QCOMPARE(resources.at(1).rel, QString("alternate"));
-    QCOMPARE(resources.at(1).type, QString("application/rss+xml"));
+    QCOMPARE(resources.at(1).rel, QStringLiteral("alternate"));
+    QCOMPARE(resources.at(1).type, QStringLiteral("application/rss+xml"));
     QCOMPARE(resources.at(1).href, QUrl("http://foobar.baz/foo/rss.xml"));
 
     QCOMPARE(resources.at(2).href, QUrl("http://foobar.baz/atom.xml"));
-    QCOMPARE(resources.at(2).title, QString("Feed"));
+    QCOMPARE(resources.at(2).title, QStringLiteral("Feed"));
 
-    QCOMPARE(resources.at(3).rel, QString("search"));
-    QCOMPARE(resources.at(3).type, QString("application/opensearchdescription+xml"));
+    QCOMPARE(resources.at(3).rel, QStringLiteral("search"));
+    QCOMPARE(resources.at(3).type, QStringLiteral("application/opensearchdescription+xml"));
     QCOMPARE(resources.at(3).href, QUrl("http://external.foo/search.xml"));
 
     QString js = "var base = document.createElement('base');"
@@ -347,7 +359,8 @@ void tst_WebPage::linkedResources()
     QCOMPARE(resources.at(2).href, QUrl("http://barbaz.foo/atom.xml"));
     QCOMPARE(resources.at(3).href, QUrl("http://external.foo/search.xml"));
 }
-
+*/
+/*
 void tst_WebPage::javaScriptObjects_data()
 {
     QTest::addColumn<QUrl>("url");
@@ -369,13 +382,13 @@ void tst_WebPage::javaScriptObjects()
     page.mainFrame()->load(url);
     QTRY_COMPARE(spy.count(), 1);
 
-    QVariant windowExternalVariant = page.mainFrame()->evaluateJavaScript(QLatin1String("window.external"));
-    QVariant windowEndorphinVariant = page.mainFrame()->evaluateJavaScript(QLatin1String("window.endorphin"));
+    QVariant windowExternalVariant = page.mainFrame()->evaluateJavaScript(QStringLiteral("window.external"));
+    QVariant windowEndorphinVariant = page.mainFrame()->evaluateJavaScript(QStringLiteral("window.endorphin"));
 
     QCOMPARE(windowExternal, !windowExternalVariant.isNull());
     QCOMPARE(windowEndorphin, !windowEndorphinVariant.isNull());
 }
-
+*/
 void tst_WebPage::userAgent()
 {
     QSettings settings;
@@ -388,7 +401,7 @@ void tst_WebPage::userAgent()
     page.loadSettings();
     QString customUserAgent = page.call_userAgentForUrl(QUrl());
     QVERIFY(!customUserAgent.isEmpty());
-    QCOMPARE(customUserAgent, QString("ben"));
+    QCOMPARE(customUserAgent, QStringLiteral("ben"));
 }
 
 
diff --git a/autotests/webpage/webpage.pro b/autotests/webpage/webpage.pro
deleted file mode 100644
index cd99685e..00000000
--- a/autotests/webpage/webpage.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += . ../
-
-include(../autotests.pri)
-
-# Input
-SOURCES += tst_webpage.cpp
-HEADERS +=
diff --git a/autotests/xbel/CMakeLists.txt b/autotests/xbel/CMakeLists.txt
new file mode 100644
index 00000000..3ab96188
--- /dev/null
+++ b/autotests/xbel/CMakeLists.txt
@@ -0,0 +1,7 @@
+project(test-xbel)
+find_package(Qt5Test REQUIRED)
+
+QT5_ADD_RESOURCES(RSCS xbels.qrc)
+
+add_executable(test-xbel tst_xbel.cpp ${RSCS})
+target_link_libraries(test-xbel xbel Qt5::Test)
diff --git a/autotests/xbel/tst_xbel.cpp b/autotests/xbel/tst_xbel.cpp
index d74bda56..1279d9dd 100644
--- a/autotests/xbel/tst_xbel.cpp
+++ b/autotests/xbel/tst_xbel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,13 +27,13 @@ class tst_Xbel : public QObject
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void initTestCase();
     void cleanupTestCase();
     void init();
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void xbelreader_data();
     void xbelreader();
 
@@ -105,9 +105,9 @@ void tst_Xbel::read_data()
     QTest::addColumn<QString>("fileName");
     QTest::addColumn<QXmlStreamReader::Error>("error");
     QTest::newRow("null") << QString() << QXmlStreamReader::NoError;
-    QTest::newRow("frank") << QString("frank.xbel") << QXmlStreamReader::NoError;
-    QTest::newRow("frank") << QString("all.xbel") << QXmlStreamReader::NoError;
-    QTest::newRow("bad") << QString("bad.xbel") << QXmlStreamReader::CustomError;
+    QTest::newRow("frank") << QStringLiteral(":/frank.xbel") << QXmlStreamReader::NoError;
+    QTest::newRow("frank") << QStringLiteral(":/all.xbel") << QXmlStreamReader::NoError;
+    QTest::newRow("bad") << QStringLiteral(":/bad.xbel") << QXmlStreamReader::CustomError;
 }
 
 // public BookmarkNode *read(QString const &fileName)
@@ -127,7 +127,7 @@ void tst_Xbel::read()
 void tst_Xbel::readProperly()
 {
     SubXbelReader reader;
-    BookmarkNode *root = reader.read("all.xbel");
+    BookmarkNode *root = reader.read(":/all.xbel");
     QCOMPARE(reader.error(), QXmlStreamReader::NoError);
     QList<BookmarkNode*>children = root->children();
     QCOMPARE(children.count(), 4);
@@ -145,30 +145,30 @@ void tst_Xbel::readProperly()
     QCOMPARE(children[1]->type(), BookmarkNode::Folder);
 
     QCOMPARE(children[2]->children().count(), 3);
-    QCOMPARE(children[2]->title, QString("Folder Title"));
+    QCOMPARE(children[2]->title, QStringLiteral("Folder Title"));
     QCOMPARE(children[2]->url, QString());
     QCOMPARE(children[2]->expanded, false);
     QCOMPARE(children[2]->type(), BookmarkNode::Folder);
     {
         children = children[2]->children();
         QCOMPARE(children[0]->children().count(), 0);
-        QCOMPARE(children[0]->title, QString("Title"));
-        QCOMPARE(children[0]->url, QString("http://www.foo.com/"));
+        QCOMPARE(children[0]->title, QStringLiteral("Title"));
+        QCOMPARE(children[0]->url, QStringLiteral("http://www.foo.com/"));
         QCOMPARE(children[0]->expanded, false);
         QCOMPARE(children[0]->type(), BookmarkNode::Bookmark);
 
         QCOMPARE(children[1]->children().count(), 0);
-        QCOMPARE(children[1]->title, QString("Title 2"));
-        QCOMPARE(children[1]->url, QString("http://www.bar.com/"));
+        QCOMPARE(children[1]->title, QStringLiteral("Title 2"));
+        QCOMPARE(children[1]->url, QStringLiteral("http://www.bar.com/"));
         QCOMPARE(children[1]->expanded, false);
         QCOMPARE(children[1]->type(), BookmarkNode::Bookmark);
 
-        QCOMPARE(children[2]->title, QString("Title 3"));
+        QCOMPARE(children[2]->title, QStringLiteral("Title 3"));
     }
 
     children = root->children();
     QCOMPARE(children[3]->children().count(), 3);
-    QCOMPARE(children[3]->title, QString("Has SubFolder"));
+    QCOMPARE(children[3]->title, QStringLiteral("Has SubFolder"));
     QCOMPARE(children[3]->url, QString());
     QCOMPARE(children[3]->expanded, true);
     QCOMPARE(children[3]->type(), BookmarkNode::Folder);
@@ -181,7 +181,7 @@ void tst_Xbel::readProperly()
         QCOMPARE(children[0]->type(), BookmarkNode::Separator);
 
         QCOMPARE(children[1]->children().count(), 3);
-        QCOMPARE(children[1]->title, QString("SubFolder"));
+        QCOMPARE(children[1]->title, QStringLiteral("SubFolder"));
         QCOMPARE(children[1]->url, QString());
         QCOMPARE(children[1]->expanded, true);
         QCOMPARE(children[1]->type(), BookmarkNode::Folder);
@@ -212,8 +212,8 @@ void tst_Xbel::xbelwriter()
 void tst_Xbel::write_data()
 {
     QTest::addColumn<QString>("readFileName");
-    QTest::newRow("frank") << QString("frank.xbel");
-    QTest::newRow("all") << QString("all.xbel");
+    QTest::newRow("frank") << QStringLiteral(":/frank.xbel");
+    QTest::newRow("all") << QStringLiteral(":/all.xbel");
 }
 
 // public BookmarkNode *read(QString const &fileName)
diff --git a/autotests/xbel/xbel.pro b/autotests/xbel/xbel.pro
deleted file mode 100644
index d9e417c7..00000000
--- a/autotests/xbel/xbel.pro
+++ /dev/null
@@ -1,18 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../autotests.pri)
-
-# Input
-SOURCES = \
-    tst_xbel.cpp \
-    bookmarks/bookmarknode.cpp \
-    bookmarks/xbel/xbelreader.cpp \
-    bookmarks/xbel/xbelwriter.cpp
-
-HEADERS = \
-    bookmarks/bookmarknode.h \
-    bookmarks/xbel/xbelreader.h \
-    bookmarks/xbel/xbelwriter.h
diff --git a/autotests/xbel/xbels.qrc b/autotests/xbel/xbels.qrc
new file mode 100644
index 00000000..ecc40cd4
--- /dev/null
+++ b/autotests/xbel/xbels.qrc
@@ -0,0 +1,7 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource>
+    <file>all.xbel</file>
+    <file>frank.xbel</file>
+    <file>bad.xbel</file>
+</qresource>
+</RCC>
\ No newline at end of file
diff --git a/debian/copyright b/debian/copyright
index d5e2a493..42a9ba8f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,20 +8,19 @@ Upstream Author:
    Aaron Dewes <aaron.dewes@web.de>
 
 Copyright:
- Copyright 1998-1999 Netscape Communications Corporation. All
  Copyright 2005-2008 Trolltech ASA. All rights reserved.
  Copyright 2006 Junio C Hamano
- Copyright 2007-2009 Aaron Dewes <aaron.dewes@web.de>
+ Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  Copyright 2008 Ariya Hidayat <ariya.hidayat@gmail.com>
  Copyright 2008-2009 Christian Franke <cfchris6@ts2server.com>
  Copyright 2008 Diego Iastrubni, elcuco, at, kde.org
  Copyright 2008 Jason A. Donenfeld <Jason@zx2c4.com>
  Copyright 2008 Matvey Kozhev <sikon@ubuntu.com>
- Copyright 2008-2009 Endorphin Developers
+ Copyright 2008-2020 Endorphin Developers
  Copyright 2008-2009 Benjamin K. Stuhl <bks24@cornell.edu>
  Copyright 2008-2009 Jason A. Donenfeld <Jason@zx2c4.com>
  Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
- Copyright 2009 Torch Mobile Inc. http://www.torchmobile.com/
+ Copyright 2016 The Qt Company Ltd.
 
 License:
 
diff --git a/definitions.cmake b/definitions.cmake
new file mode 100644
index 00000000..c450f7f1
--- /dev/null
+++ b/definitions.cmake
@@ -0,0 +1,101 @@
+
+set(ENDORPHIN_SRC_DIR ${CMAKE_SOURCE_DIR}/src)
+
+set(ENDORPHIN_INCLUDE_DIRS
+    ${ENDORPHIN_SRC_DIR}
+    src/utils
+    src/bookmarks
+    src/bookmarks/xbel
+    src/data
+    src/history
+    src/htmls
+    src/locationbar
+    src/opensearch
+    src/useragent
+    src/utils
+)
+
+set(ENDORPHIN_AUTOUIC_SEARCH_PATHS
+    ${ENDORPHIN_INCLUDE_DIRS}
+)
+
+set(ENDORPHIN_SRCS
+    src/aboutdialog.cpp
+    src/acceptlanguagedialog.cpp
+    src/autosaver.cpp
+    src/browserapplication.cpp
+    src/browsermainwindow.cpp
+    src/clearprivatedata.cpp
+    src/clearbutton.cpp
+    src/devtoolswindow.cpp
+    src/downloadmanager.cpp
+    src/modelmenu.cpp
+    src/modeltoolbar.cpp
+    src/permissionbar.cpp
+    src/plaintexteditsearch.cpp
+    src/savepagedialog.cpp
+    src/searchbar.cpp
+    src/searchbutton.cpp
+    src/searchlineedit.cpp
+    src/settings.cpp
+    src/tabbar.cpp
+    src/tabwidget.cpp
+    src/toolbarsearch.cpp
+    src/webactionmapper.cpp
+    src/webpage.cpp
+    src/webview.cpp
+    src/webviewsearch.cpp
+    src/bookmarks/addbookmarkdialog.cpp
+    src/bookmarks/bookmarksdialog.cpp
+    src/bookmarks/bookmarksmanager.cpp
+    src/bookmarks/bookmarksmenu.cpp
+    src/bookmarks/bookmarksmodel.cpp
+    src/bookmarks/bookmarkstoolbar.cpp
+    src/bookmarks/bookmarknode.cpp
+    src/history/history.cpp
+    src/locationcompleter.cpp
+    src/history/historymanager.cpp
+    src/locationbar/locationbar.cpp
+    src/locationbar/locationbarsiteicon.cpp
+    src/locationbar/privacyindicator.cpp
+    src/opensearch/opensearchdialog.cpp
+    src/opensearch/opensearchengine.cpp
+    src/opensearch/opensearchenginedelegate.cpp
+    src/opensearch/opensearchengineaction.cpp
+    src/opensearch/opensearchenginemodel.cpp
+    src/opensearch/opensearchmanager.cpp
+    src/opensearch/opensearchreader.cpp
+    src/opensearch/opensearchwriter.cpp
+    src/useragent/useragentmenu.cpp
+    src/utils/explorerstyle.cpp
+    src/utils/editlistview.cpp
+    src/utils/edittableview.cpp
+    src/utils/edittreeview.cpp
+    src/utils/languagemanager.cpp
+    src/utils/lineedit.cpp
+    src/utils/singleapplication.cpp
+    src/utils/squeezelabel.cpp
+    src/utils/treesortfilterproxymodel.cpp
+)
+
+set(ENDORPHIN_UIS
+    src/aboutdialog.ui
+    src/acceptlanguagedialog.ui
+    src/downloaditem.ui
+    src/downloads.ui
+    src/savepagedialog.ui
+    src/searchbanner.ui
+    src/settings.ui
+    src/bookmarks/addbookmarkdialog.ui
+    src/bookmarks/bookmarksdialog.ui
+    src/history/history.ui
+    src/opensearch/opensearchdialog.ui
+)
+
+set(ENDORPHIN_RSCS
+    src/data/data.qrc
+    src/data/graphics/graphics.qrc
+    src/data/searchengines/searchengines.qrc
+    src/htmls/htmls.qrc
+    src/useragent/useragents.qrc
+)
diff --git a/endorphin.pro b/endorphin.pro
deleted file mode 100644
index 65480cf7..00000000
--- a/endorphin.pro
+++ /dev/null
@@ -1,17 +0,0 @@
-lessThan(QT_VERSION, 5.0) {
-    error("Endorphin requires Qt 5.0 or greater")
-}
-
-TEMPLATE = subdirs
-SUBDIRS  = src tools
-CONFIG += ordered
-
-unix {
-    warning("It is recommended to use CMake instead of QMake")
-    # this is an ugly work around to do .PHONY: doc
-    doxygen.target = doc dox
-    doxygen.commands = doxygen Doxyfile
-    doxygen.depends = Doxyfile
-    QMAKE_EXTRA_TARGETS += doxygen
-}
-
diff --git a/endorphinbase.cmake b/endorphinbase.cmake
new file mode 100644
index 00000000..8eb74402
--- /dev/null
+++ b/endorphinbase.cmake
@@ -0,0 +1,25 @@
+# Create a base "library" that all tests can link against. Basically the whole browser without entrypoint and translations.
+# Used to avoid compiling files twice.
+
+find_package(Qt5Widgets REQUIRED)
+find_package(Qt5Core REQUIRED)
+find_package(Qt5Gui REQUIRED)
+find_package(Qt5WebEngine REQUIRED)
+find_package(Qt5Network REQUIRED)
+find_package(Qt5WebEngineWidgets REQUIRED)
+find_package(Qt5PrintSupport REQUIRED)
+find_package(Qt5LinguistTools REQUIRED)
+find_package(Qt5Qml REQUIRED)
+
+set(CMAKE_INCLUDE_CURRENT_DIR ON)
+set(CMAKE_AUTOMOC ON)
+
+QT5_WRAP_UI(BASE_UIS ${ENDORPHIN_UIS})
+QT5_ADD_RESOURCES(BASE_RSCS ${ENDORPHIN_RSCS})
+
+INCLUDE_DIRECTORIES(
+    ${ENDORPHIN_INCLUDE_DIRS}
+)
+
+add_library(endorphin-base STATIC ${ENDORPHIN_SRCS} ${BASE_UIS} ${BASE_RSCS} ${BASE_MOCS})
+target_link_libraries(endorphin-base xbel Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Qml Qt5::PrintSupport Qt5::WebEngine Qt5::WebEngineWidgets)
diff --git a/generate_translations.sh b/generate_translations.sh
new file mode 100755
index 00000000..7a4e0b83
--- /dev/null
+++ b/generate_translations.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+FILES="ast.ts tr_TR.ts de_DE.ts hu_HU.ts es_CR.ts zh_TW.ts cs_CZ.ts sr_RS@latin.ts fr_FR.ts pt_BR.ts es.ts sr_RS.ts ms.ts da_DK.ts sk_SK.ts ru_RU.ts he_IL.ts pt_PT.ts ko_KR.ts fr_CA.ts nl.ts el_GR.ts ca.ts pl_PL.ts nb_NO.ts uk.ts zh_CN.ts gl.ts et_EE.ts fi_FI.ts it_IT.ts ja_JP.ts gl.ts"
+for FILE in $FILES; do
+/usr/lib/qt5/bin/lupdate @ts_lst_file -ts "src/locale/${FILE}" -noobsolete
+done
diff --git a/install.pri b/install.pri
deleted file mode 100644
index 761010ee..00000000
--- a/install.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-
-unix {
-    isEmpty(PREFIX) {
-        PREFIX = /usr/local
-    }
-    BINDIR = $$PREFIX/bin
-
-    INSTALLS += target
-    target.path = $$BINDIR
-
-    DATADIR = $$PREFIX/share
-}
-
diff --git a/manualtests/adblock/adblock.pro b/manualtests/adblock/adblock.pro
deleted file mode 100644
index d0811c75..00000000
--- a/manualtests/adblock/adblock.pro
+++ /dev/null
@@ -1,6 +0,0 @@
-TEMPLATE      = subdirs
-SUBDIRS = \
-    adblockdialog \
-    adblockmodel
-
-CONFIG += ordered
diff --git a/manualtests/adblock/adblockdialog/.gitignore b/manualtests/adblock/adblockdialog/.gitignore
deleted file mode 100644
index ad6f3475..00000000
--- a/manualtests/adblock/adblockdialog/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-adblockdialog
diff --git a/manualtests/adblock/adblockdialog/adblockdialog.pro b/manualtests/adblock/adblockdialog/adblockdialog.pro
deleted file mode 100644
index 415d82fc..00000000
--- a/manualtests/adblock/adblockdialog/adblockdialog.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../manualtests.pri)
-include(../../../autotests/modeltest/modeltest.pri)
-
-# Input
-SOURCES += main_adblockdialog.cpp
-HEADERS +=
diff --git a/manualtests/adblock/adblockdialog/main_adblockdialog.cpp b/manualtests/adblock/adblockdialog/main_adblockdialog.cpp
deleted file mode 100644
index ede8d54b..00000000
--- a/manualtests/adblock/adblockdialog/main_adblockdialog.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <qapplication.h>
-#include <qtreeview.h>
-
-#include "adblockdialog.h"
-#include "modeltest.h"
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-
-    AdBlockDialog dialog;
-    new ModelTest(dialog.treeView->model());
-    dialog.show();
-    return app.exec();
-}
-
diff --git a/manualtests/adblock/adblockmodel/.gitignore b/manualtests/adblock/adblockmodel/.gitignore
deleted file mode 100644
index c2bb9418..00000000
--- a/manualtests/adblock/adblockmodel/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-adblockmodel
diff --git a/manualtests/adblock/adblockmodel/adblockmodel.pro b/manualtests/adblock/adblockmodel/adblockmodel.pro
deleted file mode 100644
index 453974d1..00000000
--- a/manualtests/adblock/adblockmodel/adblockmodel.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../manualtests.pri)
-include(../../../autotests/modeltest/modeltest.pri)
-
-# Input
-SOURCES += main_adblockmodel.cpp
-HEADERS +=
diff --git a/manualtests/adblock/adblockmodel/main_adblockmodel.cpp b/manualtests/adblock/adblockmodel/main_adblockmodel.cpp
deleted file mode 100644
index 6e255a6a..00000000
--- a/manualtests/adblock/adblockmodel/main_adblockmodel.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <qapplication.h>
-#include <qtreeview.h>
-
-#include "adblockmodel.h"
-#include "modeltest.h"
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-
-    QTreeView view;
-    AdBlockModel *model = new AdBlockModel;
-    new ModelTest(model);
-    view.setModel(model);
-    view.show();
-    return app.exec();
-}
-
diff --git a/manualtests/bookmarks/.gitignore b/manualtests/bookmarks/.gitignore
deleted file mode 100644
index 7e1f6a71..00000000
--- a/manualtests/bookmarks/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-bookmarks
diff --git a/manualtests/bookmarks/bookmarks.pro b/manualtests/bookmarks/bookmarks.pro
deleted file mode 100644
index dcb2e219..00000000
--- a/manualtests/bookmarks/bookmarks.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../manualtests.pri)
-include(../../autotests/modeltest/modeltest.pri)
-
-# Input
-SOURCES += main_bookmarks.cpp
-HEADERS +=
diff --git a/manualtests/bookmarks/main_bookmarks.cpp b/manualtests/bookmarks/main_bookmarks.cpp
deleted file mode 100644
index f30c6f00..00000000
--- a/manualtests/bookmarks/main_bookmarks.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qmenubar.h>
-
-#include "addbookmarkdialog.h"
-#include "bookmarksdialog.h"
-#include "bookmarksmanager.h"
-#include "bookmarksmodel.h"
-#include "browserapplication.h"
-#include "modeltest.h"
-
-int main(int argc, char *argv[])
-{
-    QApplication app(argc, argv);
-
-    QCoreApplication::setApplicationName(QLatin1String("endorphin"));
-    QCoreApplication::setApplicationVersion(QLatin1String("0.1"));
-
-    new ModelTest(BrowserApplication::bookmarksManager()->bookmarksModel());
-    BookmarksDialog *dialog = new BookmarksDialog;
-    dialog->show();
-
-    QString url("http://www.reddit.com");
-    AddBookmarkDialog adddialog;
-    adddialog.setTitle(QString("Reddit.com: a time drain"));
-    adddialog.setUrl(url);
-    //adddialog.show();
-
-    QMenuBar bar;
-    QMenu *edit = bar.addMenu(("&Edit"));
-    edit->addAction(BrowserApplication::bookmarksManager()->undoRedoStack()->createUndoAction(edit));
-    edit->addAction(BrowserApplication::bookmarksManager()->undoRedoStack()->createRedoAction(edit));
-    return app.exec();
-}
-
diff --git a/manualtests/downloadmanager/.gitignore b/manualtests/downloadmanager/.gitignore
deleted file mode 100644
index 45b3fddc..00000000
--- a/manualtests/downloadmanager/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-downloadmanager
diff --git a/manualtests/downloadmanager/downloadmanager.pro b/manualtests/downloadmanager/downloadmanager.pro
deleted file mode 100644
index 79f26c3f..00000000
--- a/manualtests/downloadmanager/downloadmanager.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../manualtests.pri)
-
-# Input
-RESOURCES =
-SOURCES += main_downloadmanager.cpp
-HEADERS +=
diff --git a/manualtests/downloadmanager/main_downloadmanager.cpp b/manualtests/downloadmanager/main_downloadmanager.cpp
deleted file mode 100644
index 50c4dc79..00000000
--- a/manualtests/downloadmanager/main_downloadmanager.cpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "downloadmanager.h"
-
-int main(int argc, char **argv)
-{
-    QApplication application(argc, argv);
-
-    DownloadManager manager;
-    QUrl url("http://10.0.0.3/~ben/distccKNOPPIX-1.3-2004-08-20-gcc-3.3.iso");
-    manager.download(url);
-    manager.show();
-
-    return application.exec();
-}
-
diff --git a/manualtests/history/.gitignore b/manualtests/history/.gitignore
deleted file mode 100644
index c375d5ba..00000000
--- a/manualtests/history/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-history
diff --git a/manualtests/history/history.pro b/manualtests/history/history.pro
deleted file mode 100644
index 2fa000d9..00000000
--- a/manualtests/history/history.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../manualtests.pri)
-include(../../autotests/modeltest/modeltest.pri)
-
-# Input
-SOURCES += main_history.cpp
-HEADERS +=
diff --git a/manualtests/history/main_history.cpp b/manualtests/history/main_history.cpp
deleted file mode 100644
index 1c45c4d9..00000000
--- a/manualtests/history/main_history.cpp
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qmainwindow.h>
-#include <qtableview.h>
-
-#include <history.h>
-#include <historycompleter.h>
-#include <historymanager.h>
-#include <modeltest.h>
-#include <qheaderview.h>
-
-int main(int argc, char **argv)
-{
-    QApplication application(argc, argv);
-    QMainWindow w;
-
-    QCoreApplication::setApplicationName("endorphin");
-
-    HistoryManager history;
-
-    QTabWidget tabWidget;
-
-    QTableView *historyModelView = new QTableView(&tabWidget);
-    historyModelView->horizontalHeader()->setStretchLastSection(true);
-    historyModelView->setModel(history.historyModel());
-    tabWidget.addTab(historyModelView, "HistoryModel");
-
-    QTableView *historyFilterModelView = new QTableView(&tabWidget);
-    historyFilterModelView->horizontalHeader()->setStretchLastSection(true);
-    historyFilterModelView->setModel(history.historyFilterModel());
-    tabWidget.addTab(historyFilterModelView, "HistoryFilterModel");
-
-    QTreeView *historyTreeModelView = new QTreeView(&tabWidget);
-    historyTreeModelView->header()->setStretchLastSection(true);
-    historyTreeModelView->setModel(history.historyTreeModel());
-    new ModelTest(history.historyTreeModel());
-    tabWidget.addTab(historyTreeModelView, "HistoryTreeModel");
-
-    QTreeView *historyMenuModelView = new QTreeView(&tabWidget);
-    historyMenuModelView->header()->setStretchLastSection(true);
-    HistoryMenuModel *menuModel = new HistoryMenuModel((HistoryTreeModel*)history.historyTreeModel(), &tabWidget);
-    new ModelTest(menuModel);
-    historyMenuModelView->setModel(menuModel);
-    tabWidget.addTab(historyMenuModelView, "HistoryMenuModel");
-
-    QTableView *historyCompletionModelView = new QTableView(&tabWidget);
-    historyCompletionModelView->horizontalHeader()->setStretchLastSection(true);
-    HistoryCompletionModel *completionModel = new HistoryCompletionModel(&tabWidget);
-    completionModel->setSourceModel(history.historyFilterModel());
-    historyCompletionModelView->setModel(completionModel);
-    tabWidget.addTab(historyCompletionModelView, "HistoryCompletionModel");
-
-    HistoryDialog dialog(0, &history);
-    tabWidget.addTab(dialog.tree, "DialogModel");
-
-    tabWidget.setCurrentIndex(3);
-    tabWidget.show();
-
-    return application.exec();
-}
-
diff --git a/manualtests/locationbar/.gitignore b/manualtests/locationbar/.gitignore
deleted file mode 100644
index 3c98d718..00000000
--- a/manualtests/locationbar/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-locationbar
diff --git a/manualtests/locationbar/locationbar.pro b/manualtests/locationbar/locationbar.pro
deleted file mode 100644
index 41b93df9..00000000
--- a/manualtests/locationbar/locationbar.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../manualtests.pri)
-
-# Input
-SOURCES += main_locationbar.cpp
-HEADERS +=
-
diff --git a/manualtests/locationbar/main_locationbar.cpp b/manualtests/locationbar/main_locationbar.cpp
deleted file mode 100644
index c3b5a07e..00000000
--- a/manualtests/locationbar/main_locationbar.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qmainwindow.h>
-#include <qsplitter.h>
-#include <qcombobox.h>
-#include <qlayout.h>
-#include <qtoolbar.h>
-
-#include "browserapplication.h"
-#include "locationbar.h"
-#include "webview.h"
-
-int main(int argc, char **argv)
-{
-    BrowserApplication application(argc, argv);
-    QCoreApplication::setApplicationName(QLatin1String("urllineeditexample"));
-    QMainWindow w;
-
-    QWidget *window = new QWidget;
-    QComboBox *comboBox = new QComboBox(window);
-    comboBox->setEditable(true);
-    QLineEdit *lineEdit = new QLineEdit(window);
-    LocationBar *s1 = new LocationBar(window);
-    LocationBar *s2 = new LocationBar(window);
-    WebView *view = new WebView(window);
-    view->setUrl(QUrl("http://www.google.com"));
-    s2->setWebView(view);
-
-    QVBoxLayout *layout = new QVBoxLayout;
-    layout->addWidget(comboBox);
-    layout->addWidget(lineEdit);
-    layout->addWidget(s1);
-    layout->addWidget(s2);
-    layout->addWidget(view);
-    window->setLayout(layout);
-    w.show();
-    w.setCentralWidget(window);
-
-    QToolBar *bar = w.addToolBar("foo");
-    QSplitter *splitter = new QSplitter(window);
-    splitter->addWidget(new LocationBar);
-    splitter->addWidget(new QLineEdit);
-    bar->addWidget(splitter);
-    return application.exec();
-}
-
diff --git a/manualtests/manualtests.pri b/manualtests/manualtests.pri
deleted file mode 100644
index eab9f33c..00000000
--- a/manualtests/manualtests.pri
+++ /dev/null
@@ -1,4 +0,0 @@
-win32: CONFIG += console
-mac:CONFIG -= app_bundle
-
-include($$PWD/../src/src.pri)
diff --git a/manualtests/manualtests.pro b/manualtests/manualtests.pro
deleted file mode 100644
index 52817cad..00000000
--- a/manualtests/manualtests.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-TEMPLATE      = subdirs
-SUBDIRS = \
-    adblock \
-    bookmarks \
-    downloadmanager \
-    history \
-    locationbar \
-    modelmenu \
-    searchlineedit \
-    utils \
-    webviewsearch
-
-CONFIG += ordered
diff --git a/manualtests/modelmenu/.gitignore b/manualtests/modelmenu/.gitignore
deleted file mode 100644
index 2f8ac853..00000000
--- a/manualtests/modelmenu/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-modelmenu
diff --git a/manualtests/modelmenu/main_modelmenu.cpp b/manualtests/modelmenu/main_modelmenu.cpp
deleted file mode 100644
index 279c342c..00000000
--- a/manualtests/modelmenu/main_modelmenu.cpp
+++ /dev/null
@@ -1,102 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <qapplication.h>
-#include <qmenubar.h>
-#include <qdirmodel.h>
-#include <qmainwindow.h>
-
-#include <qdebug.h>
-
-#include <modelmenu.h>
-
-class Menu : public ModelMenu
-{
-    Q_OBJECT
-
-public:
-    Menu(QWidget *parent);
-
-protected:
-    bool prePopulated();
-    void postPopulated();
-    ModelMenu *createBaseMenu();
-
-private slots:
-    void activated2(const QModelIndex &index);
-
-};
-
-Menu::Menu(QWidget *parent)
-    : ModelMenu(parent)
-{
-    connect(this, SIGNAL(activated(const QModelIndex &)),
-            this, SLOT(activated2(const QModelIndex &)));
-}
-
-bool Menu::prePopulated()
-{
-    qDebug() << __FUNCTION__;
-    return ModelMenu::prePopulated();
-}
-
-void Menu::postPopulated()
-{
-    qDebug() << __FUNCTION__;
-    return ModelMenu::postPopulated();
-}
-
-ModelMenu *Menu::createBaseMenu()
-{
-    qDebug() << __FUNCTION__;
-    return new Menu(this);
-    return ModelMenu::createBaseMenu();
-}
-
-void Menu::activated2(const QModelIndex &index)
-{
-    qDebug() << __FUNCTION__ << index.data() << this;
-}
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-
-    QMainWindow mainWindow;
-    Menu *menu = new Menu(&mainWindow);
-    menu->setTitle("Test");
-    QDirModel *model = new QDirModel(menu);
-    menu->setModel(model);
-    menu->setRootIndex(model->index(QDir::homePath()));
-    mainWindow.menuBar()->addMenu(menu);
-    mainWindow.show();
-    return app.exec();
-}
-
-#include "main_modelmenu.moc"
-
diff --git a/manualtests/modelmenu/modelmenu.pro b/manualtests/modelmenu/modelmenu.pro
deleted file mode 100644
index 78a06670..00000000
--- a/manualtests/modelmenu/modelmenu.pro
+++ /dev/null
@@ -1,10 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../manualtests.pri)
-
-# Input
-SOURCES += main_modelmenu.cpp
-HEADERS +=
diff --git a/manualtests/searchlineedit/.gitignore b/manualtests/searchlineedit/.gitignore
deleted file mode 100644
index 1713e66b..00000000
--- a/manualtests/searchlineedit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-searchlineedit
diff --git a/manualtests/searchlineedit/main_searchlineedit.cpp b/manualtests/searchlineedit/main_searchlineedit.cpp
deleted file mode 100644
index 53b7c971..00000000
--- a/manualtests/searchlineedit/main_searchlineedit.cpp
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qapplication.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qcompleter.h>
-#include <qstringlistmodel.h>
-#include <qdialog.h>
-
-#include "searchlineedit.h"
-#include "searchbutton.h"
-
-int main(int argc, char **argv)
-{
-    QApplication application(argc, argv);
-
-    QDialog window;
-    QPushButton *button1 = new QPushButton("One");
-    SearchLineEdit *s1 = new SearchLineEdit(&window);
-    SearchLineEdit *s2 = new SearchLineEdit(&window);
-    QCompleter *completer = new QCompleter(&window);
-    s2->setCompleter(completer);
-    s2->searchButton()->setShowMenuTriangle(true);
-    QObject::connect(s2->searchButton(), SIGNAL(clicked()),
-            completer, SLOT(complete()));
-    QStringList list;
-    list << "a" << "b" << "c";
-    s2->completer()->setModel(new QStringListModel(list));
-
-    QVBoxLayout *layout = new QVBoxLayout;
-    layout->addWidget(s1);
-    layout->addWidget(s2);
-    layout->addWidget(button1);
-
-    window.setLayout(layout);
-    window.show();
-    return application.exec();
-}
-
diff --git a/manualtests/searchlineedit/searchlineedit.pro b/manualtests/searchlineedit/searchlineedit.pro
deleted file mode 100644
index 3cc1340b..00000000
--- a/manualtests/searchlineedit/searchlineedit.pro
+++ /dev/null
@@ -1,14 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../manualtests.pri)
-
-# Input
-RESOURCES =
-FORMS =
-SOURCES = searchbutton.cpp clearbutton.cpp lineedit.cpp searchlineedit.cpp
-HEADERS = searchbutton.h clearbutton.h lineedit.h lineedit_p.h searchlineedit.h
-
-SOURCES += main_searchlineedit.cpp
diff --git a/manualtests/utils/editview/.gitignore b/manualtests/utils/editview/.gitignore
deleted file mode 100644
index 53dfa8a4..00000000
--- a/manualtests/utils/editview/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-editview
diff --git a/manualtests/utils/editview/editview.pro b/manualtests/utils/editview/editview.pro
deleted file mode 100644
index 18c3fe24..00000000
--- a/manualtests/utils/editview/editview.pro
+++ /dev/null
@@ -1,11 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../manualtests.pri)
-
-# Input
-FORMS   += editview.ui
-SOURCES += main_editview.cpp
-HEADERS +=
diff --git a/manualtests/utils/editview/editview.ui b/manualtests/utils/editview/editview.ui
deleted file mode 100644
index beee2a32..00000000
--- a/manualtests/utils/editview/editview.ui
+++ /dev/null
@@ -1,87 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>790</width>
-    <height>398</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
-   <item>
-    <widget class="QSplitter" name="splitter">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <widget class="QWidget" name="layoutWidget">
-      <layout class="QVBoxLayout" name="verticalLayout_3">
-       <item>
-        <widget class="EditListView" name="listView"/>
-       </item>
-       <item>
-        <widget class="QPushButton" name="listViewRemoveAllButton">
-         <property name="text">
-          <string>RemoveAll</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="layoutWidget">
-      <layout class="QVBoxLayout" name="verticalLayout_2">
-       <item>
-        <widget class="EditTreeView" name="treeView"/>
-       </item>
-       <item>
-        <widget class="QPushButton" name="treeViewRemoveAllButton">
-         <property name="text">
-          <string>RemoveAll</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="layoutWidget">
-      <layout class="QVBoxLayout" name="verticalLayout">
-       <item>
-        <widget class="EditTableView" name="tableView"/>
-       </item>
-       <item>
-        <widget class="QPushButton" name="tableViewRemoveAllButton">
-         <property name="text">
-          <string>RemoveAll</string>
-         </property>
-        </widget>
-       </item>
-      </layout>
-     </widget>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>EditListView</class>
-   <extends>QListView</extends>
-   <header>editlistview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>EditTreeView</class>
-   <extends>QTreeView</extends>
-   <header>edittreeview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>EditTableView</class>
-   <extends>QTableView</extends>
-   <header>edittableview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/manualtests/utils/editview/main_editview.cpp b/manualtests/utils/editview/main_editview.cpp
deleted file mode 100644
index 578f1983..00000000
--- a/manualtests/utils/editview/main_editview.cpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <qapplication.h>
-#include <qstringlistmodel.h>
-#include <qstandarditemmodel.h>
-
-#include "ui_editview.h"
-
-class Window : public QDialog, public Ui_Dialog
-{
-    Q_OBJECT
-
-public:
-    Window();
-};
-
-Window::Window()
-    : QDialog()
-{
-    setupUi(this);
-    QStringList list;
-    list << "a" << "b" << "c";
-    listView->setModel(new QStringListModel(list));
-    tableView->setModel(new QStringListModel(list));
-    connect(listViewRemoveAllButton, SIGNAL(clicked()), listView, SLOT(removeAll()));
-    connect(tableViewRemoveAllButton, SIGNAL(clicked()), tableView, SLOT(removeAll()));
-    connect(treeViewRemoveAllButton, SIGNAL(clicked()), treeView, SLOT(removeAll()));
-
-    QStandardItemModel *model = new QStandardItemModel(this);
-    QStandardItem *parentItem = model->invisibleRootItem();
-    for (int i = 0; i < 4; ++i) {
-        QStandardItem *item = new QStandardItem(QString("item %0").arg(i));
-        parentItem->appendRow(item);
-        item = new QStandardItem(QString("item %0").arg(i * 2));
-        parentItem->appendRow(item);
-        parentItem = item;
-    }
-    treeView->setModel(model);
-    treeView->expandAll();
-}
-
-int main(int argc, char **argv)
-{
-    QApplication app(argc, argv);
-    Window window;
-    window.show();
-    return app.exec();
-}
-
-#include "main_editview.moc"
-
diff --git a/manualtests/utils/lineedit/.gitignore b/manualtests/utils/lineedit/.gitignore
deleted file mode 100644
index 19f5a9a7..00000000
--- a/manualtests/utils/lineedit/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-lineedit
diff --git a/manualtests/utils/lineedit/bookmark.png b/manualtests/utils/lineedit/bookmark.png
deleted file mode 100644
index be21134b..00000000
Binary files a/manualtests/utils/lineedit/bookmark.png and /dev/null differ
diff --git a/manualtests/utils/lineedit/dialog.ui b/manualtests/utils/lineedit/dialog.ui
deleted file mode 100644
index e5501383..00000000
--- a/manualtests/utils/lineedit/dialog.ui
+++ /dev/null
@@ -1,289 +0,0 @@
-<ui version="4.0" >
- <class>Dialog</class>
- <widget class="QDialog" name="Dialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>474</width>
-    <height>348</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Dialog</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3" >
-   <item>
-    <layout class="QGridLayout" name="gridLayout" >
-     <item row="1" column="0" >
-      <widget class="QLabel" name="label_2" >
-       <property name="text" >
-        <string>Left:</string>
-       </property>
-       <property name="alignment" >
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1" >
-      <widget class="LineEdit" name="leftLineEdit" >
-       <property name="text" >
-        <string>Foo Bar Baz Endorphin LineEdit Manual Test This is the end</string>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0" >
-      <widget class="QLabel" name="label_3" >
-       <property name="text" >
-        <string>Right:</string>
-       </property>
-       <property name="alignment" >
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="1" >
-      <widget class="LineEdit" name="rightLineEdit" >
-       <property name="text" >
-        <string>Foo Bar Baz Endorphin LineEdit Manual Test This is the end</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="1" >
-      <widget class="LineEdit" name="emptyLineEdit" >
-       <property name="text" >
-        <string>Foo Bar Baz Endorphin LineEdit Manual Test This is the end</string>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="0" >
-      <widget class="QLabel" name="label" >
-       <property name="text" >
-        <string>Empty:</string>
-       </property>
-       <property name="alignment" >
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="0" column="2" >
-      <spacer name="horizontalSpacer_3" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="Line" name="line" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_3" >
-     <item>
-      <spacer name="horizontalSpacer" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="LineEdit" name="lineEdit" >
-       <property name="text" >
-        <string>Foo Bar Baz Endorphin LineEdit Manual Test</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2" >
-     <item>
-      <widget class="QGroupBox" name="widgetsGroupBox" >
-       <property name="title" >
-        <string>Widget</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout_2" >
-        <item>
-         <widget class="QRadioButton" name="siteIconWidget" >
-          <property name="text" >
-           <string>Site Icon</string>
-          </property>
-          <property name="checked" >
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QRadioButton" name="rssWidget" >
-          <property name="text" >
-           <string>RSS</string>
-          </property>
-          <property name="checked" >
-           <bool>false</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QRadioButton" name="bookmarkWidget" >
-          <property name="text" >
-           <string>Bookmark</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QGroupBox" name="positionGroupBox" >
-       <property name="title" >
-        <string>Position</string>
-       </property>
-       <layout class="QVBoxLayout" name="verticalLayout" >
-        <item>
-         <widget class="QRadioButton" name="leftSide" >
-          <property name="text" >
-           <string>Left</string>
-          </property>
-          <property name="checked" >
-           <bool>true</bool>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QRadioButton" name="rightSide" >
-          <property name="text" >
-           <string>Right</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="spacing" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Minimum" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="value" >
-        <number>3</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_5" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <spacer name="verticalSpacer" >
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0" >
-      <size>
-       <width>20</width>
-       <height>28</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout" >
-     <item>
-      <widget class="QPushButton" name="addButton" >
-       <property name="text" >
-        <string>Add</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="removeButton" >
-       <property name="text" >
-        <string>Remove</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="showButton" >
-       <property name="text" >
-        <string>Swap Visibility</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_4" >
-       <property name="orientation" >
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0" >
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="addToolButtonButton" >
-       <property name="text" >
-        <string>Add ToolButton</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>LineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>lineedit.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>
diff --git a/manualtests/utils/lineedit/lineedit.pro b/manualtests/utils/lineedit/lineedit.pro
deleted file mode 100644
index 55d0d804..00000000
--- a/manualtests/utils/lineedit/lineedit.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../manualtests.pri)
-
-# Input
-RESOURCES =
-FORMS   = dialog.ui
-SOURCES = main_lineedit.cpp lineedit.cpp
-HEADERS = lineedit.h lineedit_p.h
diff --git a/manualtests/utils/lineedit/main_lineedit.cpp b/manualtests/utils/lineedit/main_lineedit.cpp
deleted file mode 100644
index 2403cff0..00000000
--- a/manualtests/utils/lineedit/main_lineedit.cpp
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qtoolbutton.h>
-#include <qdebug.h>
-
-#include <lineedit.h>
-#include "ui_dialog.h"
-
-class Dialog : public QDialog, public Ui_Dialog
-{
-    Q_OBJECT
-public:
-    Dialog(QWidget *parent = 0);
-
-    QLabel *rssButton;
-    QLabel *bookmarkButton;
-    QLabel *siteIconButton;
-
-private slots:
-    void setWidgetSpacing(int s);
-    void add();
-    void remove();
-    void showW();
-    void addToolButton();
-
-    QWidget *getWidget();
-};
-
-Dialog::Dialog(QWidget *parent)
-    : QDialog(parent)
-{
-    setupUi(this);
-    rssButton = new QLabel(this);
-    rssButton->setPixmap(QPixmap("rss.png"));
-    rssButton->hide();
-    bookmarkButton = new QLabel(this);
-    bookmarkButton->setPixmap(QPixmap("bookmark.png"));
-    bookmarkButton->hide();
-    siteIconButton = new QLabel(this);
-    siteIconButton->setPixmap(QPixmap("siteicon.png"));
-    siteIconButton->hide();
-
-    {
-        QToolButton *b = new QToolButton(this);
-        b->resize(16, 16);
-        leftLineEdit->addWidget(b, LineEdit::LeftSide);
-    }
-    {
-        QToolButton *b = new QToolButton(this);
-        b->resize(16, 16);
-        rightLineEdit->addWidget(b, LineEdit::RightSide);
-    }
-    connect(addButton, SIGNAL(clicked()), this, SLOT(add()));
-    connect(removeButton, SIGNAL(clicked()), this, SLOT(remove()));
-    connect(showButton, SIGNAL(clicked()), this, SLOT(showW()));
-    connect(addToolButtonButton, SIGNAL(clicked()), this, SLOT(addToolButton()));
-    connect(spacing, SIGNAL(valueChanged(int)), this, SLOT(setWidgetSpacing(int)));
-}
-
-QWidget *Dialog::getWidget()
-{
-    if (rssWidget->isChecked()) {
-        bookmarkWidget->setChecked(true);
-        return rssButton;
-    }
-    if (bookmarkWidget->isChecked()) {
-        siteIconWidget->setChecked(true);
-        return bookmarkButton;
-    }
-    if (siteIconWidget->isChecked()) {
-        rssWidget->setChecked(true);
-        return siteIconButton;
-    }
-    return 0;
-}
-
-void Dialog::setWidgetSpacing(int s)
-{
-    lineEdit->setWidgetSpacing(s);
-}
-
-void Dialog::add()
-{
-    LineEdit::WidgetPosition position = leftSide->isChecked() ? LineEdit::LeftSide : LineEdit::RightSide;
-    lineEdit->addWidget(getWidget(), position);
-}
-
-void Dialog::remove()
-{
-    lineEdit->removeWidget(getWidget());
-}
-
-void Dialog::showW()
-{
-    QWidget *w = getWidget();
-    w->setVisible(!w->isVisible());
-}
-
-void Dialog::addToolButton()
-{
-    LineEdit::WidgetPosition position = leftSide->isChecked() ? LineEdit::LeftSide : LineEdit::RightSide;
-    QToolButton *button = new QToolButton;
-    lineEdit->addWidget(button, position);
-}
-
-int main(int argc,char ** argv)
-{
-    QApplication app(argc,argv);
-
-    if (app.arguments().count() == 1) {
-        Dialog dialog;
-        dialog.show();
-        return app.exec();
-    } else {
-        LineEdit lineEdit;
-        QPushButton *rightButton = new QPushButton("Dialog bar");
-        qDebug() << rightButton->sizeHint();
-        lineEdit.addWidget(rightButton, LineEdit::RightSide);
-        lineEdit.show();
-        return app.exec();
-    }
-}
-
-#include "main_lineedit.moc"
-
diff --git a/manualtests/utils/lineedit/rss.png b/manualtests/utils/lineedit/rss.png
deleted file mode 100755
index b3c949d2..00000000
Binary files a/manualtests/utils/lineedit/rss.png and /dev/null differ
diff --git a/manualtests/utils/lineedit/siteicon.png b/manualtests/utils/lineedit/siteicon.png
deleted file mode 100644
index e0caa872..00000000
Binary files a/manualtests/utils/lineedit/siteicon.png and /dev/null differ
diff --git a/manualtests/utils/singleapplication/.gitignore b/manualtests/utils/singleapplication/.gitignore
deleted file mode 100644
index a24818bd..00000000
--- a/manualtests/utils/singleapplication/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-singleapplication
diff --git a/manualtests/utils/singleapplication/main_singleapplication.cpp b/manualtests/utils/singleapplication/main_singleapplication.cpp
deleted file mode 100644
index fc9a24ae..00000000
--- a/manualtests/utils/singleapplication/main_singleapplication.cpp
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright (c) 2008, Aaron Dewes
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include <qplaintextedit.h>
-#include <qdebug.h>
-#include <qlocalsocket.h>
-#include <qtextstream.h>
-
-#include <singleapplication.h>
-
-class PlainTextEdit : public QPlainTextEdit {
-    Q_OBJECT
-
-public:
-    PlainTextEdit(QWidget *parent = 0)
-        : QPlainTextEdit(parent) { }
-
-public slots:
-    void messageReceived(QLocalSocket *socket) {
-        QString message;
-        QTextStream stream(socket);
-        stream >> message;
-        appendPlainText(message);
-    }
-
-};
-
-int main(int argc, char **argv)
-{
-    SingleApplication app(argc, argv);
-    app.setApplicationName("testapp");
-    if (app.arguments().count() > 1
-        && app.sendMessage(app.arguments().last().toUtf8()))
-        return 0;
-
-    PlainTextEdit plainTextEdit;
-    plainTextEdit.show();
-    if (!app.startSingleServer())
-        qWarning() << "Error starting server";
-    app.connect(&app, SIGNAL(messageReceived(QLocalSocket *)),
-                &plainTextEdit, SLOT(messageReceived(QLocalSocket *)));
-    return app.exec();
-}
-
-#include "main_singleapplication.moc"
-
diff --git a/manualtests/utils/singleapplication/singleapplication.pro b/manualtests/utils/singleapplication/singleapplication.pro
deleted file mode 100644
index a511dcd1..00000000
--- a/manualtests/utils/singleapplication/singleapplication.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../manualtests.pri)
-
-# Input
-RESOURCES =
-FORMS =
-SOURCES = main_singleapplication.cpp singleapplication.cpp
-HEADERS = singleapplication.h
diff --git a/manualtests/utils/squeezelabel/.gitignore b/manualtests/utils/squeezelabel/.gitignore
deleted file mode 100644
index f6332511..00000000
--- a/manualtests/utils/squeezelabel/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-squeezelabel
diff --git a/manualtests/utils/squeezelabel/main_squeezelabel.cpp b/manualtests/utils/squeezelabel/main_squeezelabel.cpp
deleted file mode 100644
index eb9c07d5..00000000
--- a/manualtests/utils/squeezelabel/main_squeezelabel.cpp
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qapplication.h>
-
-#include "squeezelabel.h"
-
-int main(int argc, char **argv)
-{
-    QApplication application(argc, argv);
-
-    SqueezeLabel label;
-    if (application.arguments().count() > 1)
-        label.setText(application.arguments().value(1));
-    else
-        label.setText("This is one long sentence that I will have to ponder the meaning of");
-    label.show();
-    label.resize(100, label.height());
-
-    return application.exec();
-}
-
diff --git a/manualtests/utils/squeezelabel/squeezelabel.pro b/manualtests/utils/squeezelabel/squeezelabel.pro
deleted file mode 100644
index 502ba275..00000000
--- a/manualtests/utils/squeezelabel/squeezelabel.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../manualtests.pri)
-
-# Input
-RESOURCES =
-FORMS =
-SOURCES = main_squeezelabel.cpp squeezelabel.cpp
-HEADERS = squeezelabel.h
diff --git a/manualtests/utils/treesortfilterproxymodel/.gitignore b/manualtests/utils/treesortfilterproxymodel/.gitignore
deleted file mode 100644
index c3df39de..00000000
--- a/manualtests/utils/treesortfilterproxymodel/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-treesortfilterproxymodel
diff --git a/manualtests/utils/treesortfilterproxymodel/main_treesortfilterproxymodel.cpp b/manualtests/utils/treesortfilterproxymodel/main_treesortfilterproxymodel.cpp
deleted file mode 100644
index 46c3ec83..00000000
--- a/manualtests/utils/treesortfilterproxymodel/main_treesortfilterproxymodel.cpp
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "treesortfilterproxymodel.h"
-#include "ui_treesortfilterproxymodeldialog.h"
-
-#include <qapplication.h>
-#include <qdirmodel.h>
-#include <qtreeview.h>
-
-int main(int argc, char **argv)
-{
-    QApplication application(argc, argv);
-
-    QDialog dialog;
-    Ui_TreeSortFilterProxyModelDialog ui;
-    ui.setupUi(&dialog);
-
-    TreeSortFilterProxyModel *proxy = new TreeSortFilterProxyModel(&dialog);
-    dialog.connect(ui.search, SIGNAL(textChanged(const QString &)),
-            proxy, SLOT(setFilterRegExp(const QString &)));
-    QDirModel *dirModel = new QDirModel(&dialog);
-    proxy->setSourceModel(dirModel);
-    ui.treeView->setModel(proxy);
-    ui.treeView->setRootIndex(proxy->mapFromSource(dirModel->index(QDir::homePath())));
-    dialog.show();
-
-    return application.exec();
-}
-
diff --git a/manualtests/utils/treesortfilterproxymodel/treesortfilterproxymodel.pro b/manualtests/utils/treesortfilterproxymodel/treesortfilterproxymodel.pro
deleted file mode 100644
index 8cba043b..00000000
--- a/manualtests/utils/treesortfilterproxymodel/treesortfilterproxymodel.pro
+++ /dev/null
@@ -1,12 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../../manualtests.pri)
-
-# Input
-SOURCES = main_treesortfilterproxymodel.cpp treesortfilterproxymodel.cpp
-HEADERS = treesortfilterproxymodel.h
-
-FORMS += treesortfilterproxymodeldialog.ui
diff --git a/manualtests/utils/treesortfilterproxymodel/treesortfilterproxymodeldialog.ui b/manualtests/utils/treesortfilterproxymodel/treesortfilterproxymodeldialog.ui
deleted file mode 100644
index 842cc4be..00000000
--- a/manualtests/utils/treesortfilterproxymodel/treesortfilterproxymodeldialog.ui
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>TreeSortFilterProxyModelDialog</class>
- <widget class="QDialog" name="TreeSortFilterProxyModelDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>400</width>
-    <height>300</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Dialog</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLineEdit" name="search"/>
-   </item>
-   <item row="1" column="0">
-    <widget class="QTreeView" name="treeView"/>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/manualtests/utils/utils.pro b/manualtests/utils/utils.pro
deleted file mode 100644
index 1f38ed5d..00000000
--- a/manualtests/utils/utils.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE      = subdirs
-SUBDIRS = \
-    editview \
-    lineedit \
-    singleapplication \
-    squeezelabel \
-    treesortfilterproxymodel
-
-CONFIG += ordered
diff --git a/manualtests/webviewsearch/.gitignore b/manualtests/webviewsearch/.gitignore
deleted file mode 100644
index 00a73b0f..00000000
--- a/manualtests/webviewsearch/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-webviewsearch
diff --git a/manualtests/webviewsearch/main_webviewsearch.cpp b/manualtests/webviewsearch/main_webviewsearch.cpp
deleted file mode 100644
index 1c3dfeef..00000000
--- a/manualtests/webviewsearch/main_webviewsearch.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <qmainwindow.h>
-#include <qwebframe.h>
-#include <qshortcut.h>
-#include <qevent.h>
-#include <qmenubar.h>
-
-#include "webviewsearch.h"
-
-class WebViewWSearch : public QWebView
-{
-    Q_OBJECT
-
-public:
-    WebViewWSearch(QWidget *parent = 0) : QWebView(parent)
-    {
-    }
-
-protected:
-
-void resizeEvent(QResizeEvent *event)
-{
-    int offset = event->size().height() - event->oldSize().height();
-    int currentValue = page()->mainFrame()->scrollBarValue(Qt::Vertical);
-    setUpdatesEnabled(false);
-    page()->mainFrame()->setScrollBarValue(Qt::Vertical, currentValue - offset);
-    setUpdatesEnabled(true);
-    QWebView::resizeEvent(event);
-}
-
-public slots:
-    void findText(const QString &text) {
-        findText(text);
-    }
-};
-
-int main(int argc, char **argv)
-{
-    QApplication application(argc, argv);
-    QMainWindow mainWindow;
-
-
-    QWidget *window = new QWidget;
-    QVBoxLayout *layout = new QVBoxLayout;
-    layout->setSpacing(0);
-    layout->setContentsMargins(0, 0, 0, 0);
-    WebViewWSearch *webView = new WebViewWSearch(&mainWindow);
-    WebViewSearch *webViewSearch = new WebViewSearch(webView);
-    layout->addWidget(webViewSearch);
-    webView->load(QUrl("http://reddit.com"));
-    layout->addWidget(webView);
-    window->setLayout(layout);
-    mainWindow.setCentralWidget(window);
-    mainWindow.show();
-
-    QMenuBar bar;
-    QMenu *editMenu = bar.addMenu(("&Edit"));
-    QAction *m_find = editMenu->addAction(("&Find"));
-    m_find->setShortcuts(QKeySequence::Find);
-    QObject::connect(m_find, SIGNAL(triggered()), webViewSearch, SLOT(showFind()));
-    new QShortcut(QKeySequence(Qt::Key_Slash), webViewSearch, SLOT(showFind()));
-
-    return application.exec();
-}
-
-#include "main_webviewsearch.moc"
diff --git a/manualtests/webviewsearch/webviewsearch.pro b/manualtests/webviewsearch/webviewsearch.pro
deleted file mode 100644
index c687d100..00000000
--- a/manualtests/webviewsearch/webviewsearch.pro
+++ /dev/null
@@ -1,9 +0,0 @@
-TEMPLATE = app
-TARGET =
-DEPENDPATH += .
-INCLUDEPATH += .
-
-include(../manualtests.pri)
-
-SOURCES += main_webviewsearch.cpp
-HEADERS +=
diff --git a/src/.qmake.conf b/src/.qmake.conf
deleted file mode 100644
index 7c1d952d..00000000
--- a/src/.qmake.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-QMAKEPATH += /usr/local/opt/qtwebkit
-QMAKE_MAC_SDK = macosx10.13
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 596521ee..2692c848 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,31 +1,13 @@
 # Some common settings
 
 project(Endorphin)
-set(CMAKE_AUTOMOC ON)
-set(CMAKE_AUTORCC ON)
-set(CMAKE_AUTOUIC ON)
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/adblock ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks ${CMAKE_CURRENT_SOURCE_DIR}/bookmarks/xbel ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_SOURCE_DIR}/history ${CMAKE_CURRENT_SOURCE_DIR}/htmls ${CMAKE_CURRENT_SOURCE_DIR}/locationbar ${CMAKE_CURRENT_SOURCE_DIR}/network ${CMAKE_CURRENT_SOURCE_DIR}/network/cookiejar ${CMAKE_CURRENT_SOURCE_DIR}/network/cookiejar/networkcookiejar ${CMAKE_CURRENT_SOURCE_DIR}/opensearch ${CMAKE_CURRENT_SOURCE_DIR}/qwebplugins ${CMAKE_CURRENT_SOURCE_DIR}/qwebplugins/clicktoflash ${CMAKE_CURRENT_SOURCE_DIR}/useragent ${CMAKE_CURRENT_SOURCE_DIR}/utils)
+include(GNUInstallDirs)
 
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Gui REQUIRED)
-find_package(Qt5WebKit REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5WebKitWidgets REQUIRED)
-find_package(Qt5PrintSupport REQUIRED)
-find_package(Qt5UiTools)
-find_package(Qt5LinguistTools REQUIRED)
-find_package(Qt5Script REQUIRED)
-
-if(NOT Qt5UiTools_FOUND)
-	add_definitions(-DQT_NO_UITOOLS)
-endif()
 set(EXECUTABLE_OUTPUT_PATH ../)
-set(CMAKE_INCLUDE_CURRENT_DIR ON)
+find_package(Qt5Widgets REQUIRED)
 
 # Get git information
-
 execute_process(COMMAND git log -n1 --pretty=format:%h
                 OUTPUT_VARIABLE GIT_REV
                 ERROR_QUIET)
@@ -39,197 +21,63 @@ endif()
 
 add_definitions(-DGITVERSION=\"\\\"${GIT_REV}\\\"\")
 add_definitions(-DGITCHANGENUMBER=${GIT_CHANGENUMBER})
-# Add all files
-set(Endorphin_SRCS
-	aboutdialog.cpp
-	acceptlanguagedialog.cpp
-	autosaver.cpp
-	autofilldialog.cpp
-	autofillmanager.cpp
-	browserapplication.cpp
-	browsermainwindow.cpp
-	clearprivatedata.cpp
-	clearbutton.cpp
-	downloadmanager.cpp
-	modelmenu.cpp
-	modeltoolbar.cpp
-	plaintexteditsearch.cpp
-	searchbar.cpp
-	searchbutton.cpp
-	searchlineedit.cpp
-	settings.cpp
-	sourcehighlighter.cpp
-	sourceviewer.cpp
-	tabbar.cpp
-	tabwidget.cpp
-	toolbarsearch.cpp
-	webactionmapper.cpp
-	webpage.cpp
-	webview.cpp
-	webviewsearch.cpp
-	main.cpp
-	adblock/adblockblockednetworkreply.cpp
-	adblock/adblockdialog.cpp
-	adblock/adblockmanager.cpp
-	adblock/adblockmodel.cpp
-	adblock/adblocknetwork.cpp
-	adblock/adblockpage.cpp
-	adblock/adblockrule.cpp
-	adblock/adblockschemeaccesshandler.cpp
-	adblock/adblocksubscription.cpp
-	bookmarks/addbookmarkdialog.cpp
-	bookmarks/bookmarksdialog.cpp
-	bookmarks/bookmarksmanager.cpp
-	bookmarks/bookmarksmenu.cpp
-	bookmarks/bookmarksmodel.cpp
-	bookmarks/bookmarkstoolbar.cpp
-	bookmarks/bookmarknode.cpp
-    bookmarks/xbel/xbelreader.cpp
-	bookmarks/xbel/xbelwriter.cpp
-	history/history.cpp
-	history/historycompleter.cpp
-	history/historymanager.cpp
-	locationbar/locationbar.cpp
-	locationbar/locationbarsiteicon.cpp
-	locationbar/privacyindicator.cpp
-	network/fileaccesshandler.cpp
-	network/networkaccessmanager.cpp
-	network/networkdiskcache.cpp
-	network/networkproxyfactory.cpp
-	network/schemeaccesshandler.cpp
-	network/cookiejar/cookiedialog.cpp
-	network/cookiejar/cookieexceptionsmodel.cpp
-	network/cookiejar/cookiemodel.cpp
-	network/cookiejar/cookieexceptionsdialog.cpp
-	network/cookiejar/cookiejar.cpp
-	network/cookiejar/networkcookiejar/networkcookiejar.cpp
-	opensearch/opensearchdialog.cpp
-	opensearch/opensearchengine.cpp
-	opensearch/opensearchenginedelegate.cpp
-	opensearch/opensearchengineaction.cpp
-	opensearch/opensearchenginemodel.cpp
-	opensearch/opensearchmanager.cpp
-	opensearch/opensearchreader.cpp
-	opensearch/opensearchwriter.cpp
-	qwebplugins/endorphinwebplugin.cpp
-	qwebplugins/webpluginfactory.cpp
-	useragent/useragentmenu.cpp
-	utils/editlistview.cpp
-	utils/edittableview.cpp
-	utils/edittreeview.cpp
-	utils/languagemanager.cpp
-	utils/lineedit.cpp
-	utils/networkaccessmanagerproxy.cpp
-	utils/singleapplication.cpp
- 	utils/squeezelabel.cpp
-	utils/treesortfilterproxymodel.cpp
-	utils/webpageproxy.cpp
-)
 
-set(Endorphin_UIS
-	aboutdialog.ui
-	autofilldialog.ui
-	acceptlanguagedialog.ui
-	downloaditem.ui
-	downloads.ui
-	searchbanner.ui
-	settings.ui
-	adblock/adblockdialog.ui
-	bookmarks/addbookmarkdialog.ui
-	bookmarks/bookmarksdialog.ui
-	history/history.ui
-	network/passworddialog.ui
-	network/proxy.ui
-	network/cookiejar/cookies.ui
-	network/cookiejar/cookiesexceptions.ui
-	opensearch/opensearchdialog.ui
+# Translations
+qt5_create_translation(QM_FILES
+${ENDORPHIN_SRCS}
+${CMAKE_CURRENT_SOURCE_DIR}/locale/ast.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/ca.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/ast.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/ca.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/cs_CZ.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/da_DK.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/de_DE.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/el_GR.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/es.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/es_CR.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/et_EE.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/fi_FI.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/fr_CA.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/fr_FR.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/gl.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/he_IL.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/hu_HU.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/it_IT.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/ja_JP.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/ko_KR.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/ms.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/nb_NO.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/nl.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/pl_PL.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/pt_PT.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/pt_BR.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/ru_RU.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/sk_SK.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/sr_RS.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/sr_RS@latin.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/tr_TR.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/uk.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/zh_CN.ts
+${CMAKE_CURRENT_SOURCE_DIR}/locale/zh_TW.ts
 )
-QT5_WRAP_UI(UIS ${Endorphin_UIS})
 
-set(Endorphin_RSCS
-	data/data.qrc
-	data/graphics/graphics.qrc
-	data/searchengines/searchengines.qrc
-	htmls/htmls.qrc
-	useragent/useragents.qrc
-)
-QT5_ADD_RESOURCES(RSCS ${Endorphin_RSCS})
+# Generate executable
+add_executable(endorphin main.cpp ${TRS})
+target_link_libraries(endorphin Qt5::Widgets endorphin-base)
 
-set(Endorphin_MOCS
-	aboutdialog.h
-	acceptlanguagedialog.h
-	autosaver.h
-	autofilldialog.h
-	autofillmanager.h
-	browserapplication.h
-	browsermainwindow.h
-	clearprivatedata.h
-	clearbutton.h
-	downloadmanager.h
-	modelmenu.h
-	modeltoolbar.h
-	plaintexteditsearch.h
-	searchbar.h
-	searchbutton.h
-	searchlineedit.h
-	settings.h
-	sourcehighlighter.h
-	sourceviewer.h
-	tabbar.h
-	tabwidget.h
-	toolbarsearch.h
-	webactionmapper.h
-	webpage.h
-	webview.h
-	webviewsearch.h
-)
-QT5_WRAP_CPP(MOCS ${Endorphin_MOCS})
 
-# Translations
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/ast.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/ca.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/cs_CZ.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/da_DK.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/de_DE.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/el_GR.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/es.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/es_CR.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/et_EE.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/fi_FI.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/fr_CA.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/fr_FR.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/gl.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/he_IL.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/hu_HU.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/it_IT.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/ja_JP.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/ko_KR.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/ms.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/nb_NO.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/nl.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/pl_PL.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/pt_PT.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/pt_BR.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/ru_RU.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/sk_SK.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/sr_RS.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/sr_RS@latin.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/tr_TR.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/uk.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/zh_CN.ts)
-qt5_create_translation(QM_FILES ${CMAKE_CURRENT_SOURCE_DIR}/locale/zh_TW.ts)
+if(NOT QT_TRANSLATIONS_DIR)
+get_target_property(QT5_QMAKE_EXECUTABLE Qt5::qmake IMPORTED_LOCATION)
+execute_process( COMMAND ${QT5_QMAKE_EXECUTABLE} -query QT_INSTALL_TRANSLATIONS
+OUTPUT_VARIABLE qt_translations_dir OUTPUT_STRIP_TRAILING_WHITESPACE )
+file( TO_CMAKE_PATH "${qt_translations_dir}" qt_translations_dir)
+set( QT_TRANSLATIONS_DIR ${qt_translations_dir} CACHE PATH
+"The location of the Qt translations" FORCE)
+endif()
 
-# Generate executable
-add_executable(endorphin ${Endorphin_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} ${QM_FILES})
-qt5_use_modules(endorphin Widgets)
-qt5_use_modules(endorphin Core)
-qt5_use_modules(endorphin Gui)
-qt5_use_modules(endorphin WebKit)
-qt5_use_modules(endorphin Network)
-qt5_use_modules(endorphin WebKitWidgets)
-qt5_use_modules(endorphin PrintSupport)
+install(FILES ${QM_FILES}
+DESTINATION  ${CMAKE_INSTALL_BINDIR}/endorphin_locale/)
 
-if(Qt5UiTools_FOUND)
-	qt5_use_modules(endorphin UiTools)
-endif()
-qt5_use_modules(endorphin Script)
+install(TARGETS endorphin
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
diff --git a/src/aboutdialog.cpp b/src/aboutdialog.cpp
index 036ea72f..e498b3c9 100644
--- a/src/aboutdialog.cpp
+++ b/src/aboutdialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2008 Matvey Kozhev <sikon@ubuntu.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -20,29 +20,25 @@
 
 #include "aboutdialog.h"
 
-#include <qdialogbuttonbox.h>
-#include <qfile.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qtextedit.h>
-#include <qtextstream.h>
-
-#include <qtwebkitversion.h>
-#include <qwebkitglobal.h>
+#include <QDialogButtonBox>
+#include <QFile>
+#include <QLabel>
+#include <QLayout>
+#include <QTextEdit>
+#include <QTextStream>
+#include <QPushButton>
 
 AboutDialog::AboutDialog(QWidget *parent)
     : QDialog(parent)
 {
     setupUi(this);
     setWindowTitle(tr("About %1").arg(qApp->applicationName()));
-    logo->setPixmap(qApp->windowIcon().pixmap(128, 128));
     name->setText(qApp->applicationName());
     version->setText(qApp->applicationVersion());
-    webkitVersion->setText(tr("WebKit version: %1").arg(qWebKitVersion()));
-    connect(authorsButton, SIGNAL(clicked()),
-            this, SLOT(authorsButtonClicked()));
-    connect(licenseButton, SIGNAL(clicked()),
-            this, SLOT(licenseButtonClicked()));
+    connect(authorsButton, &QPushButton::clicked,
+            this, &AboutDialog::authorsButtonClicked);
+    connect(licenseButton, &QPushButton::clicked,
+            this, &AboutDialog::licenseButtonClicked);
 }
 
 void AboutDialog::displayFile(const QString &fileName, const QString &title)
@@ -62,10 +58,10 @@ void AboutDialog::displayFile(const QString &fileName, const QString &title)
     stream.setCodec("UTF-8");
     QString text = stream.readAll();
     // this is done to force the content of the text editor to be LTR, and monospaced.
-    textEdit.setHtml(QString(QLatin1String("<pre>%1</pre>")).arg(text));
+    textEdit.setHtml(QString(QStringLiteral("<pre>%1</pre>")).arg(text));
 
     textEdit.setReadOnly(true);
-    connect(&buttonBox, SIGNAL(rejected()), &dialog, SLOT(close()));
+    connect(&buttonBox, &QDialogButtonBox::rejected, &dialog, &QDialog::close);
     buttonBox.setCenterButtons(true);
     layout.addWidget(&textEdit);
     layout.addWidget(&buttonBox);
@@ -74,17 +70,17 @@ void AboutDialog::displayFile(const QString &fileName, const QString &title)
     dialog.setLayout(&layout);
     dialog.setWindowTitle(title);
     dialog.setWindowFlags(Qt::Sheet);
-    dialog.resize(600, 350);
+    dialog.resize(650, 400);
     dialog.exec();
 }
 
 void AboutDialog::authorsButtonClicked()
 {
-    displayFile(QLatin1String(":AUTHORS"), tr("Authors"));
+    displayFile(QStringLiteral(":AUTHORS"), tr("Authors"));
 }
 
 void AboutDialog::licenseButtonClicked()
 {
-    displayFile(QLatin1String(":LICENSE.GPL2"), tr("License"));
+    displayFile(QStringLiteral(":LICENSE"), tr("License"));
 }
 
diff --git a/src/aboutdialog.h b/src/aboutdialog.h
index d58f9341..89aca529 100644
--- a/src/aboutdialog.h
+++ b/src/aboutdialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2007-2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #ifndef ABOUTDIALOG_H
 #define ABOUTDIALOG_H
 
-#include <qdialog.h>
+#include <QDialog>
 #include "ui_aboutdialog.h"
 
 class AboutDialog : public QDialog, private Ui_AboutDialog
@@ -28,9 +28,9 @@ class AboutDialog : public QDialog, private Ui_AboutDialog
     Q_OBJECT
 
 public:
-    AboutDialog(QWidget *parent = 0);
+    AboutDialog(QWidget *parent = nullptr);
 
-private slots:
+private Q_SLOTS:
     void authorsButtonClicked();
     void licenseButtonClicked();
 
diff --git a/src/aboutdialog.ui b/src/aboutdialog.ui
index 03523702..1cf5d5e2 100644
--- a/src/aboutdialog.ui
+++ b/src/aboutdialog.ui
@@ -6,201 +6,200 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>450</width>
-    <height>253</height>
+    <width>760</width>
+    <height>515</height>
    </rect>
   </property>
   <property name="modal">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QLabel" name="logo">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="scaledContents">
-      <bool>false</bool>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="name">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>16</pointsize>
-       <weight>75</weight>
-       <bold>true</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="version">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>12</pointsize>
-       <weight>50</weight>
-       <bold>false</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="webkitVersion">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="font">
-      <font>
-       <pointsize>11</pointsize>
-       <weight>50</weight>
-       <bold>false</bold>
-      </font>
-     </property>
-     <property name="text">
-      <string/>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="description">
-     <property name="text">
-      <string>Lightweight WebKit-based web browser</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="author">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="text">
-      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;Copyright © 2020 Aaron Dewes &amp;lt; &lt;/span&gt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; font-size:9pt; text-decoration: underline; color:#0000ff;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;&amp;gt; &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignCenter</set>
-     </property>
-     <property name="openExternalLinks">
-      <bool>true</bool>
-     </property>
-     <property name="textInteractionFlags">
-      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QPushButton" name="authorsButton">
-       <property name="text">
-        <string>Authors</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="licenseButton">
-       <property name="text">
-        <string>License</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="closeButton">
-       <property name="text">
-        <string>Close</string>
-       </property>
-       <property name="default">
-        <bool>true</bool>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-  </layout>
+  <widget class="QLabel" name="logo">
+   <property name="geometry">
+    <rect>
+     <x>450</x>
+     <y>0</y>
+     <width>520</width>
+     <height>530</height>
+    </rect>
+   </property>
+   <property name="sizePolicy">
+    <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+     <horstretch>0</horstretch>
+     <verstretch>0</verstretch>
+    </sizepolicy>
+   </property>
+   <property name="styleSheet">
+    <string notr="true">img {
+height: 1000px
+}</string>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+   <property name="pixmap">
+    <pixmap resource="data/data.qrc">:/512x512/endorphin.png</pixmap>
+   </property>
+   <property name="scaledContents">
+    <bool>false</bool>
+   </property>
+   <property name="alignment">
+    <set>Qt::AlignCenter</set>
+   </property>
+  </widget>
+  <widget class="QWidget" name="gridLayoutWidget">
+   <property name="geometry">
+    <rect>
+     <x>10</x>
+     <y>10</y>
+     <width>441</width>
+     <height>501</height>
+    </rect>
+   </property>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="1" column="0">
+     <widget class="QLabel" name="name">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>40</pointsize>
+        <weight>75</weight>
+        <bold>true</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Name</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+      <property name="textInteractionFlags">
+       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+      </property>
+     </widget>
+    </item>
+    <item row="8" column="0">
+     <widget class="QPushButton" name="closeButton">
+      <property name="font">
+       <font>
+        <kerning>true</kerning>
+       </font>
+      </property>
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="text">
+       <string>Close</string>
+      </property>
+      <property name="default">
+       <bool>false</bool>
+      </property>
+     </widget>
+    </item>
+    <item row="0" column="0">
+     <spacer name="verticalSpacer">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>40</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="7" column="0">
+     <widget class="QPushButton" name="licenseButton">
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="text">
+       <string>License</string>
+      </property>
+     </widget>
+    </item>
+    <item row="3" column="0">
+     <widget class="QLabel" name="version">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="font">
+       <font>
+        <pointsize>12</pointsize>
+        <weight>50</weight>
+        <bold>false</bold>
+       </font>
+      </property>
+      <property name="text">
+       <string>Version</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+      <property name="textInteractionFlags">
+       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+      </property>
+     </widget>
+    </item>
+    <item row="4" column="0">
+     <widget class="QLabel" name="description">
+      <property name="text">
+       <string>Lightweight WebKit-based web browser</string>
+      </property>
+      <property name="alignment">
+       <set>Qt::AlignCenter</set>
+      </property>
+      <property name="textInteractionFlags">
+       <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+      </property>
+     </widget>
+    </item>
+    <item row="6" column="0">
+     <widget class="QPushButton" name="authorsButton">
+      <property name="focusPolicy">
+       <enum>Qt::NoFocus</enum>
+      </property>
+      <property name="text">
+       <string>Authors</string>
+      </property>
+     </widget>
+    </item>
+    <item row="9" column="0">
+     <spacer name="verticalSpacer_2">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>40</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+    <item row="5" column="0">
+     <spacer name="verticalSpacer_3">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <property name="sizeHint" stdset="0">
+       <size>
+        <width>20</width>
+        <height>40</height>
+       </size>
+      </property>
+     </spacer>
+    </item>
+   </layout>
+  </widget>
  </widget>
  <resources>
   <include location="data/data.qrc"/>
diff --git a/src/acceptlanguagedialog.cpp b/src/acceptlanguagedialog.cpp
index fe7c952b..dab380f9 100644
--- a/src/acceptlanguagedialog.cpp
+++ b/src/acceptlanguagedialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,17 +22,18 @@
 #include "browserapplication.h"
 #include "languagemanager.h"
 
-#include <qlistview.h>
-#include <qsettings.h>
+#include <QListView>
+#include <QSettings>
+#include <QPushButton>
 
 AcceptLanguageDialog::AcceptLanguageDialog(QWidget *parent, Qt::WindowFlags flags)
     : QDialog(parent, flags)
 {
     setupUi(this);
-    connect(addButton, SIGNAL(clicked()), this, SLOT(addLanguage()));
-    connect(removeButton, SIGNAL(clicked()), this, SLOT(removeLanguage()));
-    connect(moveUpButton, SIGNAL(clicked()), this, SLOT(moveLanguageUp()));
-    connect(moveDownButton, SIGNAL(clicked()), this, SLOT(moveLanguageDown()));
+    connect(addButton, &QPushButton::clicked, this, &AcceptLanguageDialog::addLanguage);
+    connect(removeButton, &QPushButton::clicked, this, &AcceptLanguageDialog::removeLanguage);
+    connect(moveUpButton, &QPushButton::clicked, this, &AcceptLanguageDialog::moveLanguageUp);
+    connect(moveDownButton, &QPushButton::clicked, this, &AcceptLanguageDialog::moveLanguageDown);
     listView->setModel(&m_model);
     connect(listView->selectionModel(), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
             this, SLOT(currentChanged(const QModelIndex &, const QModelIndex &)));
@@ -52,14 +53,14 @@ QStringList AcceptLanguageDialog::expand(const QLocale::Language language)
     for (int j = 0; j < countries.size(); ++j) {
         QString languageString;
         if (countries.count() == 1) {
-            languageString = QString(QLatin1String("%1 [%2]"))
-                .arg(QLocale::languageToString(language))
-                .arg(QLocale(language).name().split(QLatin1Char('_')).at(0));
+            languageString = QString(QStringLiteral("%1 [%2]"))
+                             .arg(QLocale::languageToString(language),
+                                  QLocale(language).name().split(QChar('_')).at(0));
         } else {
-            languageString = QString(QLatin1String("%1/%2 [%3]"))
-                .arg(QLocale::languageToString(language))
-                .arg(QLocale::countryToString(countries.at(j)))
-                .arg(QLocale(language, countries.at(j)).name().split(QLatin1Char('_')).join(QLatin1String("-")).toLower());
+            languageString = QString(QStringLiteral("%1/%2 [%3]"))
+                             .arg(QLocale::languageToString(language),
+                                  QLocale::countryToString(countries.at(j)),
+                                  QLocale(language, countries.at(j)).name().replace('_', "-").toLower());
 
         }
         if (!allLanguages.contains(languageString))
@@ -94,19 +95,19 @@ void AcceptLanguageDialog::accept()
 void AcceptLanguageDialog::load()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("network"));
-    m_model.setStringList(settings.value(QLatin1String("acceptLanguages"), defaultAcceptList()).toStringList());
+    settings.beginGroup(QStringLiteral("network"));
+    m_model.setStringList(settings.value(QStringLiteral("acceptLanguages"), defaultAcceptList()).toStringList());
 }
 
 void AcceptLanguageDialog::save()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("network"));
+    settings.beginGroup(QStringLiteral("network"));
     QStringList result = m_model.stringList();
     if (result == defaultAcceptList() || result.isEmpty())
-        settings.remove(QLatin1String("acceptLanguages"));
+        settings.remove(QStringLiteral("acceptLanguages"));
     else
-        settings.setValue(QLatin1String("acceptLanguages"), result);
+        settings.setValue(QStringLiteral("acceptLanguages"), result);
 }
 
 /*
@@ -118,19 +119,19 @@ QByteArray AcceptLanguageDialog::httpString(const QStringList &list)
 {
     QStringList processed;
     qreal qvalue = 1.0;
-    foreach (const QString &string, list) {
-        int leftBracket = string.indexOf(QLatin1Char('['));
-        int rightBracket = string.indexOf(QLatin1Char(']'));
+    Q_FOREACH (const QString &string, list) {
+        int leftBracket = string.indexOf(QChar('['));
+        int rightBracket = string.indexOf(QChar(']'));
         QString tag = string.mid(leftBracket + 1, rightBracket - leftBracket - 1);
         if (processed.isEmpty()) {
             processed << tag;
         } else {
-            processed << QString(QLatin1String("%1; %2")).arg(tag).arg(QString::number(qvalue, 'f', 1));
+            processed << QString(QStringLiteral("%1; %2")).arg(tag, QString::number(qvalue, 'f', 1));
         }
         if (qvalue > .1)
             qvalue -= .1;
     }
-    return processed.join(QLatin1String(", ")).toLatin1();
+    return processed.join(QStringLiteral(", ")).toLatin1();
 }
 
 void AcceptLanguageDialog::moveLanguageUp()
diff --git a/src/acceptlanguagedialog.h b/src/acceptlanguagedialog.h
index 00afea26..141e0344 100644
--- a/src/acceptlanguagedialog.h
+++ b/src/acceptlanguagedialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #ifndef ACCEPTLANGUAGEDIALOG_H
 #define ACCEPTLANGUAGEDIALOG_H
 
-#include <qdialog.h>
+#include <QDialog>
 #include "ui_acceptlanguagedialog.h"
 
 #include <qstringlistmodel.h>
@@ -30,12 +30,12 @@ class AcceptLanguageDialog : public QDialog, public Ui_AcceptLanguage
     Q_OBJECT
 
 public:
-    AcceptLanguageDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    AcceptLanguageDialog(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
     void accept();
     static QByteArray httpString(const QStringList &list);
     static QStringList defaultAcceptList();
 
-private slots:
+private Q_SLOTS:
     void load();
     void save();
 
diff --git a/src/acceptlanguagedialog.ui b/src/acceptlanguagedialog.ui
index aae65afe..b6eaab89 100644
--- a/src/acceptlanguagedialog.ui
+++ b/src/acceptlanguagedialog.ui
@@ -1,139 +1,142 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AcceptLanguage</class>
- <widget class="QDialog" name="AcceptLanguage">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>397</width>
-    <height>251</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Languages</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="label_15">
-     <property name="text">
-      <string>Languages: in order of preference:</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1">
-    <widget class="QPushButton" name="moveUpButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Move &amp;Up</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="moveDownButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>Move &amp;Down</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="1">
-    <widget class="QPushButton" name="removeButton">
-     <property name="enabled">
-      <bool>false</bool>
-     </property>
-     <property name="text">
-      <string>&amp;Remove</string>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <spacer name="verticalSpacer_5">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>38</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="5" column="0">
-    <widget class="QComboBox" name="addComboBox"/>
-   </item>
-   <item row="5" column="1">
-    <widget class="QPushButton" name="addButton">
-     <property name="text">
-      <string>Add...</string>
-     </property>
-    </widget>
-   </item>
-   <item row="6" column="0" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" rowspan="4">
-    <widget class="QListView" name="listView"/>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>listView</tabstop>
-  <tabstop>moveUpButton</tabstop>
-  <tabstop>moveDownButton</tabstop>
-  <tabstop>removeButton</tabstop>
-  <tabstop>addComboBox</tabstop>
-  <tabstop>addButton</tabstop>
-  <tabstop>buttonBox</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>AcceptLanguage</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>227</x>
-     <y>228</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>250</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>AcceptLanguage</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>295</x>
-     <y>234</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>250</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
+                             <ui version="4.0">
+                                     <class>AcceptLanguage</class>
+                                             <widget class="QDialog" name="AcceptLanguage">
+                                                         <property name="geometry">
+                                                                 <rect>
+                                                                 <x>0</x>
+                                                                 <y>0</y>
+                                                                 <width>397</width>
+                                                                 <height>251</height>
+                                                                 </rect>
+                                                                 </property>
+                                                                 <property name="windowTitle">
+                                                                         <string>Languages</string>
+                                                                         </property>
+                                                                         <layout class="QGridLayout" name="gridLayout">
+                                                                                     <item row="0" column="0">
+                                                                                             <widget class="QLabel" name="label_15">
+                                                                                                         <property name="text">
+                                                                                                                 <string>Languages: in order of preference:</string>
+                                                                                                                 </property>
+                                                                                                                 <property name="wordWrap">
+                                                                                                                         <bool>true</bool>
+                                                                                                                         </property>
+                                                                                                                         </widget>
+                                                                                                                         </item>
+                                                                                                                         <item row="1" column="1">
+                                                                                                                                 <widget class="QPushButton" name="moveUpButton">
+                                                                                                                                             <property name="enabled">
+                                                                                                                                                     <bool>false</bool>
+                                                                                                                                                     </property>
+                                                                                                                                                     <property name="text">
+                                                                                                                                                             <string>Move &amp;
+Up</string>
+</property>
+</widget>
+</item>
+<item row="2" column="1">
+                     <widget class="QPushButton" name="moveDownButton">
+                                       <property name="enabled">
+                                               <bool>false</bool>
+                                               </property>
+                                               <property name="text">
+                                                       <string>Move &amp;
+Down</string>
+</property>
+</widget>
+</item>
+<item row="3" column="1">
+                     <widget class="QPushButton" name="removeButton">
+                                       <property name="enabled">
+                                               <bool>false</bool>
+                                               </property>
+                                               <property name="text">
+                                                       <string>&amp;
+Remove</string>
+</property>
+</widget>
+</item>
+<item row="4" column="1">
+                     <spacer name="verticalSpacer_5">
+                                  <property name="orientation">
+                                          <enum>Qt::Vertical</enum>
+                                          </property>
+                                          <property name="sizeHint" stdset="0">
+                                                  <size>
+                                                  <width>20</width>
+                                                  <height>38</height>
+                                                  </size>
+                                                  </property>
+                                                  </spacer>
+                                                  </item>
+                                                  <item row="5" column="0">
+                                                          <widget class="QComboBox" name="addComboBox"/>
+                                                                  </item>
+                                                                  <item row="5" column="1">
+                                                                          <widget class="QPushButton" name="addButton">
+                                                                                  <property name="text">
+                                                                                          <string>Add...</string>
+                                                                                          </property>
+                                                                                          </widget>
+                                                                                          </item>
+                                                                                          <item row="6" column="0" colspan="2">
+                                                                                                  <widget class="QDialogButtonBox" name="buttonBox">
+                                                                                                          <property name="orientation">
+                                                                                                                  <enum>Qt::Horizontal</enum>
+                                                                                                                  </property>
+                                                                                                                  <property name="standardButtons">
+                                                                                                                          <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+                                                                                                                          </property>
+                                                                                                                          </widget>
+                                                                                                                          </item>
+                                                                                                                          <item row="1" column="0" rowspan="4">
+                                                                                                                                  <widget class="QListView" name="listView"/>
+                                                                                                                                          </item>
+                                                                                                                                          </layout>
+                                                                                                                                          </widget>
+                                                                                                                                          <tabstops>
+                                                                                                                                          <tabstop>listView</tabstop>
+                                                                                                                                          <tabstop>moveUpButton</tabstop>
+                                                                                                                                          <tabstop>moveDownButton</tabstop>
+                                                                                                                                          <tabstop>removeButton</tabstop>
+                                                                                                                                          <tabstop>addComboBox</tabstop>
+                                                                                                                                          <tabstop>addButton</tabstop>
+                                                                                                                                          <tabstop>buttonBox</tabstop>
+                                                                                                                                          </tabstops>
+                                                                                                                                          <resources/>
+                                                                                                                                          <connections>
+                                                                                                                                          <connection>
+                                                                                                                                          <sender>buttonBox</sender>
+                                                                                                                                          <signal>accepted()</signal>
+                                                                                                                                          <receiver>AcceptLanguage</receiver>
+                                                                                                                                          <slot>accept()</slot>
+                                                                                                                                          <hints>
+                                                                                                                                          <hint type="sourcelabel">
+                                                                                                                                                  <x>227</x>
+                                                                                                                                                  <y>228</y>
+                                                                                                                                                  </hint>
+                                                                                                                                                  <hint type="destinationlabel">
+                                                                                                                                                          <x>157</x>
+                                                                                                                                                          <y>250</y>
+                                                                                                                                                          </hint>
+                                                                                                                                                          </hints>
+                                                                                                                                                          </connection>
+                                                                                                                                                          <connection>
+                                                                                                                                                          <sender>buttonBox</sender>
+                                                                                                                                                          <signal>rejected()</signal>
+                                                                                                                                                          <receiver>AcceptLanguage</receiver>
+                                                                                                                                                          <slot>reject()</slot>
+                                                                                                                                                          <hints>
+                                                                                                                                                          <hint type="sourcelabel">
+                                                                                                                                                                  <x>295</x>
+                                                                                                                                                                  <y>234</y>
+                                                                                                                                                                  </hint>
+                                                                                                                                                                  <hint type="destinationlabel">
+                                                                                                                                                                          <x>286</x>
+                                                                                                                                                                          <y>250</y>
+                                                                                                                                                                          </hint>
+                                                                                                                                                                          </hints>
+                                                                                                                                                                          </connection>
+                                                                                                                                                                          </connections>
+                                                                                                                                                                          </ui>
diff --git a/src/adblock/adblock.pri b/src/adblock/adblock.pri
deleted file mode 100644
index 9cce5388..00000000
--- a/src/adblock/adblock.pri
+++ /dev/null
@@ -1,29 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-
-VPATH += $$PWD
-
-HEADERS += \
-    adblockblockednetworkreply.h \
-    adblockdialog.h \
-    adblockmanager.h \
-    adblockmodel.h \
-    adblocknetwork.h \
-    adblockpage.h \
-    adblockrule.h \
-    adblockschemeaccesshandler.h \
-    adblocksubscription.h
-
-SOURCES += \
-    adblockblockednetworkreply.cpp \
-    adblockdialog.cpp \
-    adblockmanager.cpp \
-    adblockmodel.cpp \
-    adblocknetwork.cpp \
-    adblockpage.cpp \
-    adblockrule.cpp \
-    adblockschemeaccesshandler.cpp \
-    adblocksubscription.cpp
-
-FORMS += \
-    adblockdialog.ui
diff --git a/src/adblock/adblockblockednetworkreply.cpp b/src/adblock/adblockblockednetworkreply.cpp
deleted file mode 100644
index 510525ff..00000000
--- a/src/adblock/adblockblockednetworkreply.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "adblockblockednetworkreply.h"
-
-#include "adblockrule.h"
-
-#include <qnetworkrequest.h>
-#include <qtimer.h>
-
-AdBlockBlockedNetworkReply::AdBlockBlockedNetworkReply(const QNetworkRequest &request, const AdBlockRule *rule, QObject *parent)
-    : QNetworkReply(parent)
-{
-    setOperation(QNetworkAccessManager::GetOperation);
-    setRequest(request);
-    setUrl(request.url());
-    setError(QNetworkReply::ContentAccessDenied, tr("Blocked by AdBlockRule: %1").arg(rule->filter()));
-    QTimer::singleShot(0, this, SLOT(delayedFinished()));
-}
-
-qint64 AdBlockBlockedNetworkReply::readData(char *data, qint64 maxSize)
-{
-    Q_UNUSED(data);
-    Q_UNUSED(maxSize);
-    return -1;
-}
-
-void AdBlockBlockedNetworkReply::delayedFinished()
-{
-    emit error(QNetworkReply::ContentAccessDenied);
-    emit finished();
-}
-
diff --git a/src/adblock/adblockblockednetworkreply.h b/src/adblock/adblockblockednetworkreply.h
deleted file mode 100644
index b9914df7..00000000
--- a/src/adblock/adblockblockednetworkreply.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ADBLOCKBLOCKEDNETWORKREPLY_H
-#define ADBLOCKBLOCKEDNETWORKREPLY_H
-
-#include <qnetworkreply.h>
-
-class AdBlockRule;
-class AdBlockBlockedNetworkReply : public QNetworkReply
-{
-    Q_OBJECT
-
-public:
-    AdBlockBlockedNetworkReply(const QNetworkRequest &request, const AdBlockRule *rule, QObject *parent = 0);
-    void abort() {};
-
-protected:
-    qint64 readData(char *data, qint64 maxSize);
-
-private slots:
-    void delayedFinished();
-
-};
-
-#endif // ADBLOCKBLOCKEDNETWORKREPLY_H
-
diff --git a/src/adblock/adblockdialog.cpp b/src/adblock/adblockdialog.cpp
deleted file mode 100644
index a9d66857..00000000
--- a/src/adblock/adblockdialog.cpp
+++ /dev/null
@@ -1,150 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "adblockdialog.h"
-
-#include "adblockmodel.h"
-#include "adblockmanager.h"
-#include "adblocksubscription.h"
-#include "treesortfilterproxymodel.h"
-
-#include <qdesktopservices.h>
-#include <qmenu.h>
-#include <qurl.h>
-
-#include <qdebug.h>
-
-AdBlockDialog::AdBlockDialog(QWidget *parent)
-    : QDialog(parent)
-{
-    setupUi(this);
-    m_adBlockModel = new AdBlockModel(this);
-    m_proxyModel = new TreeSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_adBlockModel);
-    treeView->setModel(m_proxyModel);
-    connect(search, SIGNAL(textChanged(QString)),
-            m_proxyModel, SLOT(setFilterFixedString(QString)));
-
-    AdBlockManager *manager = AdBlockManager::instance();
-    adblockCheckBox->setChecked(manager->isEnabled());
-    connect(adblockCheckBox, SIGNAL(toggled(bool)),
-            AdBlockManager::instance(), SLOT(setEnabled(bool)));
-
-    QMenu *menu = new QMenu(this);
-    connect(menu, SIGNAL(aboutToShow()),
-            this, SLOT(aboutToShowActionMenu()));
-    actionToolButton->setMenu(menu);
-    actionToolButton->setIcon(QIcon(QLatin1String(":128x128/run.png")));
-    actionToolButton->setPopupMode(QToolButton::InstantPopup);
-
-    AdBlockSubscription *subscription = manager->customRules();
-    QModelIndex subscriptionIndex = m_adBlockModel->index(subscription);
-    treeView->expand(m_proxyModel->mapFromSource(subscriptionIndex));
-}
-
-void AdBlockDialog::aboutToShowActionMenu()
-{
-    QMenu *menu = actionToolButton->menu();
-    menu->clear();
-
-    QAction *addRule = menu->addAction(tr("Add Custom Rule"));
-    connect(addRule, SIGNAL(triggered()), this, SLOT(addCustomRule()));
-
-    QAction *learnRule = menu->addAction(tr("Learn more about writing rules..."));
-    connect(learnRule, SIGNAL(triggered()), this, SLOT(learnAboutWritingFilters()));
-
-    menu->addSeparator();
-
-    QModelIndex idx = m_proxyModel->mapToSource(treeView->currentIndex());
-
-    QAction *updateSubscription = menu->addAction(tr("Update Subscription"));
-    connect(updateSubscription, SIGNAL(triggered()), this, SLOT(updateSubscription()));
-    if (!idx.isValid())
-        updateSubscription->setEnabled(false);
-
-    QAction *addSubscription = menu->addAction(tr("Browse Subscriptions..."));
-    connect(addSubscription, SIGNAL(triggered()), this, SLOT(browseSubscriptions()));
-
-    menu->addSeparator();
-
-    QAction *removeSubscription = menu->addAction(tr("Remove Subscription"));
-    connect(removeSubscription, SIGNAL(triggered()), this, SLOT(removeSubscription()));
-    if (!idx.isValid())
-        removeSubscription->setEnabled(false);
-}
-
-void AdBlockDialog::addCustomRule(const QString &rule)
-{
-    AdBlockManager *manager = AdBlockManager::instance();
-    AdBlockSubscription *subscription = manager->customRules();
-    Q_ASSERT(subscription);
-    subscription->addRule(AdBlockRule(rule));
-    // reset the model
-    qApp->processEvents();
-
-    QModelIndex parent = m_adBlockModel->index(subscription);
-    int x = m_adBlockModel->rowCount(parent);
-    QModelIndex ruleIndex = m_adBlockModel->index(x - 1, 0, parent);
-    treeView->expand(m_proxyModel->mapFromSource(parent));
-    treeView->edit(m_proxyModel->mapFromSource(ruleIndex));
-}
-
-void AdBlockDialog::updateSubscription()
-{
-    QModelIndex idx = m_proxyModel->mapToSource(treeView->currentIndex());
-    if (!idx.isValid())
-        return;
-    if (idx.parent().isValid())
-        idx = idx.parent();
-    AdBlockSubscription *subscription = (AdBlockSubscription*)m_adBlockModel->subscription(idx);
-    subscription->updateNow();
-}
-
-void AdBlockDialog::browseSubscriptions()
-{
-    QUrl url(QLatin1String("http://adblockplus.org/en/subscriptions"));
-    QDesktopServices::openUrl(url);
-}
-
-void AdBlockDialog::learnAboutWritingFilters()
-{
-    QUrl url(QLatin1String("http://adblockplus.org/en/filters"));
-    QDesktopServices::openUrl(url);
-}
-
-void AdBlockDialog::removeSubscription()
-{
-    QModelIndex idx = m_proxyModel->mapToSource(treeView->currentIndex());
-    if (!idx.isValid())
-        return;
-    if (idx.parent().isValid())
-        idx = idx.parent();
-    AdBlockSubscription *subscription = (AdBlockSubscription*)m_adBlockModel->subscription(idx);
-    AdBlockManager::instance()->removeSubscription(subscription);
-}
-
diff --git a/src/adblock/adblockdialog.h b/src/adblock/adblockdialog.h
deleted file mode 100644
index 9f0971f8..00000000
--- a/src/adblock/adblockdialog.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ADBLOCKDIALOG_H
-#define ADBLOCKDIALOG_H
-
-#include <qdialog.h>
-#include "ui_adblockdialog.h"
-
-class AdBlockModel;
-class TreeSortFilterProxyModel;
-class AdBlockDialog : public QDialog, public Ui_AdBlockDialog
-{
-    Q_OBJECT
-
-public:
-    AdBlockDialog(QWidget *parent = 0);
-
-public slots:
-    void addCustomRule(const QString &rule = QString());
-
-private slots:
-    void learnAboutWritingFilters();
-    void aboutToShowActionMenu();
-    void updateSubscription();
-    void browseSubscriptions();
-    void removeSubscription();
-
-private:
-    AdBlockModel *m_adBlockModel;
-    TreeSortFilterProxyModel *m_proxyModel;
-
-};
-
-#endif // ADBLOCKDIALOG_H
-
diff --git a/src/adblock/adblockdialog.ui b/src/adblock/adblockdialog.ui
deleted file mode 100644
index b4fd9641..00000000
--- a/src/adblock/adblockdialog.ui
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AdBlockDialog</class>
- <widget class="QDialog" name="AdBlockDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>483</width>
-    <height>487</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>AdBlock Configuration</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout_2">
-   <item row="0" column="0">
-    <widget class="QCheckBox" name="adblockCheckBox">
-     <property name="text">
-      <string>Enable AdBlock</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QWidget" name="adblockWidget" native="true">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <property name="margin">
-       <number>0</number>
-      </property>
-      <item row="0" column="0" colspan="3">
-       <spacer name="horizontalSpacer">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>398</width>
-          <height>23</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="3">
-       <widget class="SearchLineEdit" name="search"/>
-      </item>
-      <item row="1" column="0" colspan="4">
-       <widget class="EditTreeView" name="treeView"/>
-      </item>
-      <item row="2" column="0">
-       <widget class="QToolButton" name="actionToolButton">
-        <property name="text">
-         <string>Action</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" colspan="3">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SearchLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>searchlineedit.h</header>
-  </customwidget>
-  <customwidget>
-   <class>EditTreeView</class>
-   <extends>QTreeView</extends>
-   <header>edittreeview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>AdBlockDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>75</x>
-     <y>495</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>AdBlockDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>75</x>
-     <y>495</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>adblockCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>adblockWidget</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>106</x>
-     <y>39</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>349</x>
-     <y>74</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/adblock/adblockmanager.cpp b/src/adblock/adblockmanager.cpp
deleted file mode 100644
index f0a0b426..00000000
--- a/src/adblock/adblockmanager.cpp
+++ /dev/null
@@ -1,234 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "adblockmanager.h"
-
-#include "autosaver.h"
-#include "adblockdialog.h"
-#include "adblocknetwork.h"
-#include "adblockpage.h"
-#include "adblocksubscription.h"
-#include "browserapplication.h"
-#include "networkaccessmanager.h"
-
-#include <qstringlist.h>
-#include <qsettings.h>
-
-#include <qdebug.h>
-
-// #define ADBLOCKMANAGER_DEBUG
-
-AdBlockManager *AdBlockManager::s_adBlockManager = 0;
-
-AdBlockManager::AdBlockManager(QObject *parent)
-    : QObject(parent)
-    , m_loaded(false)
-    , m_enabled(true)
-    , m_saveTimer(new AutoSaver(this))
-    , m_adBlockDialog(0)
-    , m_adBlockNetwork(0)
-    , m_adBlockPage(0)
-{
-    connect(this, SIGNAL(rulesChanged()),
-            m_saveTimer, SLOT(changeOccurred()));
-}
-
-AdBlockManager::~AdBlockManager()
-{
-    m_saveTimer->saveIfNeccessary();
-}
-
-AdBlockManager *AdBlockManager::instance()
-{
-    if (!s_adBlockManager) {
-        // Set a parent that will delete us before the application exits
-        s_adBlockManager = new AdBlockManager(BrowserApplication::networkAccessManager());
-    }
-    return s_adBlockManager;
-}
-
-bool AdBlockManager::isEnabled() const
-{
-    if (!m_loaded) {
-        AdBlockManager *that = const_cast<AdBlockManager*>(this);
-        that->load();
-    }
-    return m_enabled;
-}
-
-void AdBlockManager::setEnabled(bool enabled)
-{
-    if (isEnabled() == enabled)
-        return;
-    emit rulesGoingToChange();
-    m_enabled = enabled;
-    emit rulesChanged();
-}
-
-AdBlockNetwork *AdBlockManager::network()
-{
-    if (!m_adBlockNetwork)
-        m_adBlockNetwork = new AdBlockNetwork(this);
-    return m_adBlockNetwork;
-}
-
-AdBlockPage *AdBlockManager::page()
-{
-    if (!m_adBlockPage)
-        m_adBlockPage = new AdBlockPage(this);
-    return m_adBlockPage;
-}
-
-static QUrl customSubscriptionLocation()
-{
-    QString fileName = BrowserApplication::dataFilePath(QLatin1String("adblock_subscription_custom"));
-    return QUrl::fromLocalFile(fileName);
-}
-
-QUrl AdBlockManager::customSubscriptionUrl()
-{
-    QUrl location = customSubscriptionLocation();
-    QString encodedUrl = QString::fromUtf8(location.toEncoded());
-    QUrl url(QString(QLatin1String("abp:subscribe?location=%1&title=%2"))
-            .arg(encodedUrl)
-            .arg(tr("Custom Rules")));
-    return url;
-}
-
-AdBlockSubscription *AdBlockManager::customRules()
-{
-    QUrl location = customSubscriptionLocation();
-    foreach (AdBlockSubscription *subscription, m_subscriptions) {
-        if (subscription->location() == location)
-            return subscription;
-    }
-    QUrl url = customSubscriptionUrl();
-    AdBlockSubscription *customAdBlockSubscription = new AdBlockSubscription(url, this);
-    addSubscription(customAdBlockSubscription);
-    return customAdBlockSubscription;
-}
-
-QList<AdBlockSubscription*> AdBlockManager::subscriptions() const
-{
-    if (!m_loaded) {
-        AdBlockManager *that = const_cast<AdBlockManager*>(this);
-        that->load();
-    }
-    return m_subscriptions;
-}
-
-void AdBlockManager::removeSubscription(AdBlockSubscription *subscription)
-{
-    if (!subscription)
-        return;
-#if defined(ADBLOCKMANAGER_DEBUG)
-    qDebug() << "AdBlockManager::" << __FUNCTION__ << subscription->location();
-#endif
-    m_saveTimer->saveIfNeccessary();
-    emit rulesGoingToChange();
-    m_subscriptions.removeOne(subscription);
-    if (subscription->parent() == this)
-        subscription->deleteLater();
-    emit rulesChanged();
-}
-
-void AdBlockManager::addSubscription(AdBlockSubscription *subscription)
-{
-    if (!subscription)
-        return;
-#if defined(ADBLOCKMANAGER_DEBUG)
-    qDebug() << "AdBlockManager::" << __FUNCTION__ << subscription->location();
-#endif
-    emit rulesGoingToChange();
-    m_subscriptions.append(subscription);
-    connect(subscription, SIGNAL(goingToChange()), this, SIGNAL(rulesGoingToChange()));
-    connect(subscription, SIGNAL(rulesChanged()), this, SIGNAL(rulesChanged()));
-    connect(subscription, SIGNAL(changed()), this, SIGNAL(rulesChanged()));
-    emit rulesChanged();
-}
-
-void AdBlockManager::save()
-{
-#if defined(ADBLOCKMANAGER_DEBUG)
-    qDebug() << "AdBlockManager::" << __FUNCTION__ << m_loaded;
-#endif
-    if (!m_loaded)
-        return;
-
-    QSettings settings;
-    settings.beginGroup(QLatin1String("AdBlock"));
-    settings.setValue(QLatin1String("enabled"), m_enabled);
-    QStringList subscriptions;
-    foreach (AdBlockSubscription *subscription, m_subscriptions) {
-        if (!subscription)
-            continue;
-        subscriptions.append(QString::fromUtf8(subscription->url().toEncoded()));
-        subscription->saveRules();
-    }
-    settings.setValue(QLatin1String("subscriptions"), subscriptions);
-}
-
-void AdBlockManager::load()
-{
-#if defined(ADBLOCKMANAGER_DEBUG)
-    qDebug() << "AdBlockManager::" << __FUNCTION__ << m_loaded;
-#endif
-
-    if (m_loaded)
-        return;
-    m_loaded = true;
-
-    QSettings settings;
-    settings.beginGroup(QLatin1String("AdBlock"));
-    m_enabled = settings.value(QLatin1String("enabled"), m_enabled).toBool();
-
-    QStringList defaultSubscriptions;
-    defaultSubscriptions.append(QString::fromUtf8(customSubscriptionUrl().toEncoded()));
-    defaultSubscriptions.append(QLatin1String("abp:subscribe?location=http://adblockplus.mozdev.org/easylist/easylist.txt&title=EasyList"));
-
-    QStringList subscriptions = settings.value(QLatin1String("subscriptions"), defaultSubscriptions).toStringList();
-    foreach (const QString &subscription, subscriptions) {
-        QUrl url = QUrl::fromEncoded(subscription.toUtf8());
-        AdBlockSubscription *adBlockSubscription = new AdBlockSubscription(url, this);
-        connect(adBlockSubscription, SIGNAL(goingToChange()), this, SIGNAL(rulesGoingToChange()));
-        connect(adBlockSubscription, SIGNAL(rulesChanged()), this, SIGNAL(rulesChanged()));
-        connect(adBlockSubscription, SIGNAL(changed()), this, SIGNAL(rulesChanged()));
-        m_subscriptions.append(adBlockSubscription);
-    }
-}
-
-AdBlockDialog *AdBlockManager::showDialog()
-{
-    if (!m_adBlockDialog) {
-        m_adBlockDialog = new AdBlockDialog(0);
-        m_adBlockDialog->setAttribute(Qt::WA_DeleteOnClose, true);
-    }
-    m_adBlockDialog->show();
-    return m_adBlockDialog;
-}
-
diff --git a/src/adblock/adblockmanager.h b/src/adblock/adblockmanager.h
deleted file mode 100644
index 462a9a08..00000000
--- a/src/adblock/adblockmanager.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ADBLOCKMANAGER_H
-#define ADBLOCKMANAGER_H
-
-#include <qobject.h>
-
-#include <qpointer.h>
-
-class QUrl;
-class AutoSaver;
-class AdBlockDialog;
-class AdBlockNetwork;
-class AdBlockPage;
-class AdBlockSubscription;
-class AdBlockManager : public QObject
-{
-    Q_OBJECT
-
-signals:
-    void rulesGoingToChange();
-    void rulesChanged();
-
-public:
-    AdBlockManager(QObject *parent = 0);
-    ~AdBlockManager();
-
-    void load();
-
-    static AdBlockManager *instance();
-    bool isEnabled() const;
-
-    QList<AdBlockSubscription*> subscriptions() const;
-    void removeSubscription(AdBlockSubscription *subscription);
-    void addSubscription(AdBlockSubscription *subscription);
-
-    AdBlockNetwork *network();
-    AdBlockPage *page();
-    AdBlockSubscription *customRules();
-
-public slots:
-    void setEnabled(bool enabled);
-    AdBlockDialog *showDialog();
-
-private slots:
-    void save();
-
-private:
-    static QUrl customSubscriptionUrl();
-    static AdBlockManager *s_adBlockManager;
-
-    bool m_loaded;
-    bool m_enabled;
-    AutoSaver *m_saveTimer;
-    QPointer<AdBlockDialog> m_adBlockDialog;
-    AdBlockNetwork *m_adBlockNetwork;
-    AdBlockPage *m_adBlockPage;
-    QList<AdBlockSubscription*> m_subscriptions;
-
-};
-
-#endif // ADBLOCKMANAGER_H
-
diff --git a/src/adblock/adblockmodel.cpp b/src/adblock/adblockmodel.cpp
deleted file mode 100644
index 6c96ce3b..00000000
--- a/src/adblock/adblockmodel.cpp
+++ /dev/null
@@ -1,287 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "adblockmodel.h"
-
-#include "adblockrule.h"
-#include "adblocksubscription.h"
-#include "adblockmanager.h"
-
-AdBlockModel::AdBlockModel(QObject *parent)
-    : QAbstractItemModel(parent)
-    , m_manager(AdBlockManager::instance())
-{
-    connect(m_manager, SIGNAL(rulesChanged()), this, SLOT(rulesChanged()));
-    connect(m_manager, SIGNAL(rulesGoingToChange()), this, SLOT(rulesGoingToChange()));
-}
-
-void AdBlockModel::rulesGoingToChange()
-{
-    beginResetModel();
-}
-
-void AdBlockModel::rulesChanged()
-{
-    endResetModel();
-}
-
-const AdBlockRule AdBlockModel::rule(const QModelIndex &index) const
-{
-    const AdBlockSubscription *parent = static_cast<AdBlockSubscription*>(index.internalPointer());
-    Q_ASSERT(parent);
-    return parent->allRules().at(index.row());
-}
-
-AdBlockSubscription *AdBlockModel::subscription(const QModelIndex &index) const
-{
-    const AdBlockSubscription *parent = static_cast<AdBlockSubscription*>(index.internalPointer());
-    if (parent)
-        return 0;
-    int row = index.row();
-    if (row < 0 || row >= m_manager->subscriptions().count())
-        return 0;
-    return m_manager->subscriptions().at(row);
-}
-
-QModelIndex AdBlockModel::index(AdBlockSubscription *subscription)
-{
-    int row = m_manager->subscriptions().indexOf(subscription);
-    if (row < 0 || row >= m_manager->subscriptions().count())
-        return QModelIndex();
-    return createIndex(row, 0, (void*) 0);
-}
-
-QVariant AdBlockModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
-        switch (section) {
-        case 0: return tr("Rule");
-        }
-    }
-    return QAbstractItemModel::headerData(section, orientation, role);
-}
-
-QVariant AdBlockModel::data(const QModelIndex &index, int role) const
-{
-    if (!index.isValid()
-        || index.model() != this
-        || index.column() != 0)
-        return QVariant();
-
-    switch (role) {
-    case Qt::EditRole:
-    case Qt::DisplayRole:
-        if (index.parent().isValid()) {
-            const AdBlockRule r = rule(index);
-            return r.filter();
-        } else {
-            AdBlockSubscription *sub = subscription(index);
-            if (sub)
-                return sub->title();
-        }
-        break;
-    case Qt::CheckStateRole:
-        if (index.parent().isValid()) {
-            const AdBlockRule r = rule(index);
-            return r.isEnabled() ? Qt::Checked : Qt::Unchecked;
-        } else {
-            AdBlockSubscription *sub = subscription(index);
-            if (sub)
-                return sub->isEnabled() ? Qt::Checked : Qt::Unchecked;
-        }
-        break;
-    default:
-        break;
-    }
-
-    return QVariant();
-}
-
-int AdBlockModel::columnCount(const QModelIndex &parent) const
-{
-    return (parent.column() > 0) ? 0 : 1;
-}
-
-int AdBlockModel::rowCount(const QModelIndex &parent) const
-{
-    if (parent.column() > 0)
-        return 0;
-
-    if (!parent.isValid())
-        return m_manager->subscriptions().count();
-
-    if (parent.internalPointer() != 0)
-        return 0;
-
-    const AdBlockSubscription *parentNode = subscription(parent);
-    return parentNode ? parentNode->allRules().count() : 0;
-}
-
-QModelIndex AdBlockModel::index(int row, int column, const QModelIndex &parent) const
-{
-    if (row < 0 || column < 0 || row >= rowCount(parent) || column >= columnCount(parent))
-        return QModelIndex();
-
-    if (!parent.isValid())
-        return createIndex(row, column, (void*)0);
-
-    // get the parent node
-    const AdBlockSubscription *parentNode = subscription(parent);
-    return createIndex(row, column, (void*)parentNode);
-}
-
-QModelIndex AdBlockModel::parent(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return QModelIndex();
-
-    AdBlockSubscription *parent = static_cast<AdBlockSubscription*>(index.internalPointer());
-    if (!parent)
-        return QModelIndex();
-
-    int parentRow = m_manager->subscriptions().indexOf(parent);
-    return createIndex(parentRow, 0, (void*)0);
-}
-
-Qt::ItemFlags AdBlockModel::flags(const QModelIndex &index) const
-{
-    if (!index.isValid())
-        return Qt::NoItemFlags;
-
-    Qt::ItemFlags flags = Qt::ItemIsSelectable;
-
-    if (index.parent().isValid()) {
-        flags |= Qt::ItemIsUserCheckable | Qt::ItemIsEditable;
-        const AdBlockSubscription *parentNode = subscription(index.parent());
-        if (parentNode && parentNode->isEnabled())
-            flags |= Qt::ItemIsEnabled;
-    } else {
-        flags |= Qt::ItemIsUserCheckable | Qt::ItemIsEditable | Qt::ItemIsEnabled;
-    }
-
-    return flags;
-}
-
-bool AdBlockModel::removeRows(int row, int count, const QModelIndex &parent)
-{
-    if (row < 0 || count <= 0 || row + count > rowCount(parent))
-        return false;
-
-    if (!parent.isValid()) {
-        disconnect(m_manager, SIGNAL(rulesChanged()), this, SLOT(rulesChanged()));
-        beginRemoveRows(QModelIndex(), row, row + count - 1);
-        for (int i = row + count - 1; i >= row; --i) {
-            AdBlockManager *manager = AdBlockManager::instance();
-            manager->removeSubscription(manager->subscriptions().at(i));
-        }
-        endRemoveRows();
-        connect(m_manager, SIGNAL(rulesChanged()), this, SLOT(rulesChanged()));
-        return true;
-    } else {
-        AdBlockSubscription *sub = subscription(parent);
-        if (sub) {
-            disconnect(m_manager, SIGNAL(rulesChanged()), this, SLOT(rulesChanged()));
-            beginRemoveRows(parent, row, row + count - 1);
-            QList<AdBlockRule> rules = sub->allRules();
-            for (int i = row + count - 1; i >= row; --i)
-                sub->removeRule(i);
-            endRemoveRows();
-            connect(m_manager, SIGNAL(rulesChanged()), this, SLOT(rulesChanged()));
-            return true;
-        }
-    }
-
-    return false;
-}
-
-bool AdBlockModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-    if (!index.isValid()
-        || index.model() != this
-        || index.column() != 0
-        || (flags(index) & Qt::ItemIsEditable) == 0)
-        return false;
-
-    disconnect(m_manager, SIGNAL(rulesChanged()), this, SLOT(rulesChanged()));
-    bool changed = false;
-    switch (role) {
-    case Qt::EditRole:
-    case Qt::DisplayRole:
-        if (index.parent().isValid()) {
-            AdBlockSubscription *sub = subscription(index.parent());
-            if (sub) {
-                AdBlockRule r = rule(index);
-                r.setFilter(value.toString());
-                sub->replaceRule(r, index.row());
-                dataChanged(index, index);
-                changed = true;
-            }
-        } else {
-            AdBlockSubscription *sub = subscription(index);
-            if (sub) {
-                sub->setTitle(value.toString());
-                dataChanged(index, index);
-                changed = true;
-            }
-        }
-        break;
-    case Qt::CheckStateRole:
-        if (index.parent().isValid()) {
-            AdBlockSubscription *sub = subscription(index.parent());
-            if (sub) {
-                AdBlockRule r = rule(index);
-                r.setEnabled(value == Qt::Checked);
-                sub->replaceRule(r, index.row());
-                dataChanged(index, index);
-                changed = true;
-            }
-        } else {
-            AdBlockSubscription *sub = subscription(index);
-            if (sub) {
-                sub->setEnabled(value == Qt::Checked);
-                dataChanged(index, index);
-                changed = true;
-            }
-        }
-        break;
-    default:
-        break;
-    }
-    connect(m_manager, SIGNAL(rulesChanged()), this, SLOT(rulesChanged()));
-    return changed;
-}
-
-bool AdBlockModel::hasChildren(const QModelIndex &parent) const
-{
-    if (!parent.isValid())
-        return true;
-    if (parent.internalPointer() == 0)
-        return true;
-    return false;
-}
-
diff --git a/src/adblock/adblockmodel.h b/src/adblock/adblockmodel.h
deleted file mode 100644
index 05dd36d2..00000000
--- a/src/adblock/adblockmodel.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ADBLOCKMODEL_H
-#define ADBLOCKMODEL_H
-
-#include <qabstractitemmodel.h>
-
-class AdBlockRule;
-class AdBlockSubscription;
-class AdBlockManager;
-class AdBlockModel : public QAbstractItemModel
-{
-    Q_OBJECT
-
-public:
-    AdBlockModel(QObject *parent = 0);
-
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
-    QModelIndex parent(const QModelIndex &index = QModelIndex()) const;
-    Qt::ItemFlags flags(const QModelIndex &index) const;
-    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
-    bool hasChildren(const QModelIndex &parent = QModelIndex()) const;
-
-    const AdBlockRule rule(const QModelIndex &index) const;
-    AdBlockSubscription *subscription(const QModelIndex &index) const;
-    QModelIndex index(AdBlockSubscription *subscription);
-
-private slots:
-    void rulesGoingToChange();
-    void rulesChanged();
-
-private:
-    AdBlockManager *m_manager;
-};
-
-#endif // ADBLOCKMODEL_H
-
diff --git a/src/adblock/adblocknetwork.cpp b/src/adblock/adblocknetwork.cpp
deleted file mode 100644
index c0354fd4..00000000
--- a/src/adblock/adblocknetwork.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "adblocknetwork.h"
-
-#include "adblockblockednetworkreply.h"
-#include "adblockmanager.h"
-#include "adblocksubscription.h"
-
-#include <qdebug.h>
-
-// #define ADBLOCKNETWORK_DEBUG
-
-AdBlockNetwork::AdBlockNetwork(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QNetworkReply *AdBlockNetwork::block(const QNetworkRequest &request)
-{
-    QUrl url = request.url();
-
-    if (url.scheme() == QLatin1String("data"))
-        return 0;
-
-    AdBlockManager *manager = AdBlockManager::instance();
-    if (!manager->isEnabled())
-        return 0;
-
-    QString urlString = QString::fromUtf8(url.toEncoded());
-    const AdBlockRule *blockedRule = 0;
-#if defined(ADBLOCKNETWORK_DEBUG)
-    const AdBlockSubscription *blockingSubscription = 0;
-#endif
-
-    QList<AdBlockSubscription*> subscriptions = manager->subscriptions();
-    foreach (AdBlockSubscription *subscription, subscriptions) {
-        if (subscription->allow(urlString))
-            return 0;
-
-        if (const AdBlockRule *rule = subscription->block(urlString)) {
-            blockedRule = rule;
-#if defined(ADBLOCKNETWORK_DEBUG)
-            blockingSubscription = subscription;
-#endif
-            break;
-        }
-    }
-
-    if (blockedRule) {
-#if defined(ADBLOCKNETWORK_DEBUG)
-        qDebug() << "AdBlockNetwork::" << __FUNCTION__ << "rule:" << blockedRule->filter() << "subscription:" << blockingSubscription->title() << url;
-#endif
-       AdBlockBlockedNetworkReply *reply = new AdBlockBlockedNetworkReply(request, blockedRule, this);
-        return reply;
-    }
-    return 0;
-}
-
diff --git a/src/adblock/adblocknetwork.h b/src/adblock/adblocknetwork.h
deleted file mode 100644
index 6dbbdeab..00000000
--- a/src/adblock/adblocknetwork.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ADBLOCKNETWORK_H
-#define ADBLOCKNETWORK_H
-
-#include <qobject.h>
-
-class QNetworkRequest;
-class QNetworkReply;
-class AdBlockNetwork : public QObject
-{
-    Q_OBJECT
-
-public:
-    AdBlockNetwork(QObject *parent = 0);
-
-    QNetworkReply *block(const QNetworkRequest &request);
-
-};
-
-#endif // ADBLOCKNETWORK_H
-
diff --git a/src/adblock/adblockpage.cpp b/src/adblock/adblockpage.cpp
deleted file mode 100644
index 4fe3131d..00000000
--- a/src/adblock/adblockpage.cpp
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "adblockpage.h"
-
-#include "adblockmanager.h"
-#include "adblocksubscription.h"
-#include "adblockrule.h"
-
-#include <qwebelement.h>
-#include <qwebpage.h>
-#include <qwebframe.h>
-
-#include <qdebug.h>
-
-// #define ADBLOCKPAGE_DEBUG
-
-AdBlockPage::AdBlockPage(QObject *parent)
-    : QObject(parent)
-{
-}
-
-void AdBlockPage::checkRule(const AdBlockRule *rule, QWebPage *page, const QString &host)
-{
-    if (!rule->isEnabled())
-        return;
-
-    QString filter = rule->filter();
-    int offset = filter.indexOf(QLatin1String("##"));
-    if (offset == -1)
-        return;
-
-    QString selectorQuery;
-    if (offset > 0) {
-        QString domainRules = filter.mid(0, offset);
-        selectorQuery = filter.mid(offset + 2);
-        QStringList domains = domainRules.split(QLatin1Char(','));
-
-        bool match = false;
-        foreach (const QString &domain, domains) {
-            bool reverse = (domain[0] == QLatin1Char('~'));
-            if (reverse) {
-                QString xdomain = domain.mid(1);
-                if (host.endsWith(xdomain))
-                    return;
-                match = true;
-            }
-            if (host.endsWith(domain))
-                match = true;
-        }
-        if (!match)
-            return;
-    }
-
-    if (offset == 0)
-        selectorQuery = filter.mid(2);
-
-    Q_UNUSED(page);
-    QWebElement document = page->mainFrame()->documentElement();
-    QWebElementCollection elements = document.findAll(selectorQuery);
-#if defined(ADBLOCKPAGE_DEBUG)
-    if (elements.count() != 0)
-        qDebug() << "AdBlockPage::" << __FUNCTION__ << "blocking" << elements.count() << "items" << selectorQuery << elements.count() << "rule:" << rule->filter();
-#endif
-    foreach (QWebElement element, elements) {
-        element.setStyleProperty(QLatin1String("visibility"), QLatin1String("hidden"));
-        element.removeFromDocument();
-    }
-}
-
-void AdBlockPage::applyRulesToPage(QWebPage *page)
-{
-    if (!page || !page->mainFrame())
-        return;
-    AdBlockManager *manager = AdBlockManager::instance();
-    if (!manager->isEnabled())
-        return;
-    QString host = page->mainFrame()->url().host();
-    QList<AdBlockSubscription*> subscriptions = manager->subscriptions();
-    foreach (AdBlockSubscription *subscription, subscriptions) {
-        QList<const AdBlockRule*> rules = subscription->pageRules();
-        foreach (const AdBlockRule *rule, rules) {
-            checkRule(rule, page, host);
-        }
-    }
-}
-
diff --git a/src/adblock/adblockpage.h b/src/adblock/adblockpage.h
deleted file mode 100644
index 60244902..00000000
--- a/src/adblock/adblockpage.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ADBLOCKPAGE_H
-#define ADBLOCKPAGE_H
-
-#include <qobject.h>
-
-class AdBlockRule;
-class QWebPage;
-class AdBlockPage : public QObject
-{
-    Q_OBJECT
-
-public:
-    AdBlockPage(QObject *parent = 0);
-
-    void applyRulesToPage(QWebPage *page);
-
-private:
-    void checkRule(const AdBlockRule *rule, QWebPage *page, const QString &host);
-};
-
-#endif // ADBLOCKPAGE_H
-
diff --git a/src/adblock/adblockrule.cpp b/src/adblock/adblockrule.cpp
deleted file mode 100644
index b6608e86..00000000
--- a/src/adblock/adblockrule.cpp
+++ /dev/null
@@ -1,198 +0,0 @@
-/**
- * Copyright (c) 2009, Zsombor Gegesy <gzsombor@gmail.com>
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "adblockrule.h"
-
-#include "adblocksubscription.h"
-
-#include <qdebug.h>
-#include <qregexp.h>
-#include <qurl.h>
-
-// #define ADBLOCKRULE_DEBUG
-
-AdBlockRule::AdBlockRule(const QString &filter)
-{
-    setFilter(filter);
-}
-
-QString AdBlockRule::filter() const
-{
-    return m_filter;
-}
-
-void AdBlockRule::setFilter(const QString &filter)
-{
-    m_filter = filter;
-
-    m_cssRule = false;
-    m_enabled = true;
-    m_exception = false;
-    bool regExpRule = false;
-
-    if (filter.startsWith(QLatin1String("!"))
-        || filter.trimmed().isEmpty())
-        m_enabled = false;
-
-    if (filter.contains(QLatin1String("##")))
-        m_cssRule = true;
-
-    QString parsedLine = filter;
-    if (parsedLine.startsWith(QLatin1String("@@"))) {
-        m_exception = true;
-        parsedLine = parsedLine.mid(2);
-    }
-    if (parsedLine.startsWith(QLatin1Char('/'))) {
-        if (parsedLine.endsWith(QLatin1Char('/'))) {
-            parsedLine = parsedLine.mid(1);
-            parsedLine = parsedLine.left(parsedLine.size() - 1);
-            regExpRule = true;
-        }
-    }
-    int options = parsedLine.indexOf(QLatin1String("$"), 0);
-    if (options >= 0) {
-        m_options = parsedLine.mid(options + 1).split(QLatin1Char(','));
-        parsedLine = parsedLine.left(options);
-    }
-
-    setPattern(parsedLine, regExpRule);
-
-    if (m_options.contains(QLatin1String("match-case"))) {
-        m_regExp.setCaseSensitivity(Qt::CaseSensitive);
-        m_options.removeOne(QLatin1String("match-case"));
-    }
-}
-
-bool AdBlockRule::networkMatch(const QString &encodedUrl) const
-{
-    if (m_cssRule) {
-#if defined(ADBLOCKRULE_DEBUG)
-        qDebug() << "AdBlockRule::" << __FUNCTION__ << "m_cssRule" << m_cssRule;
-#endif
-        return false;
-    }
-
-    if (!m_enabled) {
-#if defined(ADBLOCKRULE_DEBUG)
-        qDebug() << "AdBlockRule::" << __FUNCTION__ << "is not enabled";
-#endif
-        return false;
-    }
-
-    bool matched = m_regExp.indexIn(encodedUrl) != -1;
-
-    if (matched
-        && !m_options.isEmpty()) {
-
-        // we only support domain right now
-        if (m_options.count() == 1) {
-            foreach (const QString &option, m_options) {
-                if (option.startsWith(QLatin1String("domain="))) {
-                    QUrl url = QUrl::fromEncoded(encodedUrl.toUtf8());
-                    QString host = url.host();
-                    QStringList domainOptions = option.mid(7).split(QLatin1Char('|'));
-                    foreach (QString domainOption, domainOptions) {
-                        bool negate = domainOption.at(0) == QLatin1Char('~');
-                        if (negate)
-                            domainOption = domainOption.mid(1);
-                        bool hostMatched = domainOption == host;
-                        if (hostMatched && !negate)
-                            return true;
-                        if (!hostMatched && negate)
-                            return true;
-                    }
-                }
-            }
-        }
-
-#if defined(ADBLOCKRULE_DEBUG)
-        qDebug() << "AdBlockRule::" << __FUNCTION__ << "options are currently not supported" << m_options;
-#endif
-        return false;
-    }
-#if defined(ADBLOCKRULE_DEBUG)
-    //qDebug() << "AdBlockRule::" << __FUNCTION__ << encodedUrl << "MATCHED" << matched << filter();
-#endif
-
-    return matched;
-}
-
-bool AdBlockRule::isException() const
-{
-    return m_exception;
-}
-
-void AdBlockRule::setException(bool exception)
-{
-    m_exception = exception;
-}
-
-bool AdBlockRule::isEnabled() const
-{
-    return m_enabled;
-}
-
-void AdBlockRule::setEnabled(bool enabled)
-{
-    m_enabled = enabled;
-    if (!enabled) {
-        m_filter = QLatin1String("!") + m_filter;
-    } else {
-        m_filter = m_filter.mid(1);
-    }
-}
-
-QString AdBlockRule::regExpPattern() const
-{
-    return m_regExp.pattern();
-}
-
-static QString convertPatternToRegExp(const QString &wildcardPattern) {
-    QString pattern = wildcardPattern;
-    return pattern.replace(QRegExp(QLatin1String("\\*+")), QLatin1String("*"))   // remove multiple wildcards
-        .replace(QRegExp(QLatin1String("\\^\\|$")), QLatin1String("^"))        // remove anchors following separator placeholder
-        .replace(QRegExp(QLatin1String("^(\\*)")), QLatin1String(""))          // remove leading wildcards
-        .replace(QRegExp(QLatin1String("(\\*)$")), QLatin1String(""))          // remove trailing wildcards
-        .replace(QRegExp(QLatin1String("(\\W)")), QLatin1String("\\\\1"))      // escape special symbols
-        .replace(QRegExp(QLatin1String("^\\\\\\|\\\\\\|")),
-                 QLatin1String("^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?"))       // process extended anchor at expression start
-        .replace(QRegExp(QLatin1String("\\\\\\^")),
-                 QLatin1String("(?:[^\\w\\d\\-.%]|$)"))                        // process separator placeholders
-        .replace(QRegExp(QLatin1String("^\\\\\\|")), QLatin1String("^"))       // process anchor at expression start
-        .replace(QRegExp(QLatin1String("\\\\\\|$")), QLatin1String("$"))       // process anchor at expression end
-        .replace(QRegExp(QLatin1String("\\\\\\*")), QLatin1String(".*"))       // replace wildcards by .*
-        ;
-}
-
-void AdBlockRule::setPattern(const QString &pattern, bool isRegExp)
-{
-    m_regExp = QRegExp(isRegExp ? pattern : convertPatternToRegExp(pattern),
-                           Qt::CaseInsensitive, QRegExp::RegExp2);
-}
-
diff --git a/src/adblock/adblockrule.h b/src/adblock/adblockrule.h
deleted file mode 100644
index c877b79a..00000000
--- a/src/adblock/adblockrule.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ADBLOCKRULE_H
-#define ADBLOCKRULE_H
-
-#include <qstringlist.h>
-
-class QUrl;
-class QRegExp;
-class AdBlockRule
-{
-
-public:
-    AdBlockRule(const QString &filter = QString());
-
-    QString filter() const;
-    void setFilter(const QString &filter);
-
-    bool isCSSRule() const { return m_cssRule; }
-    bool networkMatch(const QString &encodedUrl) const;
-
-    bool isException() const;
-    void setException(bool exception);
-
-    bool isEnabled() const;
-    void setEnabled(bool enabled);
-
-    QString regExpPattern() const;
-    void setPattern(const QString &pattern, bool isRegExp);
-
-private:
-    QString m_filter;
-
-    bool m_cssRule;
-    bool m_exception;
-    bool m_enabled;
-    QRegExp m_regExp;
-    QStringList m_options;
-};
-
-#endif // ADBLOCKRULE_H
-
diff --git a/src/adblock/adblockschemeaccesshandler.cpp b/src/adblock/adblockschemeaccesshandler.cpp
deleted file mode 100644
index fe5166ed..00000000
--- a/src/adblock/adblockschemeaccesshandler.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "adblockschemeaccesshandler.h"
-
-#include "adblockmanager.h"
-#include "adblocksubscription.h"
-#include "adblockdialog.h"
-
-#include <qnetworkrequest.h>
-#include <qmessagebox.h>
-
-AdBlockSchemeAccessHandler::AdBlockSchemeAccessHandler(QObject *parent)
-    : SchemeAccessHandler(parent)
-{
-}
-
-QNetworkReply *AdBlockSchemeAccessHandler::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
-{
-    Q_UNUSED(outgoingData);
-    if (op != QNetworkAccessManager::GetOperation)
-        return 0;
-
-    if (request.url().path() != QLatin1String("subscribe"))
-        return 0;
-
-    AdBlockSubscription *subscription = new AdBlockSubscription(request.url(), AdBlockManager::instance());
-
-    QMessageBox::StandardButton result = QMessageBox::question(0
-            , tr("Subscribe?")
-            , tr("Subscribe to this AdBlock subscription?\n%1").arg(subscription->title())
-            , QMessageBox::Yes | QMessageBox::No);
-    if (result == QMessageBox::No) {
-        delete subscription;
-    } else {
-        AdBlockManager::instance()->addSubscription(subscription);
-        AdBlockDialog *dialog = AdBlockManager::instance()->showDialog();
-        QAbstractItemModel *model = dialog->treeView->model();
-        dialog->treeView->setCurrentIndex(model->index(model->rowCount() -1, 0));
-        dialog->setFocus();
-    }
-    return 0;
-}
-
diff --git a/src/adblock/adblockschemeaccesshandler.h b/src/adblock/adblockschemeaccesshandler.h
deleted file mode 100644
index fccee5aa..00000000
--- a/src/adblock/adblockschemeaccesshandler.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ADBLOCKSCHEMEACCESSHANDLER_H
-#define ADBLOCKSCHEMEACCESSHANDLER_H
-
-#include "schemeaccesshandler.h"
-
-class AdBlockSchemeAccessHandler : public SchemeAccessHandler
-{
-public:
-    AdBlockSchemeAccessHandler(QObject *parent = 0);
-
-    virtual QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0);
-};
-
-#endif // ADBLOCKSCHEMEACCESSHANDLER_H
diff --git a/src/adblock/adblocksubscription.cpp b/src/adblock/adblocksubscription.cpp
deleted file mode 100644
index 2fb0a80e..00000000
--- a/src/adblock/adblocksubscription.cpp
+++ /dev/null
@@ -1,374 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "adblocksubscription.h"
-
-#include "browserapplication.h"
-#include "networkaccessmanager.h"
-
-#include <qcryptographichash.h>
-#include <qdebug.h>
-#include <qfile.h>
-#include <qnetworkreply.h>
-#include <qtextstream.h>
-#include <QUrlQuery>
-
-// #define ADBLOCKSUBSCRIPTION_DEBUG
-
-AdBlockSubscription::AdBlockSubscription(const QUrl &url, QObject *parent)
-    : QObject(parent)
-    , m_url(url.toEncoded())
-    , m_enabled(false)
-    , m_downloading(0)
-{
-    parseUrl(url);
-}
-
-void AdBlockSubscription::parseUrl(const QUrl &url)
-{
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-    qDebug() << "AdBlockSubscription::" << __FUNCTION__ << url;
-#endif
-    if (url.scheme() != QLatin1String("abp"))
-        return;
-    if (url.path() != QLatin1String("subscribe"))
-        return;
-    QUrlQuery query(url.query());
-    m_title = query.queryItemValue("title");
-    m_enabled = query.queryItemValue("enabled") != QLatin1String("false");
-    m_location = query.queryItemValue("location").toUtf8();
-    QString lastUpdateString = query.queryItemValue("lastUpdate");
-    m_lastUpdate = QDateTime::fromString(lastUpdateString, Qt::ISODate);
-    loadRules();
-}
-
-QUrl AdBlockSubscription::url() const
-{
-    QUrl url;
-    url.setScheme(QLatin1String("abp"));
-    url.setPath(QLatin1String("subscribe"));
-
-    QUrlQuery queryItems;
-
-    queryItems.addQueryItem(QLatin1String("location"), QString::fromUtf8(m_location));
-    queryItems.addQueryItem(QLatin1String("title"), m_title);
-    if (!m_enabled)
-        queryItems.addQueryItem(QLatin1String("enabled"), QLatin1String("false"));
-    if (m_lastUpdate.isValid())
-        queryItems.addQueryItem(QLatin1String("lastUpdate"), m_lastUpdate.toString(Qt::ISODate));
-    url.setQuery(queryItems);
-    return url;
-}
-
-bool AdBlockSubscription::isEnabled() const
-{
-    return m_enabled;
-}
-
-void AdBlockSubscription::setEnabled(bool enabled)
-{
-    if (m_enabled == enabled)
-        return;
-    m_enabled = enabled;
-    populateCache();
-    emit changed();
-}
-
-QString AdBlockSubscription::title() const
-{
-    return m_title;
-}
-
-void AdBlockSubscription::setTitle(const QString &title)
-{
-    if (m_title == title)
-        return;
-    m_title = title;
-    emit changed();
-}
-
-QUrl AdBlockSubscription::location() const
-{
-    return QUrl::fromEncoded(m_location);
-}
-
-void AdBlockSubscription::setLocation(const QUrl &url)
-{
-    if (url == location())
-        return;
-    m_location = url.toEncoded();
-    m_lastUpdate = QDateTime();
-    emit changed();
-}
-
-QDateTime AdBlockSubscription::lastUpdate() const
-{
-    return m_lastUpdate;
-}
-
-QString AdBlockSubscription::rulesFileName() const
-{
-    if (location().scheme() == QLatin1String("file"))
-        return location().toLocalFile();
-
-    if (m_location.isEmpty())
-        return QString();
-
-    QByteArray sha1 = QCryptographicHash::hash(m_location, QCryptographicHash::Sha1).toHex();
-    QString fileName = BrowserApplication::dataFilePath(QString(QLatin1String("adblock_subscription_%1")).arg(QLatin1String(sha1)));
-    return fileName;
-}
-
-void AdBlockSubscription::loadRules()
-{
-    QString fileName = rulesFileName();
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-    qDebug() << "AdBlockSubscription::" << __FUNCTION__ << fileName;
-#endif
-    QFile file(fileName);
-    if (file.exists()) {
-        if (!file.open(QFile::ReadOnly)) {
-            qWarning() << "AdBlockSubscription::" << __FUNCTION__ << "Unable to open adblock file for reading" << fileName;
-        } else {
-            QTextStream textStream(&file);
-            QString header = textStream.readLine(1024);
-            if (!header.startsWith(QLatin1String("[Adblock"))) {
-                qWarning() << "AdBlockSubscription::" << __FUNCTION__ << "adblock file does not start with [Adblock" << fileName << "Header:" << header;
-                file.close();
-                file.remove();
-                m_lastUpdate = QDateTime();
-            } else {
-                m_rules.clear();
-                while (!textStream.atEnd()) {
-                    QString line = textStream.readLine();
-                    m_rules.append(AdBlockRule(line));
-                }
-                populateCache();
-                emit rulesChanged();
-            }
-        }
-    }
-
-    if (!m_lastUpdate.isValid()
-        || m_lastUpdate.addDays(7) < QDateTime::currentDateTime()) {
-        updateNow();
-    }
-}
-
-void AdBlockSubscription::updateNow()
-{
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-    qDebug() << "AdBlockSubscription::" << __FUNCTION__ << location();
-#endif
-    if (m_downloading) {
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-        qDebug() << "AdBlockSubscription::" << __FUNCTION__ << "already downloading, stopping";
-#endif
-        return;
-    }
-
-    if (!location().isValid()) {
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-        qDebug() << "AdBlockSubscription::" << __FUNCTION__ << location() << "isn't valid";
-#endif
-        return;
-    }
-
-    if (location().scheme() == QLatin1String("file")) {
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-        qDebug() << "AdBlockSubscription::" << __FUNCTION__ << "local file, not downloading";
-#endif
-        m_lastUpdate = QDateTime::currentDateTime();
-        loadRules();
-        emit changed();
-        return;
-    }
-
-    QNetworkRequest request(location());
-    QNetworkReply *reply = BrowserApplication::networkAccessManager()->get(request);
-    m_downloading = reply;
-    connect(reply, SIGNAL(finished()), this, SLOT(rulesDownloaded()));
-}
-
-void AdBlockSubscription::rulesDownloaded()
-{
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-    qDebug() << "AdBlockSubscription::" << __FUNCTION__ << rulesFileName();
-#endif
-    QNetworkReply *reply = qobject_cast<QNetworkReply*>(sender());
-    if (!reply) {
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-        qDebug() << "AdBlockSubscription::" << __FUNCTION__ << "no reply?";
-#endif
-        return;
-    }
-
-    QByteArray response = reply->readAll();
-    QUrl redirect = reply->attribute(QNetworkRequest::RedirectionTargetAttribute).toUrl();
-    reply->close();
-    reply->deleteLater();
-
-    if (reply->error() != QNetworkReply::NoError) {
-        qWarning() << "AdBlockSubscription::" << __FUNCTION__ << "error" << reply->errorString();
-        return;
-    }
-
-    if (redirect.isValid()) {
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-        qDebug() << "AdBlockSubscription::" << __FUNCTION__ << "redirect to:" << redirect;
-#endif
-        QNetworkRequest request(redirect);
-        m_downloading = BrowserApplication::networkAccessManager()->get(request);
-        connect(m_downloading, SIGNAL(finished()), this, SLOT(rulesDownloaded()));
-        return;
-    }
-
-    if (response.isEmpty()) {
-        qWarning() << "AdBlockSubscription::" << __FUNCTION__ << "empty response";
-        return;
-    }
-
-    QString fileName = rulesFileName();
-    QFile file(fileName);
-    if (!file.open(QFile::ReadWrite)) {
-        qWarning() << "AdBlockSubscription::" << __FUNCTION__ << "Unable to open adblock file for writing:" << fileName;
-        return;
-    }
-    file.write(response);
-    m_lastUpdate = QDateTime::currentDateTime();
-    loadRules();
-    emit changed();
-    m_downloading = 0;
-}
-
-void AdBlockSubscription::saveRules()
-{
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-    qDebug() << "AdBlockSubscription::" << __FUNCTION__ << rulesFileName() << m_rules.count();
-#endif
-    QString fileName = rulesFileName();
-    if (fileName.isEmpty())
-        return;
-
-    QFile file(fileName);
-    if (!file.open(QFile::ReadWrite | QIODevice::Truncate)) {
-        qWarning() << "AdBlockSubscription::" << __FUNCTION__ << "Unable to open adblock file for writing:" << fileName;
-        return;
-    }
-
-    QTextStream textStream(&file);
-    textStream << "[Adblock Plus 0.7.1]" << endl;
-    foreach (const AdBlockRule &rule, m_rules)
-        textStream << rule.filter() << endl;
-}
-
-QList<const AdBlockRule*> AdBlockSubscription::pageRules() const
-{
-    return m_pageRules;
-}
-
-const AdBlockRule *AdBlockSubscription::allow(const QString &urlString) const
-{
-    foreach (const AdBlockRule *rule, m_networkExceptionRules) {
-        if (rule->networkMatch(urlString))
-            return rule;
-    }
-    return 0;
-}
-
-const AdBlockRule *AdBlockSubscription::block(const QString &urlString) const
-{
-    foreach (const AdBlockRule *rule, m_networkBlockRules) {
-        if (rule->networkMatch(urlString))
-            return rule;
-    }
-    return 0;
-}
-
-QList<AdBlockRule> AdBlockSubscription::allRules() const
-{
-    return m_rules;
-}
-
-void AdBlockSubscription::addRule(const AdBlockRule &rule)
-{
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-    qDebug() << "AdBlockSubscription::" << __FUNCTION__ << rule.filter();
-#endif
-    m_rules.append(rule);
-    populateCache();
-    emit rulesChanged();
-}
-
-void AdBlockSubscription::removeRule(int offset)
-{
-#if defined(ADBLOCKSUBSCRIPTION_DEBUG)
-    qDebug() << "AdBlockSubscription::" << __FUNCTION__ << offset << m_rules.count();
-#endif
-    if (offset < 0 || offset >= m_rules.count())
-        return;
-    m_rules.removeAt(offset);
-    populateCache();
-    emit rulesChanged();
-}
-
-void AdBlockSubscription::replaceRule(const AdBlockRule &rule, int offset)
-{
-    if (offset < 0 || offset >= m_rules.count())
-        return;
-    m_rules[offset] = rule;
-    populateCache();
-    emit rulesChanged();
-}
-
-void AdBlockSubscription::populateCache()
-{
-    m_networkExceptionRules.clear();
-    m_networkBlockRules.clear();
-    m_pageRules.clear();
-    if (!isEnabled())
-        return;
-
-    for (int i = 0; i < m_rules.count(); ++i) {
-        const AdBlockRule *rule = &m_rules.at(i);
-        if (!rule->isEnabled())
-            continue;
-
-        if (rule->isCSSRule()) {
-            m_pageRules.append(rule);
-            continue;
-        }
-
-        if (rule->isException()) {
-            m_networkExceptionRules.append(rule);
-        } else {
-            m_networkBlockRules.append(rule);
-        }
-    }
-}
-
diff --git a/src/adblock/adblocksubscription.h b/src/adblock/adblocksubscription.h
deleted file mode 100644
index 5f600486..00000000
--- a/src/adblock/adblocksubscription.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ADBLOCKSUBSCRIPTION_H
-#define ADBLOCKSUBSCRIPTION_H
-
-#include <qobject.h>
-
-#include "adblockrule.h"
-
-#include <qlist.h>
-#include <qdatetime.h>
-
-class QNetworkReply;
-class QUrl;
-class AdBlockSubscription : public QObject
-{
-    Q_OBJECT
-
-signals:
-    void goingToChange();
-    void changed();
-    void rulesChanged();
-
-public:
-    AdBlockSubscription(const QUrl &url, QObject *parent = 0);
-    QUrl url() const;
-
-    bool isEnabled() const;
-    void setEnabled(bool enabled);
-
-    QString title() const;
-    void setTitle(const QString &title);
-
-    QUrl location() const;
-    void setLocation(const QUrl &url);
-
-    void updateNow();
-    QDateTime lastUpdate() const;
-
-    void saveRules();
-
-    const AdBlockRule *allow(const QString &urlString) const;
-    const AdBlockRule *block(const QString &urlString) const;
-    QList<const AdBlockRule*> pageRules() const;
-
-    QList<AdBlockRule> allRules() const;
-    void addRule(const AdBlockRule &rule);
-    void removeRule(int offset);
-    void replaceRule(const AdBlockRule &rule, int offset);
-
-private slots:
-    void rulesDownloaded();
-
-private:
-    void populateCache();
-    QString rulesFileName() const;
-    void parseUrl(const QUrl &url);
-    void loadRules();
-
-    QByteArray m_url;
-
-    QString m_title;
-    QByteArray m_location;
-    QDateTime m_lastUpdate;
-    bool m_enabled;
-
-    QNetworkReply *m_downloading;
-    QList<AdBlockRule> m_rules;
-
-    // sorted list
-    QList<const AdBlockRule*> m_networkExceptionRules;
-    QList<const AdBlockRule*> m_networkBlockRules;
-    QList<const AdBlockRule*> m_pageRules;
-};
-
-#endif // ADBLOCKSUBSCRIPTION_H
-
diff --git a/src/autofilldialog.cpp b/src/autofilldialog.cpp
deleted file mode 100644
index 7c8d3427..00000000
--- a/src/autofilldialog.cpp
+++ /dev/null
@@ -1,175 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "autofilldialog.h"
-
-#include "autofillmanager.h"
-#include "browserapplication.h"
-
-#include <qdebug.h>
-
-AutoFillModel::AutoFillModel(QObject *parent)
-    : QAbstractTableModel(parent)
-{
-    AutoFillManager *manager = BrowserApplication::instance()->autoFillManager();
-    Q_ASSERT(manager);
-    connect(manager, SIGNAL(autoFillChanged()), this, SLOT(autoFillChanged()));
-    autoFillChanged();
-}
-
-void AutoFillModel::autoFillChanged()
-{
-    beginResetModel();
-    AutoFillManager *manager = BrowserApplication::instance()->autoFillManager();
-    m_forms = manager->forms();
-    endResetModel();
-}
-
-QVariant AutoFillModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (orientation == Qt::Horizontal
-        && role == Qt::DisplayRole) {
-        switch (section) {
-        case 0: return tr("WebSite");
-        case 1: return tr("User Name");
-        }
-    }
-    return QAbstractTableModel::headerData(section, orientation, role);
-}
-
-QVariant AutoFillModel::data(const QModelIndex &index, int role) const
-{
-    if (index.row() < 0 || index.row() >= m_forms.size())
-        return QVariant();
-
-    switch (role) {
-    case Qt::UserRole:
-        return m_forms[index.row()].hasAPassword;
-    case Qt::DisplayRole:
-    case Qt::EditRole: {
-        switch (index.column()) {
-        case 0:
-            return m_forms[index.row()].url.host();
-        case 1: {
-            QStringList help;
-            QStringList choices;
-            foreach (const AutoFillManager::Element &element, m_forms[index.row()].elements) {
-                QString key = element.first.toLower();
-                if (key.contains(QLatin1String("pass")))
-                    continue;
-                if (key.contains(QLatin1String("user"))
-                    || key.contains(QLatin1String("email"))
-                    || key.contains(QLatin1String("login"))
-                    || key == QLatin1String("u"))
-                    return element.second;
-                choices.append(element.second);
-                help.append(element.first);
-            }
-            if (choices.count() == 1)
-                return choices.first();
-            qWarning() << "AutoFillModel: Unknown user id, choices:" << help << "url" << m_forms[index.row()].url.toString();
-            return help.join(QLatin1String(","));
-        }
-        }
-    }
-    default:
-        break;
-    }
-    return QVariant();
-}
-
-int AutoFillModel::columnCount(const QModelIndex &parent) const
-{
-    return (parent.isValid()) ? 0 : 2;
-}
-
-int AutoFillModel::rowCount(const QModelIndex &parent) const
-{
-    return (parent.isValid()) ? 0 : m_forms.count();
-}
-
-bool AutoFillModel::removeRows(int row, int count, const QModelIndex &parent)
-{
-    if (parent.isValid())
-        return false;
-    int lastRow = row + count - 1;
-    beginRemoveRows(parent, row, lastRow);
-    for (int i = lastRow; i >= row; --i)
-        m_forms.removeAt(i);
-    AutoFillManager *manager = BrowserApplication::instance()->autoFillManager();
-    disconnect(manager, SIGNAL(autoFillChanged()), this, SLOT(autoFillChanged()));
-    manager->setForms(m_forms);
-    connect(manager, SIGNAL(autoFillChanged()), this, SLOT(autoFillChanged()));
-    endRemoveRows();
-    return true;
-}
-
-AutoFillDialog::AutoFillDialog(QWidget *parent, Qt::WindowFlags flags)
-    : QDialog(parent, flags)
-{
-    setupUi(this);
-    setWindowFlags(Qt::Sheet);
-    connect(removeButton, SIGNAL(clicked()), tableView, SLOT(removeSelected()));
-    connect(removeAllButton, SIGNAL(clicked()), tableView, SLOT(removeAll()));
-    tableView->verticalHeader()->hide();
-    tableView->setSelectionBehavior(QAbstractItemView::SelectRows);
-    tableView->setAlternatingRowColors(true);
-    tableView->setTextElideMode(Qt::ElideMiddle);
-    tableView->setShowGrid(false);
-    tableView->setSortingEnabled(true);
-
-    AutoFillModel *model = new AutoFillModel();
-    QSortFilterProxyModel *m_proxyModel = new QSortFilterProxyModel(this);
-    connect(search, SIGNAL(textChanged(QString)),
-            m_proxyModel, SLOT(setFilterFixedString(QString)));
-    m_proxyModel->setSourceModel(model);
-    tableView->setModel(m_proxyModel);
-
-    QFont f = font();
-    f.setPointSize(10);
-    QFontMetrics fm(f);
-    int height = fm.height() + fm.height() / 3;
-    tableView->verticalHeader()->setDefaultSectionSize(height);
-    tableView->verticalHeader()->setMinimumSectionSize(-1);
-    for (int i = 0; i < model->columnCount(); ++i) {
-        int header = tableView->horizontalHeader()->sectionSizeHint(i);
-        switch (i) {
-        case 0:
-            header = fm.horizontalAdvance(QLatin1String("averagehost.domain.com"));
-            break;
-        case 1:
-            header = fm.horizontalAdvance(QLatin1String("_session_id"));
-            break;
-        }
-        int buffer = fm.horizontalAdvance(QLatin1String("xx"));
-        header += buffer;
-        tableView->horizontalHeader()->resizeSection(i, header);
-    }
-    tableView->horizontalHeader()->setStretchLastSection(true);
-}
-
diff --git a/src/autofilldialog.h b/src/autofilldialog.h
deleted file mode 100644
index 6e8f70c4..00000000
--- a/src/autofilldialog.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef AUTOFILLDIALOG_H
-#define AUTOFILLDIALOG_H
-
-#include <qdialog.h>
-#include "ui_autofilldialog.h"
-
-#include "autofillmanager.h"
-
-#include <qsortfilterproxymodel.h>
-
-class AutoFillModel : public QAbstractTableModel
-{
-    Q_OBJECT
-
-public:
-    AutoFillModel(QObject *parent = 0);
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
-
-private slots:
-    void autoFillChanged();
-
-private:
-    QList<AutoFillManager::Form> m_forms;
-};
-
-
-class AutoFillDialog : public QDialog, public Ui_AutoFillDialog
-{
-    Q_OBJECT
-
-public:
-    AutoFillDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
-
-};
-
-#endif // AUTOFILLDIALOG_H
-
diff --git a/src/autofilldialog.ui b/src/autofilldialog.ui
deleted file mode 100644
index 93fbcbaa..00000000
--- a/src/autofilldialog.ui
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AutoFillDialog</class>
- <widget class="QDialog" name="AutoFillDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>529</width>
-    <height>421</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Form Passwords</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0" colspan="3">
-    <spacer name="spacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>252</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="3" colspan="2">
-    <widget class="SearchLineEdit" name="search"/>
-   </item>
-   <item row="1" column="0" colspan="5">
-    <widget class="EditTableView" name="tableView">
-     <attribute name="verticalHeaderVisible">
-      <bool>false</bool>
-     </attribute>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QPushButton" name="removeButton">
-     <property name="text">
-      <string>Remove</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QPushButton" name="removeAllButton">
-     <property name="text">
-      <string>Remove All</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2" colspan="2">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>36</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="2" column="4">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>EditTableView</class>
-   <extends>QTableView</extends>
-   <header>edittableview.h</header>
-  </customwidget>
-  <customwidget>
-   <class>SearchLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>searchlineedit.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>AutoFillDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>AutoFillDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/autofillmanager.cpp b/src/autofillmanager.cpp
deleted file mode 100644
index 851ee20d..00000000
--- a/src/autofillmanager.cpp
+++ /dev/null
@@ -1,413 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "autofillmanager.h"
-
-#include "autosaver.h"
-#include "browserapplication.h"
-#include "browsermainwindow.h"
-#include "networkaccessmanagerproxy.h"
-#include "webpageproxy.h"
-#include "webview.h"
-
-#include <qdesktopservices.h>
-#include <qfile.h>
-#include <qmessagebox.h>
-#include <qsettings.h>
-#include <qurl.h>
-#include <qwebframe.h>
-#include <qwebpage.h>
-#include <qwebsettings.h>
-#include <QUrlQuery>
-
-#include <qdebug.h>
-
-// #define AUTOFILL_DEBUG
-
-AutoFillManager::AutoFillManager(QObject *parent)
-    : QObject(parent)
-    , m_savePasswordForms(true)
-    , m_allowAutoCompleteOff(true)
-    , m_saveTimer(new AutoSaver(this))
-{
-    connect(this, SIGNAL(autoFillChanged()),
-            m_saveTimer, SLOT(changeOccurred()));
-    loadSettings();
-    loadFormData();
-}
-
-AutoFillManager::~AutoFillManager()
-{
-    m_saveTimer->saveIfNeccessary();
-}
-
-void AutoFillManager::save() const
-{
-    saveFormData();
-}
-
-void AutoFillManager::setForms(const QList<Form> &forms)
-{
-    m_forms = forms;
-    emit autoFillChanged();
-}
-
-QList<AutoFillManager::Form> AutoFillManager::forms() const
-{
-    return m_forms;
-}
-
-void AutoFillManager::loadSettings()
-{
-    QSettings settings;
-    settings.beginGroup(QLatin1String("autofill"));
-    m_savePasswordForms = settings.value(QLatin1String("passwordForms"), m_savePasswordForms).toBool();
-    m_allowAutoCompleteOff = settings.value(QLatin1String("ignoreAutoCompleteOff"), m_allowAutoCompleteOff).toBool();
-}
-
-QString AutoFillManager::autoFillDataFile()
-{
-    QString fileName = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin";
-    fileName += QLatin1String("/autofill.dat");
-    return fileName;
-}
-
-void AutoFillManager::saveFormData() const
-{
-    QString fileName = autoFillDataFile();
-    QFile file(fileName);
-    if (!file.open(QFile::WriteOnly)) {
-        qWarning() << "Unable to open" << fileName << "to store autofill data";
-        return;
-    }
-
-    QDataStream stream(&file);
-    stream << m_forms;
-}
-
-void AutoFillManager::loadFormData()
-{
-    QString fileName = autoFillDataFile();
-    QFile file(fileName);
-    if (!file.open(QFile::ReadOnly))
-        return;
-
-    QDataStream stream(&file);
-    stream >> m_forms;
-}
-
-void AutoFillManager::post(const QNetworkRequest &request, const QByteArray &outgoingData)
-{
-#ifdef AUTOFILL_DEBUG
-    qDebug() << "AutoFillManager::" << __FUNCTION__ << outgoingData << request.url();
-#endif
-
-    // Don't even give the options to save this site user name & password.
-    if (QWebSettings::globalSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled)) {
-        return;
-    }
-
-    // Determine the url
-    QByteArray refererHeader = request.rawHeader("Referer");
-    if (refererHeader.isEmpty()) {
-        // XXX We could store the frame url in the request if this is a common problem
-        qWarning() << "AutoFillManager:" << "Unable to determine the request Referer";
-        return;
-    }
-    QUrl url = QUrl::fromEncoded(refererHeader);
-    url = stripUrl(url);
-
-    // Check that the url isn't in m_never
-    if (m_never.contains(url))
-        return;
-
-    // Check the request type
-    QVariant typeVariant = request.attribute((QNetworkRequest::Attribute)(WebPageProxy::pageAttributeId() + 1));
-    QWebPage::NavigationType type = (QWebPage::NavigationType)typeVariant.toInt();
-    if (typeVariant.isValid() && type != QWebPage::NavigationTypeFormSubmitted) {
-        // XXX Does this occur normally?
-        qWarning() << "AutoFillManager:" << "Type is not FormSubmitted" << type
-                   << "expected:" << QWebPage::NavigationTypeFormSubmitted;
-        return;
-    }
-
-    // Determine the QWebView
-    QVariant v = request.attribute((QNetworkRequest::Attribute)(WebPageProxy::pageAttributeId()));
-    QWebPage *webPage = (QWebPage*)(v.value<void*>());
-    if (!webPage) {
-        qWarning() << "AutoFillManager:" << "QWebPage is not set in QNetworkRequest.";
-        return;
-    }
-#if 0
-    // TODO CHECK reply ownership
-    if (!NetworkAccessManagerProxy::exists(webPage)) {
-        qWarning() << "AutoFillManager:" << "QWebPage no longer exists.";
-        return;
-    }
-#endif
-
-    // Find the matching form on the webpage
-    Form form = findForm(webPage, outgoingData);
-    if (!form.isValid()) {
-#if 0
-        qWarning() << "AutoFillManager:" << "Unable to find matching form on the webpage.";
-#endif
-        return;
-    }
-    form.url = url;
-
-    // Check if we allow storing this form if it has a password
-    if (!allowedToAutoFill(form.hasAPassword))
-        return;
-
-    // Prompt if we have never seen this password
-    int alreadyAccepted = -1;
-    for (int i = 0; i < m_forms.count(); ++i) {
-        const Form &form = m_forms.at(i);
-        if (form.url == url) {
-            alreadyAccepted = i;
-            break;
-        }
-    }
-    if (form.hasAPassword && alreadyAccepted == -1) {
-        QMessageBox messageBox;
-        messageBox.setText(tr("<b>Would you like to save this password?</b><br> \
-        To review passwords you have saved and remove them, open the AutoFill panel of preferences."));
-        messageBox.addButton(tr("Never for this site"), QMessageBox::DestructiveRole);
-        messageBox.addButton(tr("Not now"), QMessageBox::RejectRole);
-        messageBox.addButton(QMessageBox::Yes);
-        messageBox.setDefaultButton(QMessageBox::Yes);
-        messageBox.exec();
-        switch (messageBox.buttonRole(messageBox.clickedButton())) {
-        case QMessageBox::DestructiveRole:
-            m_never.append(url);
-            return;
-        case QMessageBox::RejectRole:
-            return;
-        default:
-            break;
-        }
-    }
-
-#ifdef AUTOFILL_DEBUG
-    qDebug() << "AutoFillManager:" << "Saving" << form.url;
-#endif
-    // TODO When we can hook into element events we can save multiple passwords for different users
-    if (alreadyAccepted != -1)
-        m_forms.removeAt(alreadyAccepted);
-    m_forms.append(form);
-    emit autoFillChanged();
-}
-
-AutoFillManager::Form AutoFillManager::findForm(QWebPage *webPage, const QByteArray &outgoingData) const
-{
-    Form form;
-    QUrlQuery argsUrl(outgoingData);
-    QList<QPair<QString, QString> > encodedArgs = argsUrl.queryItems();
-    QSet<QPair<QString, QString> > args;
-    // XXX Is there a Qt function to do this? (unencode '+' to ' ')
-    for (int i = 0; i < encodedArgs.count(); ++i) {
-        QString key = encodedArgs[i].first;
-        QString value = encodedArgs[i].second.replace(QLatin1String("+"), QLatin1String(" "));
-        QPair<QString, QString> p(key, value);
-        args.insert(p);
-    }
-
-    QFile file(QLatin1String(":parseForms.js"));
-    if (!file.open(QFile::ReadOnly)) {
-        qWarning() << "AutoFillManager:" << "Unable to open js form parsing file";
-        return form;
-    }
-    QString script = QLatin1String(file.readAll());
-
-    // XXX Do I need to do this on subframes?
-    QVariant r = webPage->mainFrame()->evaluateJavaScript(script);
-    QVariantList list = r.toList();
-    foreach (const QVariant &formVariant, list) {
-        QVariantMap map = formVariant.toMap();
-        bool formHasPasswords = false;
-        QString formName = map[QLatin1String("name")].toString();
-        QVariantList elements = map[QLatin1String("elements")].toList();
-        QSet<QPair<QString, QString> > formElements;
-        QSet<QPair<QString, QString> > deadElements;
-        foreach (const QVariant &element, elements) {
-            QVariantMap elementMap = element.toMap();
-            QString name = elementMap[QLatin1String("name")].toString();
-            QString value = elementMap[QLatin1String("value")].toString();
-            QString type = elementMap[QLatin1String("type")].toString();
-            if (type == QLatin1String("password"))
-                formHasPasswords = true;
-            QPair<QString, QString> p(name, value);
-            if ((elementMap[QLatin1String("autocomplete")].toString()) == QLatin1String("off"))
-                deadElements.insert(p);
-            if (!name.isEmpty())
-                formElements.insert(p);
-        }
-        if (formElements.intersect(args) == args) {
-            form.hasAPassword = formHasPasswords;
-            form.name = formName;
-            if (m_allowAutoCompleteOff)
-                args = args.subtract(deadElements);
-            form.elements = args.values();
-            break;
-        }
-#ifdef AUTOFILL_DEBUG
-        qDebug() << formName;
-        qDebug() << formElements;
-        qDebug() << args;
-        qDebug() << formElements.count() << args.count() << formElements.subtract(args);
-#endif
-    }
-    return form;
-}
-
-QUrl AutoFillManager::stripUrl(const QUrl &url)
-{
-    QUrl cleanUrl = url;
-    cleanUrl.setQuery(QUrlQuery());
-    cleanUrl.setFragment(QString());
-    cleanUrl.setUserInfo(QString());
-    return cleanUrl;
-}
-
-bool AutoFillManager::allowedToAutoFill(bool password) const
-{
-    if (password && m_savePasswordForms)
-        return true;
-    return false;
-}
-
-QList<AutoFillManager::Form> AutoFillManager::fetchForms(const QUrl &url) const
-{
-    QList<Form> forms;
-    foreach (const Form &form, m_forms)
-        if (form.url == url)
-            forms.append(form);
-#ifdef AUTOFILL_DEBUG
-    qDebug() << "AutoFillManager::" << __FUNCTION__ << url << m_forms.count() << "found:" << forms.count();
-#endif
-    return forms;
-}
-
-void AutoFillManager::fill(QWebPage *page) const
-{
-#ifdef AUTOFILL_DEBUG
-    qDebug() << "AutoFillManager::" << __FUNCTION__ << page;
-#endif
-    if (!page || !page->mainFrame())
-        return;
-
-    QUrl url = page->mainFrame()->url();
-    url = stripUrl(url);
-
-    const QList<Form> forms = fetchForms(url);
-    if (forms.isEmpty())
-        return;
-
-    foreach (const Form &form, forms) {
-        QString formName = QString(QLatin1String("\"%1\"")).arg(form.name);
-        if (form.name.isEmpty())
-            formName = QLatin1String("0");
-        foreach (const AutoFillManager::Element &element, form.elements) {
-            const QString key = element.first;
-            const QString value = element.second;
-
-            // When we drop 4.5 migrate this to the 4.6 dom API
-            bool disabled = page->mainFrame()->evaluateJavaScript(QString(QLatin1String("document.forms[%1].elements[\"%2\"].disabled")).arg(formName).arg(key)).toBool();
-            if (disabled) {
-#ifdef AUTOFILL_DEBUG
-                qDebug() << formName << "is disabled";
-#endif
-                continue;
-            }
-            bool readOnly = page->mainFrame()->evaluateJavaScript(QString(QLatin1String("document.forms[%1].elements[\"%2\"].readonly")).arg(formName).arg(key)).toBool();
-            if (readOnly) {
-#ifdef AUTOFILL_DEBUG
-                qDebug() << formName << "is readOnly";
-#endif
-                continue;
-            }
-
-            QString type = page->mainFrame()->evaluateJavaScript(QString(QLatin1String("document.forms[%1].elements[\"%2\"].type")).arg(formName).arg(key)).toString();
-            if (type.isEmpty()
-                || type == QLatin1String("hidden")
-                || type == QLatin1String("reset")
-                || type == QLatin1String("submit")) {
-#ifdef AUTOFILL_DEBUG
-                qDebug() << formName << key << "is hidden, reset or submit";
-#endif
-                continue;
-            }
-#ifdef AUTOFILL_DEBUG
-            qDebug() << "type:" << type << "readonly" << readOnly << "disabled" << disabled << key << value;
-#endif
-            QString setType = (type == QLatin1String("checkbox"))
-                                ? QLatin1String("checked")
-                                : QLatin1String("value");
-
-            // XXX is there a cleaner way to do this?
-            QString jsValue = value;
-            jsValue.replace(QLatin1Char('\\'), QLatin1String("\\\\"));
-            jsValue.replace(QLatin1Char('\"'), QLatin1String("\\\""));
-            QString javascript = QString(QLatin1String("document.forms[%1].elements[\"%2\"].%3=\"%4\";"))
-                    .arg(formName)
-                    .arg(key)
-                    .arg(setType)
-                    .arg(jsValue);
-            page->mainFrame()->evaluateJavaScript(javascript);
-        }
-    }
-}
-
-QDataStream &operator>>(QDataStream &in, AutoFillManager::Form &form)
-{
-    AutoFillManager::Form::load(in, form);
-    return in;
-}
-
-QDataStream &operator<<(QDataStream &out, const AutoFillManager::Form &form)
-{
-    AutoFillManager::Form::save(out, form);
-    return out;
-}
-
-void AutoFillManager::Form::load(QDataStream &in, AutoFillManager::Form &form)
-{
-    in >> form.elements;
-    in >> form.url;
-    in >> form.name;
-    in >> form.hasAPassword;
-}
-
-void AutoFillManager::Form::save(QDataStream &out, const AutoFillManager::Form &form)
-{
-    out << form.elements;
-    out << form.url;
-    out << form.name;
-    out << form.hasAPassword;
-}
diff --git a/src/autofillmanager.h b/src/autofillmanager.h
deleted file mode 100644
index 2cecd61a..00000000
--- a/src/autofillmanager.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef AUTOFILLMANAGER_H
-#define AUTOFILLMANAGER_H
-
-#include <qobject.h>
-
-#include <qnetworkrequest.h>
-
-class QWebPage;
-class AutoSaver;
-class AutoFillManager : public QObject
-{
-    Q_OBJECT
-
-signals:
-    void autoFillChanged();
-
-public:
-    typedef QPair<QString, QString> Element;
-    class Form {
-    public:
-        bool isValid() { return !elements.isEmpty(); }
-        static void load(QDataStream &in, Form &subscription);
-        static void save(QDataStream &out, const Form &subscription);
-
-        QList<Element> elements;
-        QUrl url;
-        QString name;
-        bool hasAPassword;
-    };
-
-    AutoFillManager(QObject *parent = 0);
-    ~AutoFillManager();
-
-    void loadSettings();
-
-    void post(const QNetworkRequest &request, const QByteArray &outgoingData);
-    void fill(QWebPage *page) const;
-
-    void setForms(const QList<Form> &forms);
-    QList<Form> forms() const;
-
-private slots:
-    void save() const;
-
-private:
-    Form findForm(QWebPage *page, const QByteArray &outgoingData) const;
-    static QUrl stripUrl(const QUrl &url);
-    static QString autoFillDataFile();
-    bool allowedToAutoFill(bool password) const;
-    QList<AutoFillManager::Form> fetchForms(const QUrl &url) const;
-
-    void saveFormData() const;
-    void loadFormData();
-
-    bool m_savePasswordForms;
-    bool m_allowAutoCompleteOff;
-
-    QList<Form> m_forms;
-    QList<QUrl> m_never;
-    AutoSaver *m_saveTimer;
-};
-
-QDataStream &operator<<(QDataStream &, const AutoFillManager::Form &form);
-QDataStream &operator>>(QDataStream &, AutoFillManager::Form &form);
-
-#endif // AUTOFILLMANAGER_H
-
diff --git a/src/autosaver.cpp b/src/autosaver.cpp
index de7794ac..85a5deff 100644
--- a/src/autosaver.cpp
+++ b/src/autosaver.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,11 +62,11 @@
 
 #include "autosaver.h"
 
-#include <qdir.h>
-#include <qcoreapplication.h>
-#include <qmetaobject.h>
+#include <QDir>
+#include <QCoreApplication>
+#include <QMetaObject>
 
-#include <qdebug.h>
+#include <QDebug>
 
 #define AUTOSAVE_IN  1000 * 3  // seconds
 #define MAXWAIT      1000 * 15 // seconds
diff --git a/src/autosaver.h b/src/autosaver.h
index f39b64cc..e83df97b 100644
--- a/src/autosaver.h
+++ b/src/autosaver.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,8 +63,8 @@
 #ifndef AUTOSAVER_H
 #define AUTOSAVER_H
 
-#include <qobject.h>
-#include <qbasictimer.h>
+#include <QObject>
+#include <QBasicTimer>
 #include <QElapsedTimer>
 
 /*
@@ -82,7 +82,7 @@ class AutoSaver : public QObject
     ~AutoSaver();
     void saveIfNeccessary();
 
-public slots:
+public Q_SLOTS:
     void changeOccurred();
 
 protected:
diff --git a/src/bookmarks/addbookmarkdialog.cpp b/src/bookmarks/addbookmarkdialog.cpp
index bd0f0ac2..d03a17a8 100644
--- a/src/bookmarks/addbookmarkdialog.cpp
+++ b/src/bookmarks/addbookmarkdialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -66,9 +66,15 @@
 #include "bookmarknode.h"
 #include "bookmarksmanager.h"
 #include "bookmarksmodel.h"
+#ifndef NO_BROWSERAPPLICATION
 #include "browserapplication.h"
+#else
+#ifdef FOR_AUTOTEST
+#include "tst_addbookmarkdialog.h"
+#endif
+#endif
 
-#include <qheaderview.h>
+#include <QHeaderView>
 #include <qtreeview.h>
 
 AddBookmarkProxyModel::AddBookmarkProxyModel(QObject *parent)
@@ -90,15 +96,23 @@ bool AddBookmarkProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &s
 AddBookmarkDialog::AddBookmarkDialog(QWidget *parent, BookmarksManager *bookmarksManager)
     : QDialog(parent)
     , m_bookmarksManager(bookmarksManager)
-    , m_addedNode(0)
-    , m_proxyModel(0)
+    , m_addedNode(nullptr)
+    , m_proxyModel(nullptr)
     , m_addFolder(false)
 {
     setWindowFlags(Qt::Sheet);
     setupUi(this);
 
     if (!m_bookmarksManager)
+#ifndef NO_BROWSERAPPLICATION
         m_bookmarksManager = BrowserApplication::bookmarksManager();
+#else
+#ifdef FOR_AUTOTEST
+        m_bookmarksManager = tst_AddBookmarkDialog::bookmarksManager();
+#else
+#error "No bookmarksmanager provided! Build this either with BrowserApplication included or for autotests"
+#endif
+#endif
 
     m_proxyModel = new AddBookmarkProxyModel(this);
     BookmarksModel *model = m_bookmarksManager->bookmarksModel();
diff --git a/src/bookmarks/addbookmarkdialog.h b/src/bookmarks/addbookmarkdialog.h
index d50381c6..33e92f3b 100644
--- a/src/bookmarks/addbookmarkdialog.h
+++ b/src/bookmarks/addbookmarkdialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -66,14 +66,14 @@
 
 #include "ui_addbookmarkdialog.h"
 
-#include <qsortfilterproxymodel.h>
+#include <QSortFilterProxyModel>
 
 class AddBookmarkProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 
 public:
-    AddBookmarkProxyModel(QObject *parent = 0);
+    AddBookmarkProxyModel(QObject *parent = nullptr);
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
 
 protected:
@@ -88,7 +88,7 @@ class AddBookmarkDialog : public QDialog, public Ui_AddBookmarkDialog
     Q_OBJECT
 
 public:
-    AddBookmarkDialog(QWidget *parent = 0, BookmarksManager *bookmarksManager = 0);
+    AddBookmarkDialog(QWidget *parent = nullptr, BookmarksManager *bookmarksManager = nullptr);
 
     void setUrl(const QString &url);
     QString url() const;
@@ -104,7 +104,7 @@ class AddBookmarkDialog : public QDialog, public Ui_AddBookmarkDialog
 
     BookmarkNode *addedNode() const;
 
-private slots:
+private Q_SLOTS:
     void accept();
 
 private:
diff --git a/src/bookmarks/bookmarknode.cpp b/src/bookmarks/bookmarknode.cpp
index 1d927dfb..4f6fa523 100644
--- a/src/bookmarks/bookmarknode.cpp
+++ b/src/bookmarks/bookmarknode.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2014 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,9 +63,9 @@
 #include "bookmarknode.h"
 
 BookmarkNode::BookmarkNode(BookmarkNode::Type type, BookmarkNode *parent) :
-     expanded(false)
-   , m_parent(parent)
-   , m_type(type)
+    expanded(false)
+    , m_parent(parent)
+    , m_type(type)
 {
     if (parent)
         parent->add(this);
@@ -77,18 +77,18 @@ BookmarkNode::~BookmarkNode()
         m_parent->remove(this);
     for (int i = m_children.count() -1; i >= 0; --i)
         delete m_children[i];
-    m_parent = 0;
+    m_parent = nullptr;
     m_type = BookmarkNode::Root;
 }
 
 bool BookmarkNode::operator==(const BookmarkNode &other) const
 {
     if (url != other.url
-        || title != other.title
-        || desc != other.desc
-        || expanded != other.expanded
-        || m_type != other.m_type
-        || m_children.count() != other.m_children.count())
+            || title != other.title
+            || desc != other.desc
+            || expanded != other.expanded
+            || m_type != other.m_type
+            || m_children.count() != other.m_children.count())
         return false;
 
     for (int i = 0; i < m_children.count(); ++i)
@@ -136,7 +136,7 @@ void BookmarkNode::remove(BookmarkNode *child)
 {
     if (!child)
         return;
-    child->m_parent = 0;
+    child->m_parent = nullptr;
     m_children.removeAll(child);
 }
 
diff --git a/src/bookmarks/bookmarknode.h b/src/bookmarks/bookmarknode.h
index ef766546..63fe0b8d 100644
--- a/src/bookmarks/bookmarknode.h
+++ b/src/bookmarks/bookmarknode.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2014 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,8 +63,8 @@
 #ifndef BOOKMARKNODE_H
 #define BOOKMARKNODE_H
 
-#include <qlist.h>
-#include <qstringlist.h>
+#include <QList>
+#include <QStringList>
 
 class BookmarkNode
 {
@@ -76,7 +76,7 @@ class BookmarkNode
         Separator
     };
 
-    BookmarkNode(Type type = Root, BookmarkNode *parent = 0);
+    BookmarkNode(Type type = Root, BookmarkNode *parent = nullptr);
     ~BookmarkNode();
     bool operator==(const BookmarkNode &other) const;
 
diff --git a/src/bookmarks/bookmarks.pri b/src/bookmarks/bookmarks.pri
deleted file mode 100644
index 34f899e6..00000000
--- a/src/bookmarks/bookmarks.pri
+++ /dev/null
@@ -1,27 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += \
-    addbookmarkdialog.h \
-    bookmarksdialog.h \
-    bookmarksmanager.h \
-    bookmarksmenu.h \
-    bookmarksmodel.h \
-    bookmarkstoolbar.h \
-    bookmarknode.h
-
-SOURCES += \
-    addbookmarkdialog.cpp \
-    bookmarksdialog.cpp \
-    bookmarksmanager.cpp \
-    bookmarksmenu.cpp \
-    bookmarksmodel.cpp \
-    bookmarkstoolbar.cpp \
-    bookmarknode.cpp
-
-FORMS += \
-    addbookmarkdialog.ui \
-    bookmarksdialog.ui
-
-include(xbel/xbel.pri)
diff --git a/src/bookmarks/bookmarksdialog.cpp b/src/bookmarks/bookmarksdialog.cpp
index 4c81b121..6c007ece 100644
--- a/src/bookmarks/bookmarksdialog.cpp
+++ b/src/bookmarks/bookmarksdialog.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -68,14 +68,14 @@
 #include "browserapplication.h"
 #include "treesortfilterproxymodel.h"
 
-#include <qheaderview.h>
-#include <qmenu.h>
+#include <QHeaderView>
+#include <QMenu>
 
 BookmarksDialog::BookmarksDialog(QWidget *parent, BookmarksManager *manager)
     : QDialog(parent)
-    , m_bookmarksManager(0)
-    , m_bookmarksModel(0)
-    , m_proxyModel(0)
+    , m_bookmarksManager(nullptr)
+    , m_bookmarksModel(nullptr)
+    , m_proxyModel(nullptr)
 {
     m_bookmarksManager = manager;
     if (!m_bookmarksManager)
@@ -98,7 +98,7 @@ BookmarksDialog::BookmarksDialog(QWidget *parent, BookmarksManager *manager)
     tree->setExpanded(m_proxyModel->index(0, 0), true);
     tree->setAlternatingRowColors(true);
     QFontMetrics fm(font());
-    int header = fm.horizontalAdvance(QLatin1Char('m')) * 40;
+    int header = fm.horizontalAdvance(QChar('m')) * 40;
     tree->header()->resizeSection(0, header);
     tree->header()->setStretchLastSection(true);
     connect(tree, SIGNAL(activated(const QModelIndex&)),
@@ -180,10 +180,10 @@ void BookmarksDialog::openBookmark(TabWidget::OpenUrlIn tab)
     const BookmarkNode *node = m_bookmarksModel->node(sourceIndex);
     if (!index.parent().isValid() || !node || node->type() == BookmarkNode::Folder)
         return;
-    emit openUrl(
-          index.sibling(index.row(), 1).data(BookmarksModel::UrlRole).toUrl(),
-          tab,
-          index.sibling(index.row(), 0).data(Qt::DisplayRole).toString());
+    Q_EMIT openUrl(
+        index.sibling(index.row(), 1).data(BookmarksModel::UrlRole).toUrl(),
+        tab,
+        index.sibling(index.row(), 0).data(Qt::DisplayRole).toString());
 }
 
 void BookmarksDialog::openBookmark()
diff --git a/src/bookmarks/bookmarksdialog.h b/src/bookmarks/bookmarksdialog.h
index 513e6e4f..edb3f67d 100644
--- a/src/bookmarks/bookmarksdialog.h
+++ b/src/bookmarks/bookmarksdialog.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,13 +63,13 @@
 #ifndef BOOKMARKSDIALOG_H
 #define BOOKMARKSDIALOG_H
 
-#include <qdialog.h>
+#include <QDialog>
 #include "ui_bookmarksdialog.h"
 
 #include "tabwidget.h"
 
-#include <qabstractitemmodel.h>
-#include <qurl.h>
+#include <QAbstractItemModel>
+#include <QUrl>
 
 class TreeSortFilterProxyModel;
 class BookmarksManager;
@@ -79,14 +79,14 @@ class BookmarksDialog : public QDialog, public Ui_BookmarksDialog
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void openUrl(const QUrl &url, TabWidget::OpenUrlIn tab, const QString &title);
 
 public:
-    BookmarksDialog(QWidget *parent = 0, BookmarksManager *manager = 0);
+    BookmarksDialog(QWidget *parent = nullptr, BookmarksManager *manager = nullptr);
     ~BookmarksDialog();
 
-private slots:
+private Q_SLOTS:
     void customContextMenuRequested(const QPoint &pos);
     void openBookmark(TabWidget::OpenUrlIn tab);
     void openBookmark();
diff --git a/src/bookmarks/bookmarksmanager.cpp b/src/bookmarks/bookmarksmanager.cpp
index b270980f..a865a513 100644
--- a/src/bookmarks/bookmarksmanager.cpp
+++ b/src/bookmarks/bookmarksmanager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,26 +65,25 @@
 #include "autosaver.h"
 #include "bookmarknode.h"
 #include "bookmarksmodel.h"
-#include "browserapplication.h"
 #include "history.h"
 #include "xbelreader.h"
 #include "xbelwriter.h"
 
 #include <qbuffer.h>
-#include <qdesktopservices.h>
-#include <qevent.h>
-#include <qfile.h>
-#include <qfiledialog.h>
-#include <qheaderview.h>
+#include <QDesktopServices>
+#include <QEvent>
+#include <QFile>
+#include <QFileDialog>
+#include <QHeaderView>
 #include <qicon.h>
-#include <qmessagebox.h>
-#include <qmimedata.h>
-#include <qtoolbutton.h>
-#include <qprocess.h>
+#include <QMessageBox>
+#include <QMimeData>
+#include <QToolButton>
+#include <QProcess>
 
-#include <qwebsettings.h>
+#include <QWebEngineSettings>
 
-#include <qdebug.h>
+#include <QDebug>
 
 #define BOOKMARKBAR QT_TRANSLATE_NOOP("BookmarksManager", "Bookmarks Bar")
 #define BOOKMARKMENU QT_TRANSLATE_NOOP("BookmarksManager", "Bookmarks Menu")
@@ -93,10 +92,10 @@ BookmarksManager::BookmarksManager(QObject *parent)
     : QObject(parent)
     , m_loaded(false)
     , m_saveTimer(new AutoSaver(this))
-    , m_bookmarkRootNode(0)
-    , m_toolbar(0)
-    , m_menu(0)
-    , m_bookmarkModel(0)
+    , m_bookmarkRootNode(nullptr)
+    , m_toolbar(nullptr)
+    , m_menu(nullptr)
+    , m_bookmarkModel(nullptr)
 {
     connect(this, SIGNAL(entryAdded(BookmarkNode *)),
             m_saveTimer, SLOT(changeOccurred()));
@@ -124,16 +123,16 @@ void BookmarksManager::load()
     m_loaded = true;
 
     QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin";
-    QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel");
+    QString bookmarkFile = dir + QStringLiteral("/bookmarks.xbel");
     if (!QFile::exists(bookmarkFile))
-        bookmarkFile = QLatin1String(":defaultbookmarks.xbel");
+        bookmarkFile = QStringLiteral(":defaultbookmarks.xbel");
 
     XbelReader reader;
     m_bookmarkRootNode = reader.read(bookmarkFile);
     if (reader.error() != QXmlStreamReader::NoError) {
-        QMessageBox::warning(0, QLatin1String("Loading Bookmark"),
-            tr("Error when loading bookmarks on line %1, column %2:\n"
-               "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
+        QMessageBox::warning(nullptr, QStringLiteral("Loading Bookmark"),
+                             tr("Error when loading bookmarks on line %1, column %2:\n"
+                                "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
     }
 
     QList<BookmarkNode*> others;
@@ -142,7 +141,7 @@ void BookmarksManager::load()
         if (node->type() == BookmarkNode::Folder) {
             // Automatically convert
             if ((node->title == tr("Toolbar Bookmarks")
-                 || node->title == QLatin1String(BOOKMARKBAR)) && !m_toolbar) {
+                    || node->title == QString(BOOKMARKBAR)) && !m_toolbar) {
                 node->title = tr(BOOKMARKBAR);
 
                 m_toolbar = node;
@@ -150,7 +149,7 @@ void BookmarksManager::load()
 
             // Automatically convert
             if ((node->title == tr("Menu")
-                 || node->title == QLatin1String(BOOKMARKMENU)) && !m_menu) {
+                    || node->title == QString(BOOKMARKMENU)) && !m_menu) {
                 node->title = tr(BOOKMARKMENU);
                 m_menu = node;
             }
@@ -185,10 +184,10 @@ void BookmarksManager::save() const
 
     XbelWriter writer;
     QString dir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin";
-    QString bookmarkFile = dir + QLatin1String("/bookmarks.xbel");
+    QString bookmarkFile = dir + QStringLiteral("/bookmarks.xbel");
     // Save root folder titles in English (i.e. not localized)
-    m_menu->title = QLatin1String(BOOKMARKMENU);
-    m_toolbar->title = QLatin1String(BOOKMARKBAR);
+    m_menu->title = QString(BOOKMARKMENU);
+    m_toolbar->title = QString(BOOKMARKBAR);
     if (!writer.write(bookmarkFile, m_bookmarkRootNode))
         qWarning() << "BookmarkManager: error saving to" << bookmarkFile;
     // Restore localized titles
@@ -279,18 +278,18 @@ BookmarksModel *BookmarksManager::bookmarksModel()
 void BookmarksManager::importBookmarks()
 {
     QStringList supportedFormats;
-    supportedFormats << tr("XBEL bookmarks").append(QLatin1String("(*.xbel *.xml)"));
-    supportedFormats << tr("HTML Netscape bookmarks").append(QLatin1String("(*.html)"));
+    supportedFormats << tr("XBEL bookmarks").append(QStringLiteral("(*.xbel *.xml)"));
+    supportedFormats << tr("HTML Netscape bookmarks").append(QStringLiteral("(*.html)"));
 
-    QString fileName = QFileDialog::getOpenFileName(0, tr("Open File"),
-                                                    QString(), supportedFormats.join(QLatin1String(";;")));
+    QString fileName = QFileDialog::getOpenFileName(nullptr, tr("Open File"),
+                       QString(), supportedFormats.join(QStringLiteral(";;")));
     if (fileName.isEmpty())
         return;
 
     XbelReader reader;
-    BookmarkNode *importRootNode = 0;
-    if (fileName.endsWith(QLatin1String(".html"))) {
-        QString program = QLatin1String("htmlToXBel");
+    BookmarkNode *importRootNode = nullptr;
+    if (fileName.endsWith(QStringLiteral(".html"))) {
+        QString program = QStringLiteral("htmlToXBel");
         QStringList arguments;
         arguments << fileName;
         QProcess process;
@@ -298,12 +297,12 @@ void BookmarksManager::importBookmarks()
         process.waitForFinished(-1);
         if (process.error() != QProcess::UnknownError) {
             if (process.error() == QProcess::FailedToStart) {
-                QMessageBox::warning(0, tr("htmlToXBel tool required"),
-                    tr("htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, "
-                       "is not installed or not available in the search paths."));
+                QMessageBox::warning(nullptr, tr("htmlToXBel tool required"),
+                                     tr("htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, "
+                                        "is not installed or not available in the search paths."));
             } else {
-                QMessageBox::warning(0, tr("Loading Bookmark"),
-                    tr("Error when loading HTML bookmarks: %1\n").arg(process.errorString()));
+                QMessageBox::warning(nullptr, tr("Loading Bookmark"),
+                                     tr("Error when loading HTML bookmarks: %1\n").arg(process.errorString()));
             }
             return;
         }
@@ -312,9 +311,9 @@ void BookmarksManager::importBookmarks()
         importRootNode = reader.read(fileName);
     }
     if (reader.error() != QXmlStreamReader::NoError) {
-        QMessageBox::warning(0, QLatin1String("Loading Bookmark"),
-            tr("Error when loading bookmarks on line %1, column %2:\n"
-               "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
+        QMessageBox::warning(nullptr, QStringLiteral("Loading Bookmark"),
+                             tr("Error when loading bookmarks on line %1, column %2:\n"
+                                "%3").arg(reader.lineNumber()).arg(reader.columnNumber()).arg(reader.errorString()));
         delete importRootNode;
         return;
     }
@@ -326,15 +325,15 @@ void BookmarksManager::importBookmarks()
 
 void BookmarksManager::exportBookmarks()
 {
-    QString fileName = QFileDialog::getSaveFileName(0, tr("Save File"),
-                                tr("%1 Bookmarks.xbel").arg(QCoreApplication::applicationName()),
-                                tr("XBEL bookmarks").append(QLatin1String("(*.xbel *.xml)")));
+    QString fileName = QFileDialog::getSaveFileName(nullptr, tr("Save File"),
+                       tr("%1 Bookmarks.xbel").arg(QCoreApplication::applicationName()),
+                       tr("XBEL bookmarks").append(QStringLiteral("(*.xbel *.xml)")));
     if (fileName.isEmpty())
         return;
 
     XbelWriter writer;
     if (!writer.write(fileName, m_bookmarkRootNode))
-        QMessageBox::critical(0, tr("Export error"), tr("error saving bookmarks"));
+        QMessageBox::critical(nullptr, tr("Export error"), tr("error saving bookmarks"));
 }
 
 RemoveBookmarksCommand::RemoveBookmarksCommand(BookmarksManager *m_bookmarkManagaer, BookmarkNode *parent, int row)
@@ -357,19 +356,19 @@ RemoveBookmarksCommand::~RemoveBookmarksCommand()
 void RemoveBookmarksCommand::undo()
 {
     m_parent->add(m_node, m_row);
-    emit m_bookmarkManagaer->entryAdded(m_node);
+    Q_EMIT m_bookmarkManagaer->entryAdded(m_node);
     m_done = false;
 }
 
 void RemoveBookmarksCommand::redo()
 {
     m_parent->remove(m_node);
-    emit m_bookmarkManagaer->entryRemoved(m_parent, m_row, m_node);
+    Q_EMIT m_bookmarkManagaer->entryRemoved(m_parent, m_row, m_node);
     m_done = true;
 }
 
 InsertBookmarksCommand::InsertBookmarksCommand(BookmarksManager *m_bookmarkManagaer,
-                BookmarkNode *parent, BookmarkNode *node, int row)
+        BookmarkNode *parent, BookmarkNode *node, int row)
     : RemoveBookmarksCommand(m_bookmarkManagaer, parent, row)
 {
     setText(BookmarksManager::tr("Insert Bookmark"));
@@ -377,7 +376,7 @@ InsertBookmarksCommand::InsertBookmarksCommand(BookmarksManager *m_bookmarkManag
 }
 
 ChangeBookmarkCommand::ChangeBookmarkCommand(BookmarksManager *m_bookmarkManagaer, BookmarkNode *node,
-                        const QString &newValue, bool title)
+        const QString &newValue, bool title)
     : QUndoCommand()
     , m_bookmarkManagaer(m_bookmarkManagaer)
     , m_title(title)
@@ -399,7 +398,7 @@ void ChangeBookmarkCommand::undo()
         m_node->title = m_oldValue;
     else
         m_node->url = m_oldValue;
-    emit m_bookmarkManagaer->entryChanged(m_node);
+    Q_EMIT m_bookmarkManagaer->entryChanged(m_node);
 }
 
 void ChangeBookmarkCommand::redo()
@@ -408,6 +407,6 @@ void ChangeBookmarkCommand::redo()
         m_node->title = m_newValue;
     else
         m_node->url = m_newValue;
-    emit m_bookmarkManagaer->entryChanged(m_node);
+    Q_EMIT m_bookmarkManagaer->entryChanged(m_node);
 }
 
diff --git a/src/bookmarks/bookmarksmanager.h b/src/bookmarks/bookmarksmanager.h
index 63d90021..2ecf8c51 100644
--- a/src/bookmarks/bookmarksmanager.h
+++ b/src/bookmarks/bookmarksmanager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #ifndef BOOKMARKSMANAGER_H
 #define BOOKMARKSMANAGER_H
 
-#include <qobject.h>
+#include <QObject>
 
 #include <qundostack.h>
 
@@ -33,13 +33,13 @@ class BookmarksManager : public QObject
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void entryAdded(BookmarkNode *item);
     void entryRemoved(BookmarkNode *parent, int row, BookmarkNode *item);
     void entryChanged(BookmarkNode *item);
 
 public:
-    BookmarksManager(QObject *parent = 0);
+    BookmarksManager(QObject *parent = nullptr);
     ~BookmarksManager();
 
     void addBookmark(BookmarkNode *parent, BookmarkNode *node, int row = -1);
@@ -58,11 +58,11 @@ class BookmarksManager : public QObject
         return &m_commands;
     }
 
-public slots:
+public Q_SLOTS:
     void importBookmarks();
     void exportBookmarks();
 
-private slots:
+private Q_SLOTS:
     void save() const;
 
 private:
diff --git a/src/bookmarks/bookmarksmenu.cpp b/src/bookmarks/bookmarksmenu.cpp
index af09382d..0d8bb530 100644
--- a/src/bookmarks/bookmarksmenu.cpp
+++ b/src/bookmarks/bookmarksmenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,7 +65,13 @@
 #include "bookmarknode.h"
 #include "bookmarksmanager.h"
 #include "bookmarksmodel.h"
+#ifndef NO_BROWSERAPPLICATION
 #include "browserapplication.h"
+#else
+#ifdef FOR_AUTOTEST
+#include "tst_addbookmarkdialog.h"
+#endif
+#endif
 
 BookmarksMenu::BookmarksMenu(QWidget *parent)
     : ModelMenu(parent)
@@ -86,7 +92,7 @@ ModelMenu *BookmarksMenu::createBaseMenu()
 
 void BookmarksMenu::activated(const QModelIndex &index)
 {
-    emit openUrl(index.data(BookmarksModel::UrlRole).toUrl(),
+    Q_EMIT openUrl(index.data(BookmarksModel::UrlRole).toUrl(),
                  index.data(Qt::DisplayRole).toString());
 }
 
@@ -133,7 +139,7 @@ void BookmarksMenu::openAll()
 
         TabWidget::OpenUrlIn tab;
         tab = (i == 0) ? TabWidget::CurrentTab : TabWidget::NewTab;
-        emit openUrl(child.data(BookmarksModel::UrlRole).toUrl(),
+        Q_EMIT openUrl(child.data(BookmarksModel::UrlRole).toUrl(),
                      tab,
                      child.data(Qt::DisplayRole).toString());
     }
@@ -141,13 +147,21 @@ void BookmarksMenu::openAll()
 
 BookmarksMenuBarMenu::BookmarksMenuBarMenu(QWidget *parent)
     : BookmarksMenu(parent)
-    , m_bookmarksManager(0)
+    , m_bookmarksManager(nullptr)
 {
 }
 
 bool BookmarksMenuBarMenu::prePopulated()
 {
+#ifndef NO_BROWSERAPPLICATION
     m_bookmarksManager = BrowserApplication::bookmarksManager();
+#else
+#ifdef FOR_AUTOTEST
+    m_bookmarksManager = tst_AddBookmarkDialog::bookmarksManager();
+#else
+#error "Nothing provides a bookmarksmanager"
+#endif
+#endif
     setModel(m_bookmarksManager->bookmarksModel());
     setRootIndex(m_bookmarksManager->bookmarksModel()->index(m_bookmarksManager->menu()));
     // initial actions
diff --git a/src/bookmarks/bookmarksmenu.h b/src/bookmarks/bookmarksmenu.h
index 9513e923..7074bf30 100644
--- a/src/bookmarks/bookmarksmenu.h
+++ b/src/bookmarks/bookmarksmenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -67,8 +67,8 @@
 
 #include "tabwidget.h"
 
-#include <qabstractitemmodel.h>
-#include <qlist.h>
+#include <QAbstractItemModel>
+#include <QList>
 
 class BookmarksManager;
 
@@ -77,18 +77,18 @@ class BookmarksMenu : public ModelMenu
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void openUrl(const QUrl &url, const QString &title);
     void openUrl(const QUrl &url, TabWidget::OpenUrlIn tab, const QString &title);
 
 public:
-    BookmarksMenu(QWidget *parent = 0);
+    BookmarksMenu(QWidget *parent = nullptr);
 
 protected:
     void postPopulated();
     ModelMenu *createBaseMenu();
 
-private slots:
+private Q_SLOTS:
     void openAll();
     void activated(const QModelIndex &index);
 
@@ -100,7 +100,7 @@ class BookmarksMenuBarMenu : public BookmarksMenu
     Q_OBJECT
 
 public:
-    BookmarksMenuBarMenu(QWidget *parent = 0);
+    BookmarksMenuBarMenu(QWidget *parent = nullptr);
     void setInitialActions(QList<QAction*> actions);
 
 protected:
diff --git a/src/bookmarks/bookmarksmodel.cpp b/src/bookmarks/bookmarksmodel.cpp
index df5c9f8e..3150d414 100644
--- a/src/bookmarks/bookmarksmodel.cpp
+++ b/src/bookmarks/bookmarksmodel.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,12 +65,14 @@
 #include "addbookmarkdialog.h"
 #include "bookmarknode.h"
 #include "bookmarksmanager.h"
+#ifndef NO_BROWSERAPPLICATION
 #include "browserapplication.h"
+#endif
 #include "xbelreader.h"
 #include "xbelwriter.h"
 
 #include <qbuffer.h>
-#include <qevent.h>
+#include <QEvent>
 #include <QMimeData>
 
 
@@ -119,7 +121,7 @@ void BookmarksModel::entryRemoved(BookmarkNode *parent, int row, BookmarkNode *i
 void BookmarksModel::entryChanged(BookmarkNode *item)
 {
     QModelIndex idx = index(item);
-    emit dataChanged(idx, idx);
+    Q_EMIT dataChanged(idx, idx);
 }
 
 bool BookmarksModel::removeRows(int row, int count, const QModelIndex &parent)
@@ -131,7 +133,7 @@ bool BookmarksModel::removeRows(int row, int count, const QModelIndex &parent)
     for (int i = row + count - 1; i >= row; --i) {
         BookmarkNode *node = bookmarkNode->children().at(i);
         if (node == m_bookmarksManager->menu()
-            || node == m_bookmarksManager->toolbar())
+                || node == m_bookmarksManager->toolbar())
             continue;
 
         m_bookmarksManager->removeBookmark(node);
@@ -147,8 +149,10 @@ QVariant BookmarksModel::headerData(int section, Qt::Orientation orientation, in
 {
     if (orientation == Qt::Horizontal && role == Qt::DisplayRole) {
         switch (section) {
-        case 0: return tr("Title");
-        case 1: return tr("Address");
+        case 0:
+            return tr("Title");
+        case 1:
+            return tr("Address");
         }
     }
     return QAbstractItemModel::headerData(section, orientation, role);
@@ -165,14 +169,18 @@ QVariant BookmarksModel::data(const QModelIndex &index, int role) const
     case Qt::DisplayRole:
         if (bookmarkNode->type() == BookmarkNode::Separator) {
             switch (index.column()) {
-            case 0: return QString(50, 0xB7);
-            case 1: return QString();
+            case 0:
+                return QString(50, 0xB7);
+            case 1:
+                return QString();
             }
         }
 
         switch (index.column()) {
-        case 0: return bookmarkNode->title;
-        case 1: return bookmarkNode->url;
+        case 0:
+            return bookmarkNode->title;
+        case 1:
+            return bookmarkNode->url;
         }
         break;
     case BookmarksModel::UrlRole:
@@ -191,7 +199,9 @@ QVariant BookmarksModel::data(const QModelIndex &index, int role) const
         if (index.column() == 0) {
             if (bookmarkNode->type() == BookmarkNode::Folder)
                 return QApplication::style()->standardIcon(QStyle::SP_DirIcon);
+#ifndef NO_BROWSERAPPLICATION
             return BrowserApplication::instance()->icon(bookmarkNode->url);
+#endif
         }
     }
 
@@ -231,7 +241,7 @@ QModelIndex BookmarksModel::parent(const QModelIndex &index) const
         return QModelIndex();
 
     BookmarkNode *itemNode = node(index);
-    BookmarkNode *parentNode = (itemNode ? itemNode->parent() : 0);
+    BookmarkNode *parentNode = (itemNode ? itemNode->parent() : nullptr);
     if (!parentNode || parentNode == m_bookmarksManager->bookmarks())
         return QModelIndex();
 
@@ -263,13 +273,13 @@ Qt::ItemFlags BookmarksModel::flags(const QModelIndex &index) const
         flags |= Qt::ItemIsDropEnabled;
 
     if (node == m_bookmarksManager->menu()
-        || node == m_bookmarksManager->toolbar())
+            || node == m_bookmarksManager->toolbar())
         return flags;
 
     flags |= Qt::ItemIsDragEnabled;
 
     if ((index.column() == 0 && type != BookmarkNode::Separator)
-        || (index.column() == 1 && type == BookmarkNode::Bookmark))
+            || (index.column() == 1 && type == BookmarkNode::Bookmark))
         flags |= Qt::ItemIsEditable;
 
     return flags;
@@ -280,13 +290,13 @@ Qt::DropActions BookmarksModel::supportedDropActions() const
     return Qt::CopyAction | Qt::MoveAction;
 }
 
-#define MIMETYPE QLatin1String("application/bookmarks.xbel")
+#define MIMETYPE QStringLiteral("application/bookmarks.xbel")
 
 QStringList BookmarksModel::mimeTypes() const
 {
     QStringList types;
     types << MIMETYPE;
-    types << QLatin1String("text/uri-list");
+    types << QStringLiteral("text/uri-list");
     return types;
 }
 
@@ -296,7 +306,7 @@ QMimeData *BookmarksModel::mimeData(const QModelIndexList &indexes) const
     QByteArray data;
     QDataStream stream(&data, QIODevice::WriteOnly);
     QList<QUrl> urls;
-    foreach (const QModelIndex &index, indexes) {
+    Q_FOREACH (const QModelIndex &index, indexes) {
         if (index.column() != 0 || !index.isValid())
             continue;
         QByteArray encodedData;
@@ -314,7 +324,7 @@ QMimeData *BookmarksModel::mimeData(const QModelIndexList &indexes) const
 }
 
 bool BookmarksModel::dropMimeData(const QMimeData *data,
-     Qt::DropAction action, int row, int column, const QModelIndex &parent)
+                                  Qt::DropAction action, int row, int column, const QModelIndex &parent)
 {
     if (action == Qt::IgnoreAction)
         return true;
@@ -346,7 +356,7 @@ bool BookmarksModel::dropMimeData(const QMimeData *data,
         return false;
 
     QUndoStack *undoStack = m_bookmarksManager->undoRedoStack();
-    undoStack->beginMacro(QLatin1String("Move Bookmarks"));
+    undoStack->beginMacro(QStringLiteral("Move Bookmarks"));
 
     while (!stream.atEnd()) {
         QByteArray encodedData;
diff --git a/src/bookmarks/bookmarksmodel.h b/src/bookmarks/bookmarksmodel.h
index 3960524d..3c56ab5f 100644
--- a/src/bookmarks/bookmarksmodel.h
+++ b/src/bookmarks/bookmarksmodel.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
 #ifndef BOOKMARKSMODEL_H
 #define BOOKMARKSMODEL_H
 
-#include <qabstractitemmodel.h>
+#include <QAbstractItemModel>
 
 #include <qicon.h>
 
@@ -73,7 +73,7 @@ class BookmarksModel : public QAbstractItemModel
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void entryAdded(BookmarkNode *item);
     void entryRemoved(BookmarkNode *parent, int row, BookmarkNode *item);
     void entryChanged(BookmarkNode *item);
@@ -86,7 +86,7 @@ public slots:
         SeparatorRole = Qt::UserRole + 4
     };
 
-    BookmarksModel(BookmarksManager *bookmarkManager, QObject *parent = 0);
+    BookmarksModel(BookmarksManager *bookmarkManager, QObject *parent = nullptr);
     inline BookmarksManager *bookmarksManager() const {
         return m_bookmarksManager;
     }
diff --git a/src/bookmarks/bookmarkstoolbar.cpp b/src/bookmarks/bookmarkstoolbar.cpp
index ea7d6964..791fd6a0 100644
--- a/src/bookmarks/bookmarkstoolbar.cpp
+++ b/src/bookmarks/bookmarkstoolbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,17 +25,32 @@
 #include "bookmarksmanager.h"
 #include "bookmarksmenu.h"
 #include "bookmarksmodel.h"
+#ifndef NO_BROWSERAPPLICATION
 #include "browserapplication.h"
+#else
+#ifdef FOR_AUTOTEST
+#include "tst_addbookmarkdialog.h"
+#endif
+#endif
 #include "modelmenu.h"
 
-#include <qevent.h>
+#include <QEvent>
 
 BookmarksToolBar::BookmarksToolBar(BookmarksModel *model, QWidget *parent)
     : ModelToolBar(parent)
     , m_bookmarksModel(model)
 {
     setModel(model);
+
+#ifndef NO_BROWSERAPPLICATION
     setRootIndex(model->index(BrowserApplication::bookmarksManager()->toolbar()));
+#else
+#ifdef FOR_AUTOTEST
+    setRootIndex(model->index(tst_AddBookmarkDialog::bookmarksManager()->toolbar()));
+#else
+#error "Nothing provides a bookmarksmanager"
+#endif
+#endif
 
     setContextMenuPolicy(Qt::CustomContextMenu);
     connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
@@ -57,7 +72,7 @@ void BookmarksToolBar::contextMenuRequested(const QPoint &position)
         QVariant variant = action->data();
         Q_ASSERT(variant.canConvert<QModelIndex>());
 
-        QAction *menuAction = 0;
+        QAction *menuAction = nullptr;
 
         if (!action->menu()) {
             menuAction = menu.addAction(tr("Open"), this, SLOT(openBookmarkInCurrentTab()));
@@ -85,7 +100,7 @@ void BookmarksToolBar::bookmarkActivated(const QModelIndex &index)
 {
     Q_ASSERT(index.isValid());
 
-    emit openUrl(
+    Q_EMIT openUrl(
         index.data(BookmarksModel::UrlRole).toUrl(),
         index.data(Qt::DisplayRole).toString());
 }
@@ -94,7 +109,7 @@ void BookmarksToolBar::openBookmark()
 {
     QModelIndex index = ModelToolBar::index(qobject_cast<QAction*>(sender()));
 
-    emit openUrl(
+    Q_EMIT openUrl(
         index.data(BookmarksModel::UrlRole).toUrl(),
         index.data(Qt::DisplayRole).toString());
 }
@@ -103,7 +118,7 @@ void BookmarksToolBar::openBookmarkInCurrentTab()
 {
     QModelIndex index = ModelToolBar::index(qobject_cast<QAction*>(sender()));
 
-    emit openUrl(
+    Q_EMIT openUrl(
         index.data(BookmarksModel::UrlRole).toUrl(),
         TabWidget::CurrentTab,
         index.data(Qt::DisplayRole).toString());
@@ -113,7 +128,7 @@ void BookmarksToolBar::openBookmarkInNewTab()
 {
     QModelIndex index = ModelToolBar::index(qobject_cast<QAction*>(sender()));
 
-    emit openUrl(
+    Q_EMIT openUrl(
         index.data(BookmarksModel::UrlRole).toUrl(),
         TabWidget::NewTab,
         index.data(Qt::DisplayRole).toString());
diff --git a/src/bookmarks/bookmarkstoolbar.h b/src/bookmarks/bookmarkstoolbar.h
index b18570ff..3b13667f 100644
--- a/src/bookmarks/bookmarkstoolbar.h
+++ b/src/bookmarks/bookmarkstoolbar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -25,29 +25,29 @@
 
 #include "tabwidget.h"
 
-#include <qabstractitemmodel.h>
+#include <QAbstractItemModel>
 #include <qpoint.h>
-#include <qurl.h>
+#include <QUrl>
 
 class BookmarksModel;
 class BookmarksToolBar : public ModelToolBar
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void openUrl(const QUrl &url, const QString &title);
     void openUrl(const QUrl &url, TabWidget::OpenUrlIn tab, const QString &title);
 
 public:
-    BookmarksToolBar(BookmarksModel *model, QWidget *parent = 0);
+    BookmarksToolBar(BookmarksModel *model, QWidget *parent = nullptr);
 
 protected:
     virtual ModelMenu *createMenu();
 
-private slots:
+private Q_SLOTS:
     void contextMenuRequested(const QPoint &position);
 
-protected slots:
+protected Q_SLOTS:
     void openBookmark();
     void openBookmarkInCurrentTab();
     void openBookmarkInNewTab();
diff --git a/src/bookmarks/xbel/libxbel.cmake b/src/bookmarks/xbel/libxbel.cmake
new file mode 100644
index 00000000..4d498d21
--- /dev/null
+++ b/src/bookmarks/xbel/libxbel.cmake
@@ -0,0 +1,8 @@
+set(XBEL_SRCS
+    src/bookmarks/xbel/xbelreader.cpp
+    src/bookmarks/xbel/xbelwriter.cpp
+    src/bookmarks/bookmarknode.cpp
+)
+
+add_library(xbel STATIC ${XBEL_SRCS})
+target_link_libraries(xbel Qt5::Core)
diff --git a/src/bookmarks/xbel/xbel.pri b/src/bookmarks/xbel/xbel.pri
deleted file mode 100644
index 7615d5d3..00000000
--- a/src/bookmarks/xbel/xbel.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += \
-    xbelreader.h \
-    xbelwriter.h
-
-SOURCES += \
-    xbelreader.cpp \
-    xbelwriter.cpp
diff --git a/src/bookmarks/xbel/xbelreader.cpp b/src/bookmarks/xbel/xbelreader.cpp
index 5c9818f0..cada9fc9 100644
--- a/src/bookmarks/xbel/xbelreader.cpp
+++ b/src/bookmarks/xbel/xbelreader.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,20 +62,20 @@
 
 #include "xbelreader.h"
 
-#include <qfile.h>
+#include <QFile>
 
 #include "bookmarknode.h"
 
 QString XmlEntityResolver::resolveUndeclaredEntity(const QString &entity)
 {
-    if (entity == QLatin1String("nbsp"))
-        return QLatin1String(" ");
+    if (entity == QStringLiteral("nbsp"))
+        return QStringLiteral(" ");
 
     return QString();
 }
 
 XbelReader::XbelReader()
-    : m_entityResolver(0)
+    : m_entityResolver(nullptr)
 {
     m_entityResolver = new XmlEntityResolver();
     setEntityResolver(m_entityResolver);
@@ -103,9 +103,9 @@ BookmarkNode *XbelReader::read(QIODevice *device)
     while (!atEnd()) {
         readNext();
         if (isStartElement()) {
-            QString version = attributes().value(QLatin1String("version")).toString();
-            if (name() == QLatin1String("xbel")
-                && (version.isEmpty() || version == QLatin1String("1.0"))) {
+            QString version = attributes().value(QStringLiteral("version")).toString();
+            if (name().toString() == QStringLiteral("xbel")
+                    && (version.isEmpty() || version == QStringLiteral("1.0"))) {
                 readXBEL(root);
             } else {
                 raiseError(QObject::tr("The file is not an XBEL version 1.0 file."));
@@ -117,7 +117,7 @@ BookmarkNode *XbelReader::read(QIODevice *device)
 
 void XbelReader::readXBEL(BookmarkNode *parent)
 {
-    Q_ASSERT(isStartElement() && name() == QLatin1String("xbel"));
+    Q_ASSERT(isStartElement() && name() == QStringLiteral("xbel"));
 
     while (!atEnd()) {
         readNext();
@@ -125,11 +125,11 @@ void XbelReader::readXBEL(BookmarkNode *parent)
             break;
 
         if (isStartElement()) {
-            if (name() == QLatin1String("folder"))
+            if (name().toString() == QStringLiteral("folder"))
                 readFolder(parent);
-            else if (name() == QLatin1String("bookmark"))
+            else if (name().toString() == QStringLiteral("bookmark"))
                 readBookmarkNode(parent);
-            else if (name() == QLatin1String("separator"))
+            else if (name().toString() == QStringLiteral("separator"))
                 readSeparator(parent);
             else
                 skipUnknownElement();
@@ -139,10 +139,10 @@ void XbelReader::readXBEL(BookmarkNode *parent)
 
 void XbelReader::readFolder(BookmarkNode *parent)
 {
-    Q_ASSERT(isStartElement() && name() == QLatin1String("folder"));
+    Q_ASSERT(isStartElement() && name().toString() == QStringLiteral("folder"));
 
     BookmarkNode *folder = new BookmarkNode(BookmarkNode::Folder, parent);
-    folder->expanded = (attributes().value(QLatin1String("folded")) == QLatin1String("no"));
+    folder->expanded = (attributes().value(QStringLiteral("folded")) == QStringLiteral("no"));
 
     while (!atEnd()) {
         readNext();
@@ -151,15 +151,15 @@ void XbelReader::readFolder(BookmarkNode *parent)
             break;
 
         if (isStartElement()) {
-            if (name() == QLatin1String("title"))
+            if (name().toString() == QStringLiteral("title"))
                 readTitle(folder);
-            else if (name() == QLatin1String("desc"))
+            else if (name().toString() == QStringLiteral("desc"))
                 readDescription(folder);
-            else if (name() == QLatin1String("folder"))
+            else if (name().toString() == QStringLiteral("folder"))
                 readFolder(folder);
-            else if (name() == QLatin1String("bookmark"))
+            else if (name().toString() == QStringLiteral("bookmark"))
                 readBookmarkNode(folder);
-            else if (name() == QLatin1String("separator"))
+            else if (name().toString() == QStringLiteral("separator"))
                 readSeparator(folder);
             else
                 skipUnknownElement();
@@ -169,13 +169,13 @@ void XbelReader::readFolder(BookmarkNode *parent)
 
 void XbelReader::readTitle(BookmarkNode *parent)
 {
-    Q_ASSERT(isStartElement() && name() == QLatin1String("title"));
+    Q_ASSERT(isStartElement() && name().toString() == QStringLiteral("title"));
     parent->title = readElementText();
 }
 
 void XbelReader::readDescription(BookmarkNode *parent)
 {
-    Q_ASSERT(isStartElement() && name() == QLatin1String("desc"));
+    Q_ASSERT(isStartElement() && name().toString() == QStringLiteral("desc"));
     parent->desc = readElementText();
 }
 
@@ -188,18 +188,18 @@ void XbelReader::readSeparator(BookmarkNode *parent)
 
 void XbelReader::readBookmarkNode(BookmarkNode *parent)
 {
-    Q_ASSERT(isStartElement() && name() == QLatin1String("bookmark"));
+    Q_ASSERT(isStartElement() && name().toString() == QStringLiteral("bookmark"));
     BookmarkNode *bookmark = new BookmarkNode(BookmarkNode::Bookmark, parent);
-    bookmark->url = attributes().value(QLatin1String("href")).toString();
+    bookmark->url = attributes().value(QStringLiteral("href")).toString();
     while (!atEnd()) {
         readNext();
         if (isEndElement())
             break;
 
         if (isStartElement()) {
-            if (name() == QLatin1String("title"))
+            if (name().toString() == QStringLiteral("title"))
                 readTitle(bookmark);
-            else if (name() == QLatin1String("desc"))
+            else if (name().toString() == QStringLiteral("desc"))
                 readDescription(bookmark);
             else
                 skipUnknownElement();
diff --git a/src/bookmarks/xbel/xbelreader.h b/src/bookmarks/xbel/xbelreader.h
index 43fb31a7..c54b53ca 100644
--- a/src/bookmarks/xbel/xbelreader.h
+++ b/src/bookmarks/xbel/xbelreader.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,8 +63,9 @@
 #ifndef XBELREADER_H
 #define XBELREADER_H
 
-#include <qxmlstream.h>
-#include <qdatetime.h>
+#include <QXmlStreamReader>
+#include <QXmlStreamEntityResolver>
+#include <QDateTime>
 
 class BookmarkNode;
 class XmlEntityResolver : public QXmlStreamEntityResolver
diff --git a/src/bookmarks/xbel/xbelwriter.cpp b/src/bookmarks/xbel/xbelwriter.cpp
index c81cee6f..cb2c0dd8 100644
--- a/src/bookmarks/xbel/xbelwriter.cpp
+++ b/src/bookmarks/xbel/xbelwriter.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@
 
 #include "xbelwriter.h"
 
-#include <qfile.h>
+#include <QFile>
 
 #include "bookmarknode.h"
 
@@ -84,9 +84,9 @@ bool XbelWriter::write(QIODevice *device, const BookmarkNode *root)
     setDevice(device);
 
     writeStartDocument();
-    writeDTD(QLatin1String("<!DOCTYPE xbel>"));
-    writeStartElement(QLatin1String("xbel"));
-    writeAttribute(QLatin1String("version"), QLatin1String("1.0"));
+    writeDTD(QStringLiteral("<!DOCTYPE xbel>"));
+    writeStartElement(QStringLiteral("xbel"));
+    writeAttribute(QStringLiteral("version"), QStringLiteral("1.0"));
     if (root->type() == BookmarkNode::Root) {
         for (int i = 0; i < root->children().count(); ++i)
             writeItem(root->children().at(i));
@@ -102,24 +102,24 @@ void XbelWriter::writeItem(const BookmarkNode *parent)
 {
     switch (parent->type()) {
     case BookmarkNode::Folder:
-        writeStartElement(QLatin1String("folder"));
-        writeAttribute(QLatin1String("folded"), parent->expanded ? QLatin1String("no") : QLatin1String("yes"));
-        writeTextElement(QLatin1String("title"), parent->title);
+        writeStartElement(QStringLiteral("folder"));
+        writeAttribute(QStringLiteral("folded"), parent->expanded ? QStringLiteral("no") : QStringLiteral("yes"));
+        writeTextElement(QStringLiteral("title"), parent->title);
         for (int i = 0; i < parent->children().count(); ++i)
             writeItem(parent->children().at(i));
         writeEndElement();
         break;
     case BookmarkNode::Bookmark:
-        writeStartElement(QLatin1String("bookmark"));
+        writeStartElement(QStringLiteral("bookmark"));
         if (!parent->url.isEmpty())
-            writeAttribute(QLatin1String("href"), parent->url);
-        writeTextElement(QLatin1String("title"), parent->title);
+            writeAttribute(QStringLiteral("href"), parent->url);
+        writeTextElement(QStringLiteral("title"), parent->title);
         if (!parent->desc.isEmpty())
-            writeAttribute(QLatin1String("desc"), parent->desc);
+            writeAttribute(QStringLiteral("desc"), parent->desc);
         writeEndElement();
         break;
     case BookmarkNode::Separator:
-        writeEmptyElement(QLatin1String("separator"));
+        writeEmptyElement(QStringLiteral("separator"));
         break;
     default:
         break;
diff --git a/src/bookmarks/xbel/xbelwriter.h b/src/bookmarks/xbel/xbelwriter.h
index 0d62ac8a..c43af16c 100644
--- a/src/bookmarks/xbel/xbelwriter.h
+++ b/src/bookmarks/xbel/xbelwriter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,8 +63,8 @@
 #ifndef XBELWRITER_H
 #define XBELWRITER_H
 
-#include <qxmlstream.h>
-#include <qdatetime.h>
+#include <QXmlStreamWriter>
+#include <QDateTime>
 
 class BookmarkNode;
 class XbelWriter : public QXmlStreamWriter
diff --git a/src/browserapplication.cpp b/src/browserapplication.cpp
index 6f0771f7..15946a51 100644
--- a/src/browserapplication.cpp
+++ b/src/browserapplication.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -59,32 +59,79 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 
 #include "browserapplication.h"
 
 #include "autosaver.h"
-#include "autofillmanager.h"
 #include "bookmarksmanager.h"
 #include "browsermainwindow.h"
-#include "cookiejar.h"
 #include "downloadmanager.h"
 #include "historymanager.h"
 #include "languagemanager.h"
-#include "networkaccessmanager.h"
 #include "tabwidget.h"
 #include "webview.h"
 
-#include <qbuffer.h>
-#include <qdesktopservices.h>
-#include <qdir.h>
-#include <qevent.h>
-#include <qlibraryinfo.h>
-#include <qlocalsocket.h>
-#include <qmessagebox.h>
-#include <qsettings.h>
-#include <qwebsettings.h>
+#include <QBuffer>
+#include <QDesktopServices>
+#include <QDir>
+#include <QEvent>
+#include <QLibraryInfo>
+#include <QLocalSocket>
+#include <QMessageBox>
+#include <QSettings>
+#include <QWebEngineSettings>
+#include <QWebEngineProfile>
 
-#include <qdebug.h>
+#include <QDebug>
 
 #ifdef Q_OS_WIN
 #include <windows.h>
@@ -92,24 +139,60 @@
 
 // #define BROWSERAPPLICATION_DEBUG
 
-DownloadManager *BrowserApplication::s_downloadManager = 0;
-HistoryManager *BrowserApplication::s_historyManager = 0;
-NetworkAccessManager *BrowserApplication::s_networkAccessManager = 0;
-BookmarksManager *BrowserApplication::s_bookmarksManager = 0;
-LanguageManager *BrowserApplication::s_languageManager = 0;
-AutoFillManager *BrowserApplication::s_autoFillManager = 0;
+DownloadManager *BrowserApplication::s_downloadManager = nullptr;
+HistoryManager *BrowserApplication::s_historyManager = nullptr;
+BookmarksManager *BrowserApplication::s_bookmarksManager = nullptr;
+LanguageManager *BrowserApplication::s_languageManager = nullptr;
+
+
+static void setUserStyleSheet(QWebEngineProfile *profile, const QString &styleSheet, BrowserMainWindow *mainWindow = nullptr)
+{
+    Q_ASSERT(profile);
+    QString scriptName(QStringLiteral("userStyleSheet"));
+    QWebEngineScript script;
+    QList<QWebEngineScript> styleSheets = profile->scripts()->findScripts(scriptName);
+    if (!styleSheets.isEmpty())
+        script = styleSheets.first();
+    Q_FOREACH (const QWebEngineScript &s, styleSheets)
+        profile->scripts()->remove(s);
+
+    if (script.isNull()) {
+        script.setName(scriptName);
+        script.setInjectionPoint(QWebEngineScript::DocumentReady);
+        script.setRunsOnSubFrames(true);
+        script.setWorldId(QWebEngineScript::ApplicationWorld);
+    }
+    QString source = QString::fromLatin1("(function() {"\
+                                         "var css = document.getElementById(\"_qt_testBrowser_userStyleSheet\");"\
+                                         "if (css == undefined) {"\
+                                         "    css = document.createElement(\"style\");"\
+                                         "    css.type = \"text/css\";"\
+                                         "    css.id = \"_qt_testBrowser_userStyleSheet\";"\
+                                         "    document.head.appendChild(css);"\
+                                         "}"\
+                                         "css.innerText = \"%1\";"\
+                                         "})()").arg(styleSheet);
+    script.setSourceCode(source);
+    profile->scripts()->insert(script);
+    // run the script on the already loaded views
+    // this has to be deferred as it could mess with the storage initialization on startup
+    if (mainWindow)
+        QMetaObject::invokeMethod(mainWindow, "runScriptOnOpenViews", Qt::QueuedConnection, Q_ARG(QString, source));
+}
 
 BrowserApplication::BrowserApplication(int &argc, char **argv)
     : SingleApplication(argc, argv)
     , quitting(false)
+    , m_privateProfile(0)
+    , m_privateBrowsing(false)
 {
-    QCoreApplication::setOrganizationDomain(QLatin1String("aarondewes.github.io/endorphin/"));
-    QCoreApplication::setApplicationName(QLatin1String("Endorphin"));
-    QCoreApplication::setApplicationVersion(QLatin1String("0.12.1"
+    QCoreApplication::setOrganizationDomain(QStringLiteral("EndorphinBrowser.gitlab.io/"));
+    QCoreApplication::setApplicationName(QStringLiteral("Endorphin"));
+    QCoreApplication::setApplicationVersion(QStringLiteral("0.12.1"
 #ifdef GITVERSION
-    " (Git: " GITCHANGENUMBER " " GITVERSION ")"
+                                            " (Git: " GITCHANGENUMBER " " GITVERSION ")"
 #endif
-    ));
+                                                         ));
 
 #ifndef AUTOTESTS
     connect(this, SIGNAL(messageReceived(QLocalSocket *)),
@@ -121,7 +204,7 @@ BrowserApplication::BrowserApplication(int &argc, char **argv)
         sendMessage(message.toUtf8());
     }
     // If we could connect to another Endorphin then exit
-    QString message = QString(QLatin1String("endorphin://getwinid"));
+    QString message = QString(QStringLiteral("endorphin://getwinid"));
     if (sendMessage(message.toUtf8(), 500))
         return;
 
@@ -140,25 +223,25 @@ BrowserApplication::BrowserApplication(int &argc, char **argv)
     QApplication::setQuitOnLastWindowClosed(true);
 #endif
 
-    QDesktopServices::setUrlHandler(QLatin1String("http"), this, "openUrl");
+    QDesktopServices::setUrlHandler(QStringLiteral("http"), this, "openUrl");
 
-    // Until QtWebkit defaults to 16
-    QWebSettings::globalSettings()->setFontSize(QWebSettings::DefaultFontSize, 16);
-    QWebSettings::globalSettings()->setFontSize(QWebSettings::DefaultFixedFontSize, 16);
+    // Until QtWebEngine defaults to 16
+    QWebEngineSettings::globalSettings()->setFontSize(QWebEngineSettings::DefaultFontSize, 16);
+    QWebEngineSettings::globalSettings()->setFontSize(QWebEngineSettings::DefaultFixedFontSize, 16);
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("sessions"));
-    m_lastSession = settings.value(QLatin1String("lastSession")).toByteArray();
+    settings.beginGroup(QStringLiteral("sessions"));
+    m_lastSession = settings.value(QStringLiteral("lastSession")).toByteArray();
     settings.endGroup();
 
 #if defined(Q_WS_MAC)
-    connect(this, SIGNAL(lastWindowClosed()),
-            this, SLOT(lastWindowClosed()));
+    connect(this, &BrowserApplication::lastWindowClosed,
+            this, &BrowserApplication::lastWindowClosed);
 #endif
 
     // setting this in the postLaunch actually takes a lot more time
     // because the event has to be propagated to everyone.
-    setWindowIcon(QIcon(QLatin1String(":128x128/endorphin.png")));
+    setWindowIcon(QIcon(QStringLiteral(":128x128/endorphin.png")));
 
 #ifndef AUTOTESTS
     QTimer::singleShot(0, this, SLOT(postLaunch()));
@@ -171,18 +254,16 @@ BrowserApplication::~BrowserApplication()
     quitting = true;
     delete s_downloadManager;
     qDeleteAll(m_mainWindows);
-    delete s_networkAccessManager;
     delete s_bookmarksManager;
     delete s_languageManager;
     delete s_historyManager;
-    delete s_autoFillManager;
 }
 
 #if defined(Q_WS_MAC)
 void BrowserApplication::lastWindowClosed()
 {
     clean();
-    BrowserMainWindow *mw = new BrowserMainWindow;
+    BrowserMainWindow *mw = new BrowserMainWindow(nullptr, nullptr, QWebEngineProfile::defaultProfile());
     mw->goHome();
     m_mainWindows.prepend(mw);
 }
@@ -196,7 +277,6 @@ BrowserApplication *BrowserApplication::instance()
 void BrowserApplication::retranslate()
 {
     bookmarksManager()->retranslate();
-    networkAccessManager()->loadSettings();
 }
 
 // The only special property of an argument url is that the file's
@@ -222,10 +302,10 @@ void BrowserApplication::messageReceived(QLocalSocket *socket)
         return;
 
     // Got a normal url
-    if (!message.startsWith(QLatin1String("endorphin://"))) {
+    if (!message.startsWith(QStringLiteral("endorphin://"))) {
         QSettings settings;
-        settings.beginGroup(QLatin1String("tabs"));
-        TabWidget::OpenUrlIn tab = TabWidget::OpenUrlIn(settings.value(QLatin1String("openLinksFromAppsIn"), TabWidget::NewSelectedTab).toInt());
+        settings.beginGroup(QStringLiteral("tabs"));
+        TabWidget::OpenUrlIn tab = TabWidget::OpenUrlIn(settings.value(QStringLiteral("openLinksFromAppsIn"), TabWidget::NewSelectedTab).toInt());
         settings.endGroup();
         if (QUrl(message) == m_lastAskedUrl
                 && m_lastAskedUrlDateTime.addSecs(10) > QDateTime::currentDateTime()) {
@@ -235,40 +315,40 @@ void BrowserApplication::messageReceived(QLocalSocket *socket)
         mainWindow()->tabWidget()->loadString(message, tab);
         return;
     } else {
-        if (message.startsWith(QLatin1String("endorphin://getwinid"))) {
-        #ifdef Q_OS_WIN
-            QString winid = QString(QLatin1String("%1")).arg((qlonglong)mainWindow()->winId());
-        #else
+        if (message.startsWith(QStringLiteral("endorphin://getwinid"))) {
+#ifdef Q_OS_WIN
+            QString winid = QString(QStringLiteral("%1")).arg((qlonglong)mainWindow()->winId());
+#else
             mainWindow()->show();
             mainWindow()->setFocus();
             mainWindow()->raise();
             mainWindow()->activateWindow();
             alert(mainWindow());
             QString winid;
-        #endif
-        #ifdef BROWSERAPPLICATION_DEBUG
+#endif
+#ifdef BROWSERAPPLICATION_DEBUG
             qDebug() << "BrowserApplication::" << __FUNCTION__ << "sending win id" << winid << mainWindow()->winId();
-        #endif
-            QString message = QLatin1String("endorphin://winid/") + winid;
+#endif
+            QString message = QStringLiteral("endorphin://winid/") + winid;
             socket->write(message.toUtf8());
             socket->waitForBytesWritten();
             return;
-	}
+        }
 
-       if (message.startsWith(QLatin1String("endorphin://winid"))) {
+        if (message.startsWith(QStringLiteral("endorphin://winid"))) {
             QString winid = message.mid(21);
-        #ifdef BROWSERAPPLICATION_DEBUG
+#ifdef BROWSERAPPLICATION_DEBUG
             qDebug() << "BrowserApplication::" << __FUNCTION__ << "got win id:" << winid;
-        #endif
-        #ifdef Q_OS_WIN
+#endif
+#ifdef Q_OS_WIN
             WId wid = (WId)winid.toLongLong();
             SetForegroundWindow(wid);
-        #endif
+#endif
             return;
         }
         QSettings settings;
-        settings.beginGroup(QLatin1String("tabs"));
-        TabWidget::OpenUrlIn tab = TabWidget::OpenUrlIn(settings.value(QLatin1String("openLinksFromAppsIn"), TabWidget::NewSelectedTab).toInt());
+        settings.beginGroup(QStringLiteral("tabs"));
+        TabWidget::OpenUrlIn tab = TabWidget::OpenUrlIn(settings.value(QStringLiteral("openLinksFromAppsIn"), TabWidget::NewSelectedTab).toInt());
         settings.endGroup();
         if (QUrl(message) == m_lastAskedUrl
                 && m_lastAskedUrlDateTime.addSecs(10) > QDateTime::currentDateTime()) {
@@ -285,7 +365,7 @@ void BrowserApplication::quitBrowser()
     if (s_downloadManager && !downloadManager()->allowQuit())
         return;
 
-    if (QSettings().value(QLatin1String("tabs/confirmClosingMultipleTabs"), true).toBool()) {
+    if (QSettings().value(QStringLiteral("tabs/confirmClosingMultipleTabs"), true).toBool()) {
         clean();
         int tabCount = 0;
         for (int i = 0; i < m_mainWindows.count(); ++i) {
@@ -296,10 +376,10 @@ void BrowserApplication::quitBrowser()
             QWidget *widget = mainWindow();
             QApplication::alert(widget);
             int ret = QMessageBox::warning(widget, QString(),
-                               tr("There are %1 windows and %2 tabs open\n"
-                                  "Do you want to quit anyway?").arg(m_mainWindows.count()).arg(tabCount),
-                               QMessageBox::Yes | QMessageBox::No,
-                               QMessageBox::No);
+                                           tr("There are %1 windows and %2 tabs open\n"
+                                              "Do you want to quit anyway?").arg(m_mainWindows.count()).arg(tabCount),
+                                           QMessageBox::Yes | QMessageBox::No,
+                                           QMessageBox::No);
             if (ret == QMessageBox::No)
                 return;
         }
@@ -316,16 +396,16 @@ void BrowserApplication::postLaunch()
 {
     QString directory = QStandardPaths::writableLocation(QStandardPaths::CacheLocation);
     if (directory.isEmpty())
-        directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
-    QWebSettings::setIconDatabasePath(directory);
+        directory = QDir::homePath() + QStringLiteral("/.") + QCoreApplication::applicationName();
+    // QWebEngineSettings::setIconDatabasePath(directory);
 
     loadSettings();
 
     // newMainWindow() needs to be called in main() for this to happen
     if (m_mainWindows.count() > 0) {
         QSettings settings;
-        settings.beginGroup(QLatin1String("MainWindow"));
-        int startup = settings.value(QLatin1String("startupBehavior")).toInt();
+        settings.beginGroup(QStringLiteral("MainWindow"));
+        int startup = settings.value(QStringLiteral("startupBehavior")).toInt();
         QStringList args = QCoreApplication::arguments();
 
         if (args.count() > 1) {
@@ -359,39 +439,38 @@ void BrowserApplication::postLaunch()
 void BrowserApplication::loadSettings()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("websettings"));
+    settings.beginGroup(QStringLiteral("websettings"));
 
-    QWebSettings *defaultSettings = QWebSettings::globalSettings();
-    QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont);
-    int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize);
+    QWebEngineSettings *defaultSettings = QWebEngineSettings::globalSettings();
+    QWebEngineProfile *defaultProfile = QWebEngineProfile::defaultProfile();
+    QString standardFontFamily = defaultSettings->fontFamily(QWebEngineSettings::StandardFont);
+    int standardFontSize = defaultSettings->fontSize(QWebEngineSettings::DefaultFontSize);
     QFont standardFont = QFont(standardFontFamily, standardFontSize);
-    standardFont = settings.value(QLatin1String("standardFont"), standardFont).value<QFont>();
-    defaultSettings->setFontFamily(QWebSettings::StandardFont, standardFont.family());
-    defaultSettings->setFontSize(QWebSettings::DefaultFontSize, standardFont.pointSize());
-    int minimumFontSize = settings.value(QLatin1String("minimumFontSize"),
-                defaultSettings->fontSize(QWebSettings::MinimumFontSize)).toInt();
-    defaultSettings->setFontSize(QWebSettings::MinimumFontSize, minimumFontSize);
-
-    QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont);
-    int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize);
+    standardFont = settings.value(QStringLiteral("standardFont"), standardFont).value<QFont>();
+    defaultSettings->setFontFamily(QWebEngineSettings::StandardFont, standardFont.family());
+    defaultSettings->setFontSize(QWebEngineSettings::DefaultFontSize, standardFont.pointSize());
+    int minimumFontSize = settings.value(QStringLiteral("minimumFontSize"),
+                                         defaultSettings->fontSize(QWebEngineSettings::MinimumFontSize)).toInt();
+    defaultSettings->setFontSize(QWebEngineSettings::MinimumFontSize, minimumFontSize);
+
+    QString fixedFontFamily = defaultSettings->fontFamily(QWebEngineSettings::FixedFont);
+    int fixedFontSize = defaultSettings->fontSize(QWebEngineSettings::DefaultFixedFontSize);
     QFont fixedFont = QFont(fixedFontFamily, fixedFontSize);
-    fixedFont = settings.value(QLatin1String("fixedFont"), fixedFont).value<QFont>();
-    defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family());
-    defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fixedFont.pointSize());
+    fixedFont = settings.value(QStringLiteral("fixedFont"), fixedFont).value<QFont>();
+    defaultSettings->setFontFamily(QWebEngineSettings::FixedFont, fixedFont.family());
+    defaultSettings->setFontSize(QWebEngineSettings::DefaultFixedFontSize, fixedFont.pointSize());
 
-    defaultSettings->setAttribute(QWebSettings::JavascriptCanOpenWindows, !(settings.value(QLatin1String("blockPopupWindows"), true).toBool()));
-    defaultSettings->setAttribute(QWebSettings::JavascriptEnabled, settings.value(QLatin1String("enableJavascript"), true).toBool());
-    defaultSettings->setAttribute(QWebSettings::PluginsEnabled, settings.value(QLatin1String("enablePlugins"), true).toBool());
-    defaultSettings->setAttribute(QWebSettings::AutoLoadImages, settings.value(QLatin1String("enableImages"), true).toBool());
-    defaultSettings->setAttribute(QWebSettings::LocalStorageEnabled, settings.value(QLatin1String("enableLocalStorage"), true).toBool());
-    defaultSettings->setAttribute(QWebSettings::DeveloperExtrasEnabled, settings.value(QLatin1String("enableInspector"), false).toBool());
-    defaultSettings->setAttribute(QWebSettings::DnsPrefetchEnabled, true);
+    defaultSettings->setAttribute(QWebEngineSettings::JavascriptCanOpenWindows, !(settings.value(QStringLiteral("blockPopupWindows"), true).toBool()));
+    defaultSettings->setAttribute(QWebEngineSettings::JavascriptEnabled, settings.value(QStringLiteral("enableJavascript"), true).toBool());
+    defaultSettings->setAttribute(QWebEngineSettings::AutoLoadImages, settings.value(QStringLiteral("enableImages"), true).toBool());
+    defaultSettings->setAttribute(QWebEngineSettings::LocalStorageEnabled, settings.value(QStringLiteral("enableLocalStorage"), true).toBool());
+    defaultSettings->setAttribute(QWebEngineSettings::DnsPrefetchEnabled, true);
 
-    QUrl url = settings.value(QLatin1String("userStyleSheet")).toUrl();
-    defaultSettings->setUserStyleSheetUrl(url);
+    QString css = settings.value(QStringLiteral("userStyleSheet")).toString();
+    setUserStyleSheet(defaultProfile, css, mainWindow());
 
-    int maximumPagesInCache = settings.value(QLatin1String("maximumPagesInCache"), 3).toInt();
-    QWebSettings::globalSettings()->setMaximumPagesInCache(maximumPagesInCache);
+//    int maximumPagesInCache = settings.value(QStringLiteral("maximumPagesInCache"), 3).toInt();
+//    QWebEngineSettings::globalSettings()->setMaximumPagesInCache(maximumPagesInCache);
 
     settings.endGroup();
 }
@@ -432,17 +511,16 @@ void BrowserApplication::saveSession()
     if (quitting)
         return;
     QSettings settings;
-    settings.beginGroup(QLatin1String("MainWindow"));
-    settings.setValue(QLatin1String("restoring"), false);
+    settings.beginGroup(QStringLiteral("MainWindow"));
+    settings.setValue(QStringLiteral("restoring"), false);
     settings.endGroup();
 
-    QWebSettings *globalSettings = QWebSettings::globalSettings();
-    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+    if (m_privateBrowsing)
         return;
 
     clean();
 
-    settings.beginGroup(QLatin1String("sessions"));
+    settings.beginGroup(QStringLiteral("sessions"));
 
     int version = 2;
 
@@ -457,7 +535,7 @@ void BrowserApplication::saveSession()
     stream << qint32(m_mainWindows.count());
     for (int i = 0; i < m_mainWindows.count(); ++i)
         stream << m_mainWindows.at(i)->saveState();
-    settings.setValue(QLatin1String("lastSession"), data);
+    settings.setValue(QStringLiteral("lastSession"), data);
     settings.endGroup();
 }
 
@@ -470,16 +548,16 @@ bool BrowserApplication::restoreLastSession()
 {
     {
         QSettings settings;
-        settings.beginGroup(QLatin1String("MainWindow"));
-        if (settings.value(QLatin1String("restoring"), false).toBool()) {
-            QMessageBox::StandardButton result = QMessageBox::question(0, tr("Restore failed"),
-                tr("Endorphin crashed while trying to restore this session.  Should I try again?"), QMessageBox::Yes | QMessageBox::No);
+        settings.beginGroup(QStringLiteral("MainWindow"));
+        if (settings.value(QStringLiteral("restoring"), false).toBool()) {
+            QMessageBox::StandardButton result = QMessageBox::question(nullptr, tr("Restore failed"),
+                                                 tr("Endorphin crashed while trying to restore this session.  Should I try again?"), QMessageBox::Yes | QMessageBox::No);
             if (result == QMessageBox::No)
                 return false;
         }
         // saveSession will be called by an AutoSaver timer from the set tabs
         // and in saveSession we will reset this flag back to false
-        settings.setValue(QLatin1String("restoring"), true);
+        settings.setValue(QStringLiteral("restoring"), true);
     }
     int version = 2;
     QList<QByteArray> windows;
@@ -502,7 +580,7 @@ bool BrowserApplication::restoreLastSession()
         windows.append(windowState);
     }
     for (int i = 0; i < windows.count(); ++i) {
-        BrowserMainWindow *newWindow = 0;
+        BrowserMainWindow *newWindow = nullptr;
         if (i == 0 && m_mainWindows.count() >= 1) {
             newWindow = mainWindow();
         } else {
@@ -558,10 +636,10 @@ BrowserMainWindow *BrowserApplication::newMainWindow()
 {
     if (!m_mainWindows.isEmpty())
         mainWindow()->m_autoSaver->saveIfNeccessary();
-    BrowserMainWindow *browser = new BrowserMainWindow();
+    BrowserMainWindow *browser = new BrowserMainWindow(nullptr, nullptr, QWebEngineProfile::defaultProfile());
     m_mainWindows.prepend(browser);
-    connect(this, SIGNAL(privacyChanged(bool)),
-            browser, SLOT(privacyChanged(bool)));
+    connect(this, &BrowserApplication::privacyChanged,
+            this, &BrowserApplication::privacyChanged);
     browser->show();
     return browser;
 }
@@ -570,7 +648,7 @@ BrowserMainWindow *BrowserApplication::mainWindow()
 {
     clean();
 
-    BrowserMainWindow *activeWindow = 0;
+    BrowserMainWindow *activeWindow = nullptr;
 
     if (m_mainWindows.isEmpty()) {
         activeWindow = newMainWindow();
@@ -583,11 +661,6 @@ BrowserMainWindow *BrowserApplication::mainWindow()
     return activeWindow;
 }
 
-CookieJar *BrowserApplication::cookieJar()
-{
-    return (CookieJar*)networkAccessManager()->cookieJar();
-}
-
 DownloadManager *BrowserApplication::downloadManager()
 {
     if (!s_downloadManager)
@@ -595,13 +668,6 @@ DownloadManager *BrowserApplication::downloadManager()
     return s_downloadManager;
 }
 
-NetworkAccessManager *BrowserApplication::networkAccessManager()
-{
-    if (!s_networkAccessManager)
-        s_networkAccessManager = new NetworkAccessManager();
-    return s_networkAccessManager;
-}
-
 HistoryManager *BrowserApplication::historyManager()
 {
     if (!s_historyManager)
@@ -620,26 +686,19 @@ LanguageManager *BrowserApplication::languageManager()
 {
     if (!s_languageManager) {
         s_languageManager = new LanguageManager();
-        s_languageManager->addLocaleDirectory(dataFilePath(QLatin1String("locale")));
-        s_languageManager->addLocaleDirectory(qApp->applicationDirPath() + QLatin1String("/src/.qm/locale"));
-        s_languageManager->addLocaleDirectory(installedDataDirectory() + QLatin1String("/locale"));
+        s_languageManager->addLocaleDirectory(dataFilePath(QStringLiteral("locale")));
+        s_languageManager->addLocaleDirectory(qApp->applicationDirPath() + QStringLiteral("/src/.qm/locale"));
+        s_languageManager->addLocaleDirectory(installedDataDirectory() + QStringLiteral("/locale"));
+        s_languageManager->addLocaleDirectory(installedDataDirectory() + QStringLiteral("/endorphin_locale"));
         s_languageManager->loadLanguageFromSettings();
-        connect(s_languageManager, SIGNAL(languageChanged(const QString &)),
-                qApp, SLOT(retranslate()));
+        connect(s_languageManager, &LanguageManager::languageChanged,
+                BrowserApplication::instance(), &BrowserApplication::retranslate);
     }
     return s_languageManager;
 }
-
-AutoFillManager *BrowserApplication::autoFillManager()
-{
-    if (!s_autoFillManager) {
-        s_autoFillManager = new AutoFillManager;
-    }
-    return s_autoFillManager;
-}
-
 QIcon BrowserApplication::icon(const QUrl &url)
 {
+    /*
     QIcon icon = QWebSettings::iconForUrl(url);
     if (!icon.isNull())
         return icon.pixmap(16, 16);
@@ -652,12 +711,14 @@ QIcon BrowserApplication::icon(const QUrl &url)
         return pixmap;
     }
     return icon;
+    */
+    return QPixmap(":graphics/defaulticon.png");
 }
 
 QString BrowserApplication::installedDataDirectory()
 {
 #if defined(Q_WS_X11)
-    return QLatin1String(PKGDATADIR);
+    return QString(PKGDATADIR);
 #else
     return qApp->applicationDirPath();
 #endif
@@ -667,34 +728,56 @@ QString BrowserApplication::dataFilePath(const QString &fileName)
 {
     QString directory = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin";
     if (directory.isEmpty())
-        directory = QDir::homePath() + QLatin1String("/.") + QCoreApplication::applicationName();
+        directory = QDir::homePath() + QStringLiteral("/.") + QCoreApplication::applicationName();
     if (!QFile::exists(directory)) {
         QDir dir;
         dir.mkpath(directory);
     }
-    return directory + QLatin1String("/") + fileName;
+    return directory + QStringLiteral("/") + fileName;
 }
 
 bool BrowserApplication::zoomTextOnly()
 {
-    return QWebSettings::globalSettings()->testAttribute(QWebSettings::ZoomTextOnly);
+    QSettings settings;
+    settings.beginGroup(QStringLiteral("WebEngine"));
+    bool textOnly = settings.value(QStringLiteral("zoomTextOnly")).toBool();
+    settings.endGroup();
+    return textOnly;
 }
 
 void BrowserApplication::setZoomTextOnly(bool textOnly)
 {
-    QWebSettings::globalSettings()->setAttribute(QWebSettings::ZoomTextOnly, textOnly);
-    emit instance()->zoomTextOnlyChanged(textOnly);
+    QSettings settings;
+    settings.beginGroup(QStringLiteral("WebEngine"));
+    settings.setValue(QStringLiteral("zoomTextOnly"), textOnly);
+    settings.endGroup();
+    Q_EMIT instance()->zoomTextOnlyChanged(textOnly);
 }
 
 bool BrowserApplication::isPrivate()
 {
-    return QWebSettings::globalSettings()->testAttribute(QWebSettings::PrivateBrowsingEnabled);
+    return m_privateBrowsing;
 }
 
-void BrowserApplication::setPrivate(bool isPrivate)
+
+void BrowserApplication::setPrivate(bool privateBrowsing)
 {
-    QWebSettings::globalSettings()->setAttribute(QWebSettings::PrivateBrowsingEnabled, isPrivate);
-    emit instance()->privacyChanged(isPrivate);
+    if (m_privateBrowsing == privateBrowsing)
+        return;
+    m_privateBrowsing = privateBrowsing;
+    if (privateBrowsing) {
+        if (!m_privateProfile)
+            m_privateProfile = new QWebEngineProfile(this);
+        Q_FOREACH (BrowserMainWindow* window, mainWindows()) {
+            window->tabWidget()->setProfile(m_privateProfile);
+        }
+    } else {
+        Q_FOREACH (BrowserMainWindow* window, mainWindows()) {
+            window->tabWidget()->setProfile(QWebEngineProfile::defaultProfile());
+            window->tabWidget()->clear();
+        }
+    }
+    Q_EMIT privacyChanged(privateBrowsing);
 }
 
 Qt::MouseButtons BrowserApplication::eventMouseButtons() const
@@ -716,4 +799,3 @@ void BrowserApplication::setEventKeyboardModifiers(Qt::KeyboardModifiers modifie
 {
     m_eventKeyboardModifiers = modifiers;
 }
-
diff --git a/src/browserapplication.h b/src/browserapplication.h
index 3d1b4827..a060c8d1 100644
--- a/src/browserapplication.h
+++ b/src/browserapplication.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,19 +65,17 @@
 
 #include "singleapplication.h"
 
-#include <qpointer.h>
-#include <qurl.h>
-#include <qdatetime.h>
+#include <QPointer>
+#include <QUrl>
+#include <QDateTime>
 
-class AutoFillManager;
 class BookmarksManager;
 class BrowserMainWindow;
-class CookieJar;
 class DownloadManager;
 class HistoryManager;
-class NetworkAccessManager;
 class LanguageManager;
 class QLocalSocket;
+class QWebEngineProfile;
 class BrowserApplication : public SingleApplication
 {
     Q_OBJECT
@@ -98,12 +96,9 @@ class BrowserApplication : public SingleApplication
     bool canRestoreSession() const;
 
     static HistoryManager *historyManager();
-    static CookieJar *cookieJar();
     static DownloadManager *downloadManager();
-    static NetworkAccessManager *networkAccessManager();
     static BookmarksManager *bookmarksManager();
     static LanguageManager *languageManager();
-    static AutoFillManager *autoFillManager();
 
     static QString installedDataDirectory();
     static QString dataFilePath(const QString &fileName);
@@ -115,14 +110,11 @@ class BrowserApplication : public SingleApplication
 
     static bool zoomTextOnly();
 
-    static bool isPrivate();
-    static void setPrivate(bool isPrivate);
-
 #if defined(Q_WS_MAC)
     bool event(QEvent *event);
 #endif
 
-public slots:
+public Q_SLOTS:
     BrowserMainWindow *newMainWindow();
     bool restoreLastSession();
 #if defined(Q_WS_MAC)
@@ -134,13 +126,16 @@ public slots:
 
     void askDesktopToOpenUrl(const QUrl &url);
 
-private slots:
+    bool isPrivate();
+    void setPrivate(bool isPrivate);
+
+private Q_SLOTS:
     void retranslate();
     void messageReceived(QLocalSocket *socket);
     void postLaunch();
     void openUrl(const QUrl &url);
 
-signals:
+Q_SIGNALS:
     void zoomTextOnlyChanged(bool textOnly);
     void privacyChanged(bool isPrivate);
 
@@ -150,14 +145,14 @@ private slots:
 
     static HistoryManager *s_historyManager;
     static DownloadManager *s_downloadManager;
-    static NetworkAccessManager *s_networkAccessManager;
     static BookmarksManager *s_bookmarksManager;
     static LanguageManager *s_languageManager;
-    static AutoFillManager *s_autoFillManager;
 
     QList<QPointer<BrowserMainWindow> > m_mainWindows;
     QByteArray m_lastSession;
     bool quitting;
+    QWebEngineProfile *m_privateProfile;
+    bool m_privateBrowsing;
 
     Qt::MouseButtons m_eventMouseButtons;
     Qt::KeyboardModifiers m_eventKeyboardModifiers;
diff --git a/src/browsermainwindow.cpp b/src/browsermainwindow.cpp
index 84dd2afc..ac51437a 100644
--- a/src/browsermainwindow.cpp
+++ b/src/browsermainwindow.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2008 Jason A. Donenfeld <Jason@zx2c4.com>
  * Copyright 2008 Ariya Hidayat <ariya.hidayat@gmail.com>
  *
@@ -65,7 +65,6 @@
 #include "browsermainwindow.h"
 
 #include "aboutdialog.h"
-#include "adblockmanager.h"
 #include "addbookmarkdialog.h"
 #include "autosaver.h"
 #include "bookmarksdialog.h"
@@ -75,13 +74,12 @@
 #include "bookmarkstoolbar.h"
 #include "browserapplication.h"
 #include "clearprivatedata.h"
+#include "devtoolswindow.h"
 #include "downloadmanager.h"
 #include "history.h"
 #include "languagemanager.h"
-#include "networkaccessmanager.h"
 #include "opensearchdialog.h"
 #include "settings.h"
-#include "sourceviewer.h"
 #include "tabbar.h"
 #include "tabwidget.h"
 #include "toolbarsearch.h"
@@ -89,38 +87,40 @@
 #include "webview.h"
 #include "webviewsearch.h"
 
-#include <qdesktopwidget.h>
-#include <qevent.h>
-#include <qfiledialog.h>
-#include <qprintdialog.h>
-#include <qprintpreviewdialog.h>
-#include <qprinter.h>
-#include <qsettings.h>
-#include <qtextcodec.h>
-#include <qmenubar.h>
-#include <qmessagebox.h>
-#include <qstatusbar.h>
-#include <qtoolbar.h>
-#include <qinputdialog.h>
-#include <qsplitter.h>
-
-#include <qurl.h>
-#include <qwebframe.h>
-#include <qwebhistory.h>
-
-#include <qdebug.h>
-
-BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
+#include <QDesktopWidget>
+#include <QEvent>
+#include <QFileDialog>
+#include <QPrintDialog>
+#include <QPrintPreviewDialog>
+#include <QPrinter>
+#include <QSettings>
+#include <QTextCodec>
+#include <QMenuBar>
+#include <QMessageBox>
+#include <QStatusBar>
+#include <QToolBar>
+#include <QInputDialog>
+#include <QSplitter>
+#include <QCloseEvent>
+
+#include <QUrl>
+#include <QWebEngineHistory>
+#include <QWebEngineProfile>
+
+#include <QDebug>
+
+BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags, QWebEngineProfile *profile)
     : QMainWindow(parent, flags)
-    , m_navigationBar(0)
-    , m_navigationSplitter(0)
-    , m_toolbarSearch(0)
+    , m_navigationBar(nullptr)
+    , m_navigationSplitter(nullptr)
+    , m_toolbarSearch(nullptr)
 #if defined(Q_WS_MAC)
     , m_bookmarksToolbarFrame(0)
 #endif
-    , m_bookmarksToolbar(0)
-    , m_tabWidget(new TabWidget(this))
+    , m_bookmarksToolbar(nullptr)
+    , m_tabWidget(new TabWidget(this, profile))
     , m_autoSaver(new AutoSaver(this))
+    , m_profile(profile)
 {
     setAttribute(Qt::WA_DeleteOnClose, true);
     statusBar()->setSizeGripEnabled(true);
@@ -130,12 +130,12 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
     setupMenu();
     setupToolBar();
 
-    m_filePrivateBrowsingAction->setChecked(BrowserApplication::isPrivate());
+    m_filePrivateBrowsingAction->setChecked(BrowserApplication::instance()->isPrivate());
 
     QWidget *centralWidget = new QWidget(this);
     BookmarksModel *boomarksModel = BrowserApplication::bookmarksManager()->bookmarksModel();
     m_bookmarksToolbar = new BookmarksToolBar(boomarksModel, this);
-    m_bookmarksToolbar->setObjectName(QLatin1String("BookmarksToolbar"));
+    m_bookmarksToolbar->setObjectName(QStringLiteral("BookmarksToolbar"));
     connect(m_bookmarksToolbar, SIGNAL(openUrl(const QUrl&, const QString&)),
             m_tabWidget, SLOT(loadUrlFromUser(const QUrl&, const QString&)));
     connect(m_bookmarksToolbar, SIGNAL(openUrl(const QUrl&, TabWidget::OpenUrlIn, const QString&)),
@@ -192,18 +192,11 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
             m_autoSaver, SLOT(changeOccurred()));
     connect(m_tabWidget, SIGNAL(geometryChangeRequested(const QRect &)),
             this, SLOT(geometryChangeRequested(const QRect &)));
-    connect(m_tabWidget, SIGNAL(printRequested(QWebFrame *)),
-            this, SLOT(printRequested(QWebFrame *)));
-    connect(m_tabWidget, SIGNAL(menuBarVisibilityChangeRequested(bool)),
-            menuBar(), SLOT(setVisible(bool)));
-    connect(m_tabWidget, SIGNAL(statusBarVisibilityChangeRequested(bool)),
-            statusBar(), SLOT(setVisible(bool)));
-    connect(m_tabWidget, SIGNAL(toolBarVisibilityChangeRequested(bool)),
-            m_navigationBar, SLOT(setVisible(bool)));
-    connect(m_tabWidget, SIGNAL(toolBarVisibilityChangeRequested(bool)),
-            m_bookmarksToolbar, SLOT(setVisible(bool)));
+    connect(m_tabWidget, SIGNAL(printRequested()),
+            this, SLOT(printRequested()));
     connect(m_tabWidget, SIGNAL(lastTabClosed()),
             this, SLOT(lastTabClosed()));
+    connect(m_tabWidget, &TabWidget::devToolsRequested, this, &BrowserMainWindow::handleDevToolsRequested);
 
     updateWindowTitle();
     loadDefaultState();
@@ -216,7 +209,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
     // Add each item in the menu bar to the main window so
     // if the menu bar is hidden the shortcuts still work.
     QList<QAction*> actions = menuBar()->actions();
-    foreach (QAction *action, actions) {
+    Q_FOREACH (QAction *action, actions) {
         if (action->menu())
             actions += action->menu()->actions();
         addAction(action);
@@ -225,7 +218,7 @@ BrowserMainWindow::BrowserMainWindow(QWidget *parent, Qt::WindowFlags flags)
     setWindowIcon(QIcon());
 #endif
 #if defined(Q_WS_X11)
-    setWindowRole(QLatin1String("browser"));
+    setWindowRole(QStringLiteral("browser"));
 #endif
     retranslate();
 }
@@ -238,6 +231,7 @@ BrowserMainWindow::~BrowserMainWindow()
 
 void BrowserMainWindow::keyPressEvent(QKeyEvent *event)
 {
+    QSettings settings;
     switch (event->key()) {
     case Qt::Key_HomePage:
         m_historyHomeAction->trigger();
@@ -248,8 +242,12 @@ void BrowserMainWindow::keyPressEvent(QKeyEvent *event)
         event->accept();
         break;
     case Qt::Key_Search:
-        m_toolsWebSearchAction->trigger();
-        event->accept();
+        settings.beginGroup(QStringLiteral("appearance"));
+        if(settings.value(QStringLiteral("urlBarType"), 0).toInt() == 0) {
+            m_toolsWebSearchAction->trigger();
+            event->accept();
+        }
+        settings.endGroup();
         break;
     case Qt::Key_OpenUrl:
         m_fileOpenLocationAction->trigger();
@@ -277,8 +275,8 @@ BrowserMainWindow *BrowserMainWindow::parentWindow(QWidget *widget)
 void BrowserMainWindow::loadDefaultState()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("BrowserMainWindow"));
-    QByteArray data = settings.value(QLatin1String("defaultState")).toByteArray();
+    settings.beginGroup(QStringLiteral("BrowserMainWindow"));
+    QByteArray data = settings.value(QStringLiteral("defaultState")).toByteArray();
     restoreState(data);
     settings.endGroup();
 }
@@ -296,9 +294,9 @@ void BrowserMainWindow::save()
     BrowserApplication::instance()->saveSession();
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("BrowserMainWindow"));
+    settings.beginGroup(QStringLiteral("BrowserMainWindow"));
     QByteArray data = saveState(false);
-    settings.setValue(QLatin1String("defaultState"), data);
+    settings.setValue(QStringLiteral("defaultState"), data);
     settings.endGroup();
 }
 
@@ -306,7 +304,7 @@ static const qint32 BrowserMainWindowMagic = 0xba;
 
 QByteArray BrowserMainWindow::saveState(bool withTabs) const
 {
-    int version = 3;
+    int version = 4;
     QByteArray data;
     QDataStream stream(&data, QIODevice::WriteOnly);
 
@@ -322,7 +320,6 @@ QByteArray BrowserMainWindow::saveState(bool withTabs) const
         stream << tabWidget()->saveState();
     else
         stream << QByteArray();
-    stream << m_navigationSplitter->saveState();
     stream << m_tabWidget->tabBar()->showTabBarWhenOneTab();
 
     stream << qint32(toolBarArea(m_navigationBar));
@@ -373,7 +370,6 @@ bool BrowserMainWindow::restoreState(const QByteArray &state)
     stream >> showBookmarksBarDEAD;
     stream >> showStatusbar;
     stream >> tabState;
-    stream >> splitterState;
     stream >> showTabBarWhenOneTab;
     stream >> navigationBarLocation;
     stream >> bookmarkBarLocation;
@@ -407,8 +403,6 @@ bool BrowserMainWindow::restoreState(const QByteArray &state)
 
     statusBar()->setVisible(showStatusbar);
 
-    m_navigationSplitter->restoreState(splitterState);
-
     tabWidget()->restoreState(tabState);
 
     m_tabWidget->tabBar()->setShowTabBarWhenOneTab(showTabBarWhenOneTab);
@@ -436,8 +430,8 @@ bool BrowserMainWindow::restoreState(const QByteArray &state)
 void BrowserMainWindow::lastTabClosed()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("tabs"));
-    bool quit = settings.value(QLatin1String("quitAsLastTabClosed"), true).toBool();
+    settings.beginGroup(QStringLiteral("tabs"));
+    bool quit = settings.value(QStringLiteral("quitAsLastTabClosed"), true).toBool();
 
     if (quit)
         close();
@@ -540,13 +534,13 @@ void BrowserMainWindow::setupMenu()
     m_fileMenu->addAction(m_fileQuit);
 
 #if defined(Q_WS_X11)
-    m_fileNewWindowAction->setIcon(QIcon::fromTheme(QLatin1String("window-new")));
-    m_fileOpenFileAction->setIcon(QIcon::fromTheme(QLatin1String("document-open")));
-    m_filePrintPreviewAction->setIcon(QIcon::fromTheme(QLatin1String("document-print-preview")));
-    m_filePrintAction->setIcon(QIcon::fromTheme(QLatin1String("document-print")));
-    m_fileSaveAsAction->setIcon(QIcon::fromTheme(QLatin1String("document-save-as")));
-    m_fileCloseWindow->setIcon(QIcon::fromTheme(QLatin1String("window-close")));
-    m_fileQuit->setIcon(QIcon::fromTheme(QLatin1String("application-exit")));
+    m_fileNewWindowAction->setIcon(QIcon::fromTheme(QStringLiteral("window-new")));
+    m_fileOpenFileAction->setIcon(QIcon::fromTheme(QStringLiteral("document-open")));
+    m_filePrintPreviewAction->setIcon(QIcon::fromTheme(QStringLiteral("document-print-preview")));
+    m_filePrintAction->setIcon(QIcon::fromTheme(QStringLiteral("document-print")));
+    m_fileSaveAsAction->setIcon(QIcon::fromTheme(QStringLiteral("document-save-as")));
+    m_fileCloseWindow->setIcon(QIcon::fromTheme(QStringLiteral("window-close")));
+    m_fileQuit->setIcon(QIcon::fromTheme(QStringLiteral("application-exit")));
 #endif
 
     // Edit
@@ -554,28 +548,28 @@ void BrowserMainWindow::setupMenu()
     menuBar()->addMenu(m_editMenu);
     m_editUndoAction = new QAction(m_editMenu);
     m_editUndoAction->setShortcuts(QKeySequence::Undo);
-    m_tabWidget->addWebAction(m_editUndoAction, QWebPage::Undo);
+    m_tabWidget->addWebAction(m_editUndoAction, QWebEnginePage::Undo);
     m_editMenu->addAction(m_editUndoAction);
     m_editRedoAction = new QAction(m_editMenu);
     m_editRedoAction->setShortcuts(QKeySequence::Redo);
-    m_tabWidget->addWebAction(m_editRedoAction, QWebPage::Redo);
+    m_tabWidget->addWebAction(m_editRedoAction, QWebEnginePage::Redo);
     m_editMenu->addAction(m_editRedoAction);
     m_editMenu->addSeparator();
     m_editCutAction = new QAction(m_editMenu);
     m_editCutAction->setShortcuts(QKeySequence::Cut);
-    m_tabWidget->addWebAction(m_editCutAction, QWebPage::Cut);
+    m_tabWidget->addWebAction(m_editCutAction, QWebEnginePage::Cut);
     m_editMenu->addAction(m_editCutAction);
     m_editCopyAction = new QAction(m_editMenu);
     m_editCopyAction->setShortcuts(QKeySequence::Copy);
-    m_tabWidget->addWebAction(m_editCopyAction, QWebPage::Copy);
+    m_tabWidget->addWebAction(m_editCopyAction, QWebEnginePage::Copy);
     m_editMenu->addAction(m_editCopyAction);
     m_editPasteAction = new QAction(m_editMenu);
     m_editPasteAction->setShortcuts(QKeySequence::Paste);
-    m_tabWidget->addWebAction(m_editPasteAction, QWebPage::Paste);
+    m_tabWidget->addWebAction(m_editPasteAction, QWebEnginePage::Paste);
     m_editMenu->addAction(m_editPasteAction);
     m_editSelectAllAction = new QAction(m_editMenu);
     m_editSelectAllAction->setShortcuts(QKeySequence::SelectAll);
-    m_tabWidget->addWebAction(m_editSelectAllAction, QWebPage::SelectAll);
+    m_tabWidget->addWebAction(m_editSelectAllAction, QWebEnginePage::SelectAll);
     m_editMenu->addAction(m_editSelectAllAction);
     m_editMenu->addSeparator();
 
@@ -596,13 +590,13 @@ void BrowserMainWindow::setupMenu()
     m_editMenu->addAction(m_editFindPreviousAction);
 
 #if defined(Q_WS_X11)
-    m_editUndoAction->setIcon(QIcon::fromTheme(QLatin1String("edit-undo")));
-    m_editRedoAction->setIcon(QIcon::fromTheme(QLatin1String("edit-redo")));
-    m_editCutAction->setIcon(QIcon::fromTheme(QLatin1String("edit-cut")));
-    m_editCopyAction->setIcon(QIcon::fromTheme(QLatin1String("edit-copy")));
-    m_editPasteAction->setIcon(QIcon::fromTheme(QLatin1String("edit-paste")));
-    m_editSelectAllAction->setIcon(QIcon::fromTheme(QLatin1String("edit-select-all")));
-    m_editFindAction->setIcon(QIcon::fromTheme(QLatin1String("edit-find")));
+    m_editUndoAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-undo")));
+    m_editRedoAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-redo")));
+    m_editCutAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-cut")));
+    m_editCopyAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-copy")));
+    m_editPasteAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-paste")));
+    m_editSelectAllAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-select-all")));
+    m_editFindAction->setIcon(QIcon::fromTheme(QStringLiteral("edit-find")));
 #endif
 
     // View
@@ -640,7 +634,7 @@ void BrowserMainWindow::setupMenu()
     shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_Period));
     shortcuts.append(Qt::Key_Escape);
     m_viewStopAction->setShortcuts(shortcuts);
-    m_tabWidget->addWebAction(m_viewStopAction, QWebPage::Stop);
+    m_tabWidget->addWebAction(m_viewStopAction, QWebEnginePage::Stop);
     m_viewMenu->addAction(m_viewStopAction);
 
     m_viewReloadAction = new QAction(m_viewMenu);
@@ -648,7 +642,7 @@ void BrowserMainWindow::setupMenu()
     shortcuts.append(QKeySequence(Qt::CTRL | Qt::Key_R));
     shortcuts.append(QKeySequence(Qt::Key_F5));
     m_viewReloadAction->setShortcuts(shortcuts);
-    m_tabWidget->addWebAction(m_viewReloadAction, QWebPage::Reload);
+    m_tabWidget->addWebAction(m_viewReloadAction, QWebEnginePage::Reload);
     m_viewMenu->addAction(m_viewReloadAction);
 
     m_viewZoomInAction = new QAction(m_viewMenu);
@@ -714,10 +708,10 @@ void BrowserMainWindow::setupMenu()
 #if defined(Q_WS_X11)
     m_viewStopAction->setIcon(m_stopIcon);
     m_viewReloadAction->setIcon(m_reloadIcon);
-    m_viewZoomInAction->setIcon(QIcon::fromTheme(QLatin1String("zoom-in")));
-    m_viewZoomNormalAction->setIcon(QIcon::fromTheme(QLatin1String("zoom-original")));
-    m_viewZoomOutAction->setIcon(QIcon::fromTheme(QLatin1String("zoom-out")));
-    m_viewFullScreenAction->setIcon(QIcon::fromTheme(QLatin1String("view-fullscreen")));
+    m_viewZoomInAction->setIcon(QIcon::fromTheme(QStringLiteral("zoom-in")));
+    m_viewZoomNormalAction->setIcon(QIcon::fromTheme(QStringLiteral("zoom-original")));
+    m_viewZoomOutAction->setIcon(QIcon::fromTheme(QStringLiteral("zoom-out")));
+    m_viewFullScreenAction->setIcon(QIcon::fromTheme(QStringLiteral("view-fullscreen")));
 #endif
 
     // History
@@ -728,14 +722,14 @@ void BrowserMainWindow::setupMenu()
     QList<QAction*> historyActions;
 
     m_historyBackAction = new QAction(this);
-    m_tabWidget->addWebAction(m_historyBackAction, QWebPage::Back);
+    m_tabWidget->addWebAction(m_historyBackAction, QWebEnginePage::Back);
     m_historyBackAction->setShortcuts(QKeySequence::Back);
 #if !defined(Q_WS_X11)
     m_historyBackAction->setIconVisibleInMenu(false);
 #endif
 
     m_historyForwardAction = new QAction(this);
-    m_tabWidget->addWebAction(m_historyForwardAction, QWebPage::Forward);
+    m_tabWidget->addWebAction(m_historyForwardAction, QWebEnginePage::Forward);
     m_historyForwardAction->setShortcuts(QKeySequence::Forward);
 #if !defined(Q_WS_X11)
     m_historyForwardAction->setIconVisibleInMenu(false);
@@ -757,8 +751,8 @@ void BrowserMainWindow::setupMenu()
     historyActions.append(m_historyRestoreLastSessionAction);
     m_historyMenu->setInitialActions(historyActions);
 #if defined(Q_WS_X11)
-    m_historyRestoreLastSessionAction->setIcon(QIcon::fromTheme(QLatin1String("document-revert")));
-    m_historyHomeAction->setIcon(QIcon::fromTheme(QLatin1String("go-home")));
+    m_historyRestoreLastSessionAction->setIcon(QIcon::fromTheme(QStringLiteral("document-revert")));
+    m_historyHomeAction->setIcon(QIcon::fromTheme(QStringLiteral("go-home")));
 #endif
 
     // Bookmarks
@@ -775,7 +769,7 @@ void BrowserMainWindow::setupMenu()
             this, SLOT(showBookmarksDialog()));
 
     m_bookmarksAddAction = new QAction(this);
-    m_bookmarksAddAction->setIcon(QIcon(QLatin1String(":addbookmark.png")));
+    m_bookmarksAddAction->setIcon(QIcon(QStringLiteral(":addbookmark.png")));
 #if !defined(Q_WS_X11)
     m_bookmarksAddAction->setIconVisibleInMenu(false);
 #endif
@@ -794,8 +788,8 @@ void BrowserMainWindow::setupMenu()
     bookmarksActions.append(m_bookmarksAddFolderAction);
     m_bookmarksMenu->setInitialActions(bookmarksActions);
 
-    m_bookmarksAddFolderAction->setIcon(QIcon::fromTheme(QLatin1String("folder-new")));
-    m_bookmarksShowAllAction->setIcon(QIcon::fromTheme(QLatin1String("user-bookmarks")));
+    m_bookmarksAddFolderAction->setIcon(QIcon::fromTheme(QStringLiteral("folder-new")));
+    m_bookmarksShowAllAction->setIcon(QIcon::fromTheme(QStringLiteral("user-bookmarks")));
 
     // Window
     m_windowMenu = new QMenu(menuBar());
@@ -808,25 +802,21 @@ void BrowserMainWindow::setupMenu()
     m_toolsMenu = new QMenu(menuBar());
     menuBar()->addMenu(m_toolsMenu);
 
-    m_toolsWebSearchAction = new QAction(m_toolsMenu);
-    connect(m_toolsWebSearchAction, SIGNAL(triggered()),
-            this, SLOT(webSearch()));
-    m_toolsMenu->addAction(m_toolsWebSearchAction);
+    QSettings settings;
+    settings.beginGroup(QStringLiteral("appearance"));
+    if(settings.value(QStringLiteral("urlBarType"), 0).toInt() == 0) {
+        m_toolsWebSearchAction = new QAction(m_toolsMenu);
+        connect(m_toolsWebSearchAction, SIGNAL(triggered()),
+                this, SLOT(webSearch()));
+        m_toolsMenu->addAction(m_toolsWebSearchAction);
+    }
+    settings.endGroup();
 
     m_toolsClearPrivateDataAction = new QAction(m_toolsMenu);
     connect(m_toolsClearPrivateDataAction, SIGNAL(triggered()),
             this, SLOT(clearPrivateData()));
     m_toolsMenu->addAction(m_toolsClearPrivateDataAction);
 
-    m_toolsEnableInspectorAction = new QAction(m_toolsMenu);
-    connect(m_toolsEnableInspectorAction, SIGNAL(triggered(bool)),
-            this, SLOT(toggleInspector(bool)));
-    m_toolsEnableInspectorAction->setCheckable(true);
-    QSettings settings;
-    settings.beginGroup(QLatin1String("websettings"));
-    m_toolsEnableInspectorAction->setChecked(settings.value(QLatin1String("enableInspector"), false).toBool());
-    m_toolsMenu->addAction(m_toolsEnableInspectorAction);
-
     m_toolsSearchManagerAction = new QAction(m_toolsMenu);
     m_toolsSearchManagerAction->setMenuRole(QAction::NoRole);
     connect(m_toolsSearchManagerAction, SIGNAL(triggered()),
@@ -836,11 +826,6 @@ void BrowserMainWindow::setupMenu()
     m_toolsUserAgentMenu = new UserAgentMenu(m_toolsMenu);
     m_toolsMenu->addMenu(m_toolsUserAgentMenu);
 
-    m_adBlockDialogAction = new QAction(m_toolsMenu);
-    connect(m_adBlockDialogAction, SIGNAL(triggered()),
-            AdBlockManager::instance(), SLOT(showDialog()));
-    m_toolsMenu->addAction(m_adBlockDialogAction);
-
     m_toolsMenu->addSeparator();
     m_toolsPreferencesAction = new QAction(m_toolsMenu);
     m_toolsPreferencesAction->setMenuRole(QAction::PreferencesRole);
@@ -869,8 +854,8 @@ void BrowserMainWindow::setupMenu()
     m_helpMenu->addAction(m_helpAboutApplicationAction);
 
 #if defined(Q_WS_X11)
-    m_helpChangeLanguageAction->setIcon(QIcon::fromTheme(QLatin1String("preferences-desktop-locale")));
-    m_helpAboutQtAction->setIcon(QPixmap(QLatin1String(":/trolltech/qmessagebox/images/qtlogo-64.png")));
+    m_helpChangeLanguageAction->setIcon(QIcon::fromTheme(QStringLiteral("preferences-desktop-locale")));
+    m_helpAboutQtAction->setIcon(QPixmap(QStringLiteral(":/trolltech/qmessagebox/images/qtlogo-64.png")));
     m_helpAboutApplicationAction->setIcon(windowIcon());
 #endif
 }
@@ -889,13 +874,13 @@ void BrowserMainWindow::aboutToShowTextEncodingMenu()
     int currentCodec = -1;
     QStringList codecs;
     QList<int> mibs = QTextCodec::availableMibs();
-    foreach (const int &mib, mibs) {
-        QString codec = QLatin1String(QTextCodec::codecForMib(mib)->name());
+    Q_FOREACH (const int &mib, mibs) {
+        QString codec = QString(QTextCodec::codecForMib(mib)->name());
         codecs.append(codec);
     }
     codecs.sort();
 
-    QString defaultTextEncoding = QWebSettings::globalSettings()->defaultTextEncoding();
+    QString defaultTextEncoding = QWebEngineSettings::globalSettings()->defaultTextEncoding();
     currentCodec = codecs.indexOf(defaultTextEncoding);
 
     QAction *defaultEncoding = m_viewTextEncodingMenu->addAction(tr("Default"));
@@ -921,9 +906,9 @@ void BrowserMainWindow::viewTextEncoding(QAction *action)
     Q_ASSERT(action);
     QString codec = action->data().toString();
     if (codec.isEmpty())
-        QWebSettings::globalSettings()->setDefaultTextEncoding(QString());
+        QWebEngineSettings::globalSettings()->setDefaultTextEncoding(QString());
     else
-        QWebSettings::globalSettings()->setDefaultTextEncoding(codec);
+        QWebEngineSettings::globalSettings()->setDefaultTextEncoding(codec);
 }
 
 void BrowserMainWindow::retranslate()
@@ -982,16 +967,19 @@ void BrowserMainWindow::retranslate()
     m_windowMenu->setTitle(tr("&Window"));
 
     m_toolsMenu->setTitle(tr("&Tools"));
-    m_toolsWebSearchAction->setText(tr("Web &Search"));
-    m_toolsWebSearchAction->setShortcut(QKeySequence(tr("Ctrl+K", "Web Search")));
+    QSettings settings;
+    settings.beginGroup(QStringLiteral("appearance"));
+    if(settings.value(QStringLiteral("urlBarType"), 0).toInt() == 0) {
+        m_toolsWebSearchAction->setText(tr("Web &Search"));
+        m_toolsWebSearchAction->setShortcut(QKeySequence(tr("Ctrl+K", "Web Search")));
+    }
+    settings.endGroup();
     m_toolsClearPrivateDataAction->setText(tr("&Clear Private Data"));
     m_toolsClearPrivateDataAction->setShortcut(QKeySequence(tr("Ctrl+Shift+Delete", "Clear Private Data")));
-    m_toolsEnableInspectorAction->setText(tr("Enable Web &Inspector"));
     m_toolsPreferencesAction->setText(tr("Options..."));
     m_toolsPreferencesAction->setShortcut(tr("Ctrl+,"));
     m_toolsSearchManagerAction->setText(tr("Configure Search Engines..."));
     m_toolsUserAgentMenu->setTitle(tr("User Agent"));
-    m_adBlockDialogAction->setText(tr("&Ad Block..."));
 
     m_helpMenu->setTitle(tr("&Help"));
     m_helpChangeLanguageAction->setText(tr("Switch application language "));
@@ -1010,10 +998,10 @@ void BrowserMainWindow::setupToolBar()
 {
     setUnifiedTitleAndToolBarOnMac(true);
     m_navigationBar = new QToolBar(this);
-    m_navigationBar->setObjectName(QLatin1String("NavigationToolBar"));
+    m_navigationBar->setObjectName(QStringLiteral("NavigationToolBar"));
     addToolBar(m_navigationBar);
 
-    m_historyBackAction->setIcon(style()->standardIcon(QStyle::SP_ArrowBack, 0, this));
+    m_historyBackAction->setIcon(style()->standardIcon(QStyle::SP_ArrowBack, nullptr, this));
     m_historyBackMenu = new QMenu(this);
     m_historyBackAction->setMenu(m_historyBackMenu);
     connect(m_historyBackMenu, SIGNAL(aboutToShow()),
@@ -1022,7 +1010,7 @@ void BrowserMainWindow::setupToolBar()
             this, SLOT(openActionUrl(QAction *)));
     m_navigationBar->addAction(m_historyBackAction);
 
-    m_historyForwardAction->setIcon(style()->standardIcon(QStyle::SP_ArrowForward, 0, this));
+    m_historyForwardAction->setIcon(style()->standardIcon(QStyle::SP_ArrowForward, nullptr, this));
     m_historyForwardMenu = new QMenu(this);
     connect(m_historyForwardMenu, SIGNAL(aboutToShow()),
             this, SLOT(aboutToShowForwardMenu()));
@@ -1035,21 +1023,27 @@ void BrowserMainWindow::setupToolBar()
     m_stopReloadAction->setIcon(m_reloadIcon);
     m_navigationBar->addAction(m_stopReloadAction);
 
-    m_navigationSplitter = new QSplitter(m_navigationBar);
-    m_navigationSplitter->addWidget(m_tabWidget->locationBarStack());
-
-    m_toolbarSearch = new ToolbarSearch(m_navigationBar);
-    m_navigationSplitter->addWidget(m_toolbarSearch);
-    connect(m_toolbarSearch, SIGNAL(search(const QUrl&, TabWidget::OpenUrlIn)),
-            m_tabWidget, SLOT(loadUrl(const QUrl&, TabWidget::OpenUrlIn)));
-    m_navigationSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+    QSettings settings;
+    settings.beginGroup(QStringLiteral("appearance"));
+    if(settings.value(QStringLiteral("urlBarType"), 0).toInt() == 0) {
+        m_navigationSplitter = new QSplitter(m_navigationBar);
+        m_navigationSplitter->addWidget(m_tabWidget->locationBarStack());
+        m_toolbarSearch = new ToolbarSearch(m_navigationBar);
+        m_navigationSplitter->addWidget(m_toolbarSearch);
+        connect(m_toolbarSearch, SIGNAL(search(const QUrl&, TabWidget::OpenUrlIn)),
+                m_tabWidget, SLOT(loadUrl(const QUrl&, TabWidget::OpenUrlIn)));
+        m_navigationSplitter->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+        m_navigationSplitter->setCollapsible(0, false);
+        m_navigationBar->addWidget(m_navigationSplitter);
+        int splitterWidth = m_navigationSplitter->width();
+        QList<int> sizes;
+        sizes << (int)((double)splitterWidth * .80) << (int)((double)splitterWidth * .20);
+        m_navigationSplitter->setSizes(sizes);
+    } else {
+        m_navigationBar->addWidget(m_tabWidget->locationBarStack());
+    }
+    settings.endGroup();
     m_tabWidget->locationBarStack()->setMinimumWidth(120);
-    m_navigationSplitter->setCollapsible(0, false);
-    m_navigationBar->addWidget(m_navigationSplitter);
-    int splitterWidth = m_navigationSplitter->width();
-    QList<int> sizes;
-    sizes << (int)((double)splitterWidth * .80) << (int)((double)splitterWidth * .20);
-    m_navigationSplitter->setSizes(sizes);
 }
 
 void BrowserMainWindow::showBookmarksDialog()
@@ -1064,7 +1058,7 @@ void BrowserMainWindow::showBookmarksDialog()
 void BrowserMainWindow::addBookmark()
 {
     WebView *webView = currentTab();
-    QString url = QLatin1String(webView->url().toEncoded());
+    QString url = QString(webView->url().toEncoded());
     QString title = webView->title();
 
     AddBookmarkDialog dialog;
@@ -1150,7 +1144,7 @@ void BrowserMainWindow::selectLineEdit()
 
 void BrowserMainWindow::fileSaveAs()
 {
-    BrowserApplication::downloadManager()->download(currentTab()->url(), true);
+    currentTab()->page()->download(currentTab()->url(), "");
 }
 
 void BrowserMainWindow::preferences()
@@ -1189,8 +1183,8 @@ void BrowserMainWindow::fileNew()
     BrowserMainWindow *window = BrowserApplication::instance()->newMainWindow();
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("MainWindow"));
-    int startup = settings.value(QLatin1String("startupBehavior")).toInt();
+    settings.beginGroup(QStringLiteral("MainWindow"));
+    int startup = settings.value(QStringLiteral("startupBehavior")).toInt();
 
     if (startup == 0)
         window->goHome();
@@ -1211,9 +1205,11 @@ void BrowserMainWindow::filePrintPreview()
 {
     if (!currentTab())
         return;
-    QPrintPreviewDialog dialog(this);
-    connect(&dialog, SIGNAL(paintRequested(QPrinter *)),
-            currentTab(), SLOT(print(QPrinter *)));
+
+    QPrinter printer;
+    QPrintPreviewDialog dialog(&printer, currentTab()->page()->view());
+    connect(&dialog, &QPrintPreviewDialog::paintRequested,
+            this, &BrowserMainWindow::printDocument);
     dialog.exec();
 }
 
@@ -1221,29 +1217,52 @@ void BrowserMainWindow::filePrint()
 {
     if (!currentTab())
         return;
-    printRequested(currentTab()->page()->mainFrame());
+    printRequested();
 }
 
-void BrowserMainWindow::printRequested(QWebFrame *frame)
+void BrowserMainWindow::printRequested()
 {
-    QPrinter printer;
-    QPrintDialog dialog(&printer, this);
-    dialog.setWindowTitle(tr("Print Document"));
+    if (!currentTab())
+        return;
+    QPrinter printer(QPrinter::HighResolution);
+    QPrintDialog dialog(&printer, currentTab()->page()->view());
     if (dialog.exec() != QDialog::Accepted)
         return;
-    frame->print(&printer);
+    printDocument(&printer);
+}
+
+void BrowserMainWindow::printDocument(QPrinter *printer)
+{
+    if (!currentTab())
+        return;
+    QEventLoop loop;
+    bool result;
+    auto printPreview = [&](bool success) { result = success; loop.quit(); };
+    currentTab()->page()->print(printer, std::move(printPreview));
+    loop.exec();
+    if (!result) {
+        QPainter painter;
+        if (painter.begin(printer)) {
+            QFont font = painter.font();
+            font.setPixelSize(20);
+            painter.setFont(font);
+            painter.drawText(QPointF(10,25),
+                             QStringLiteral("Could not generate print preview."));
+
+            painter.end();
+        }
+    }
 }
 
 void BrowserMainWindow::privateBrowsing()
 {
-    if (!BrowserApplication::isPrivate()) {
+    if (!BrowserApplication::instance()->isPrivate()) {
         QString title = tr("Are you sure you want to turn on private browsing?");
         QString text1 = tr("When private browsing is turned on, some actions concerning your privacy will be disabled:");
 
         QStringList actions;
         actions.append(tr("Webpages are not added to the history."));
         actions.append(tr("Items are automatically removed from the Downloads window."));
-        actions.append(tr("New cookies are not stored, current cookies can't be accessed."));
         actions.append(tr("Site icons won't be stored."));
         actions.append(tr("Session won't be saved."));
         actions.append(tr("Searches are not added to the pop-up menu in the search box."));
@@ -1252,18 +1271,18 @@ void BrowserMainWindow::privateBrowsing()
         QString text2 = tr("Until you close the window, you can still click the Back and Forward "
                            "buttons to return to the webpages you have opened.");
 
-        QString message = QString(QLatin1String("<b>%1</b><p>%2</p><ul><li>%3</li></ul><p>%4</p>"))
-                          .arg(title, text1, actions.join(QLatin1String("</li><li>")), text2);
+        QString message = QString(QStringLiteral("<b>%1</b><p>%2</p><ul><li>%3</li></ul><p>%4</p>"))
+                          .arg(title, text1, actions.join(QStringLiteral("</li><li>")), text2);
 
         QMessageBox::StandardButton button = QMessageBox::question(this, tr("Private Browsing"), message,
-                                                                   QMessageBox::Ok | QMessageBox::Cancel,
-                                                                   QMessageBox::Ok);
+                                             QMessageBox::Ok | QMessageBox::Cancel,
+                                             QMessageBox::Ok);
         if (button == QMessageBox::Ok)
-            BrowserApplication::setPrivate(true);
+            BrowserApplication::instance()->setPrivate(true);
         else
             m_filePrivateBrowsingAction->setChecked(false);
     } else {
-        BrowserApplication::setPrivate(false);
+        BrowserApplication::instance()->setPrivate(false);
     }
 }
 
@@ -1290,8 +1309,8 @@ void BrowserMainWindow::closeEvent(QCloseEvent *event)
 
     if (m_tabWidget->count() > 1) {
         QSettings settings;
-        settings.beginGroup(QLatin1String("tabs"));
-        bool confirm = settings.value(QLatin1String("confirmClosingMultipleTabs"), true).toBool();
+        settings.beginGroup(QStringLiteral("tabs"));
+        bool confirm = settings.value(QStringLiteral("confirmClosingMultipleTabs"), true).toBool();
         if (confirm) {
             QApplication::alert(this);
             int ret = QMessageBox::warning(this, QString(),
@@ -1390,18 +1409,31 @@ void BrowserMainWindow::viewPageSource()
         return;
 
     QString title = currentTab()->title();
-    QString markup = currentTab()->page()->mainFrame()->toHtml();
+    QEventLoop loop;
+    connect(this, SIGNAL(notifyGotHTML()), &loop, SLOT(quit()));
+    currentTab()->page()->toHtml([this](const QVariant &v)
+    {
+        QString tmp = v.toString();
+        this->gotHTML(tmp);
+    });
+    loop.exec();
     QUrl url = currentTab()->url();
-    SourceViewer *viewer = new SourceViewer(markup, title, url);
-    viewer->setAttribute(Qt::WA_DeleteOnClose);
-    viewer->show();
+    if(!url.toString().startsWith("view-source:")) {
+        tabWidget()->loadUrl(QUrl("view-source:" + url.toString()), TabWidget::NewSelectedTab);
+    }
+}
+
+void BrowserMainWindow::gotHTML(QString &value)
+{
+    markup = value;
+    Q_EMIT notifyGotHTML();
 }
 
 void BrowserMainWindow::goHome()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("MainWindow"));
-    QString home = settings.value(QLatin1String("home"), QLatin1String("about:home")).toString();
+    settings.beginGroup(QStringLiteral("MainWindow"));
+    QString home = settings.value(QStringLiteral("home"), QStringLiteral("about:home")).toString();
     tabWidget()->loadString(home);
 }
 
@@ -1417,23 +1449,6 @@ void BrowserMainWindow::clearPrivateData()
     dialog.exec();
 }
 
-void BrowserMainWindow::toggleInspector(bool enable)
-{
-    QWebSettings::globalSettings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, enable);
-    if (enable) {
-        int result = QMessageBox::question(this, tr("Web Inspector"),
-                                           tr("The web inspector will only work correctly for pages that were loaded after enabling.\n"
-                                              "Do you want to reload all pages?"),
-                                           QMessageBox::Yes | QMessageBox::No);
-        if (result == QMessageBox::Yes) {
-            m_tabWidget->reloadAllTabs();
-        }
-    }
-    QSettings settings;
-    settings.beginGroup(QLatin1String("websettings"));
-    settings.setValue(QLatin1String("enableInspector"), enable);
-}
-
 void BrowserMainWindow::swapFocus()
 {
     if (currentTab()->hasFocus()) {
@@ -1496,10 +1511,10 @@ void BrowserMainWindow::aboutToShowBackMenu()
     m_historyBackMenu->clear();
     if (!currentTab())
         return;
-    QWebHistory *history = currentTab()->history();
+    QWebEngineHistory *history = currentTab()->history();
     int historyCount = history->count();
     for (int i = history->backItems(historyCount).count() - 1; i >= 0; --i) {
-        QWebHistoryItem item = history->backItems(history->count()).at(i);
+        QWebEngineHistoryItem item = history->backItems(history->count()).at(i);
         QAction *action = new QAction(this);
         action->setData(-1*(historyCount - i - 1));
         QIcon icon = BrowserApplication::instance()->icon(item.url());
@@ -1514,10 +1529,10 @@ void BrowserMainWindow::aboutToShowForwardMenu()
     m_historyForwardMenu->clear();
     if (!currentTab())
         return;
-    QWebHistory *history = currentTab()->history();
+    QWebEngineHistory *history = currentTab()->history();
     int historyCount = history->count();
     for (int i = 0; i < history->forwardItems(history->count()).count(); ++i) {
-        QWebHistoryItem item = history->forwardItems(historyCount).at(i);
+        QWebEngineHistoryItem item = history->forwardItems(historyCount).at(i);
         QAction *action = new QAction(this);
         action->setData(historyCount - i);
         QIcon icon = BrowserApplication::instance()->icon(item.url());
@@ -1535,7 +1550,7 @@ void BrowserMainWindow::aboutToShowWindowMenu()
     m_windowMenu->addSeparator();
     QAction *downloadManagerAction = m_windowMenu->addAction(tr("Downloads"), this, SLOT(downloadManager()), QKeySequence(tr("Ctrl+Y", "Download Manager")));
 
-    downloadManagerAction->setIcon(QIcon::fromTheme(QLatin1String("emblem-downloads")));
+    downloadManagerAction->setIcon(QIcon::fromTheme(QStringLiteral("emblem-downloads")));
 
     m_windowMenu->addSeparator();
     QList<BrowserMainWindow*> windows = BrowserApplication::instance()->mainWindows();
@@ -1566,7 +1581,7 @@ void BrowserMainWindow::showWindow()
 void BrowserMainWindow::openActionUrl(QAction *action)
 {
     int offset = action->data().toInt();
-    QWebHistory *history = currentTab()->history();
+    QWebEngineHistory *history = currentTab()->history();
     if (offset < 0)
         history->goToItem(history->backItems(-1*offset).first()); // back
     else if (offset > 0)
@@ -1578,3 +1593,23 @@ void BrowserMainWindow::geometryChangeRequested(const QRect &geometry)
     setGeometry(geometry);
 }
 
+
+
+DevToolsWindow *BrowserMainWindow::createDevToolsWindow()
+{
+    auto devWindow = new DevToolsWindow(this);
+    devWindow->show();
+    return devWindow;
+}
+
+void BrowserMainWindow::handleDevToolsRequested(QWebEnginePage *source)
+{
+    source->setDevToolsPage(createDevToolsWindow()->page());
+    source->triggerAction(QWebEnginePage::InspectElement);
+}
+
+void BrowserMainWindow::runScriptOnOpenViews(QString source)
+{
+    for (int i =0; i < tabWidget()->count(); ++i)
+        tabWidget()->webView(i)->page()->runJavaScript(source);
+}
diff --git a/src/browsermainwindow.h b/src/browsermainwindow.h
index ff924875..5e1b5b69 100644
--- a/src/browsermainwindow.h
+++ b/src/browsermainwindow.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,11 +63,12 @@
 #ifndef BROWSERMAINWINDOW_H
 #define BROWSERMAINWINDOW_H
 
-#include <qmainwindow.h>
+#include <QMainWindow>
+#include <QWebEngineProfile>
 
 class AutoSaver;
 class BookmarksToolBar;
-class QWebFrame;
+class QWebEnginePage;
 class TabWidget;
 class ToolbarSearch;
 class WebView;
@@ -76,6 +77,9 @@ class QFrame;
 class HistoryMenu;
 class BookmarksMenuBarMenu;
 class UserAgentMenu;
+class DevToolsWindow;
+class QPrinter;
+class QCloseEvent;
 
 /*!
     The MainWindow of the Browser Application.
@@ -87,7 +91,7 @@ class BrowserMainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    BrowserMainWindow(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+    BrowserMainWindow(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags(), QWebEngineProfile *profile = QWebEngineProfile::defaultProfile());
     ~BrowserMainWindow();
     QSize sizeHint() const;
 
@@ -100,12 +104,17 @@ class BrowserMainWindow : public QMainWindow
     QByteArray saveState(bool withTabs = true) const;
     bool restoreState(const QByteArray &state);
     QAction *showMenuBarAction() const;
-    QAction *searchManagerAction() const { return m_toolsSearchManagerAction; }
+    QAction *searchManagerAction() const {
+        return m_toolsSearchManagerAction;
+    }
+    void handleDevToolsRequested(QWebEnginePage *source);
 
-public slots:
+public Q_SLOTS:
     void goHome();
     void privacyChanged(bool isPrivate);
     void zoomTextOnlyChanged(bool textOnly);
+    void runScriptOnOpenViews(QString source);
+    void printDocument(QPrinter *printer);
 
 protected:
     void closeEvent(QCloseEvent *event);
@@ -113,7 +122,7 @@ public slots:
     void mousePressEvent(QMouseEvent *event);
     void changeEvent(QEvent *event);
 
-private slots:
+private Q_SLOTS:
     void save();
 
     void lastTabClosed();
@@ -149,7 +158,6 @@ private slots:
 
     void webSearch();
     void clearPrivateData();
-    void toggleInspector(bool enable);
     void aboutApplication();
     void downloadManager();
     void selectLineEdit();
@@ -164,15 +172,18 @@ private slots:
     void showWindow();
     void swapFocus();
 
-    void printRequested(QWebFrame *frame);
+    void printRequested();
     void geometryChangeRequested(const QRect &geometry);
 
+    void gotHTML(QString &value);
+
 private:
     void retranslate();
     void loadDefaultState();
     void setupMenu();
     void setupToolBar();
     void updateStopReloadActionText(bool loading);
+    DevToolsWindow *createDevToolsWindow();
 
 private:
     QMenu *m_fileMenu;
@@ -231,11 +242,9 @@ private slots:
     QMenu *m_toolsMenu;
     QAction *m_toolsWebSearchAction;
     QAction *m_toolsClearPrivateDataAction;
-    QAction *m_toolsEnableInspectorAction;
     QAction *m_toolsPreferencesAction;
     QAction *m_toolsSearchManagerAction;
     UserAgentMenu *m_toolsUserAgentMenu;
-    QAction *m_adBlockDialogAction;
 
     QMenu *m_helpMenu;
     QAction *m_helpChangeLanguageAction;
@@ -265,7 +274,14 @@ private slots:
     bool m_menuBarVisible;
     bool m_statusBarVisible;
 
+    QString markup;
+
+    QWebEngineProfile *m_profile;
+
     friend class BrowserApplication;
+
+Q_SIGNALS:
+    void notifyGotHTML();
 };
 
 #endif // BROWSERMAINWINDOW_H
diff --git a/src/clearbutton.cpp b/src/clearbutton.cpp
index b4d1c050..9c0f36d2 100644
--- a/src/clearbutton.cpp
+++ b/src/clearbutton.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -28,7 +28,7 @@
 
 #include "clearbutton.h"
 
-#include <qpainter.h>
+#include <QPainter>
 
 ClearButton::ClearButton(QWidget *parent)
     : QAbstractButton(parent)
@@ -41,9 +41,9 @@ ClearButton::ClearButton(QWidget *parent)
 
     // First check for a style icon, current KDE provides one
     if (m_styleImage.isNull()) {
-        QLatin1String iconName = (layoutDirection() == Qt::RightToLeft)
-            ? QLatin1String("edit-clear-locationbar-ltr")
-            : QLatin1String("edit-clear-locationbar-rtl");
+        QString iconName = (layoutDirection() == Qt::RightToLeft)
+                                 ? QStringLiteral("edit-clear-locationbar-ltr")
+                                 : QStringLiteral("edit-clear-locationbar-rtl");
         QIcon icon = QIcon::fromTheme(iconName);
         if (!icon.isNull())
             m_styleImage = icon.pixmap(16, 16).toImage();
diff --git a/src/clearbutton.h b/src/clearbutton.h
index 5df47f52..b3a4ea68 100644
--- a/src/clearbutton.h
+++ b/src/clearbutton.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,16 +29,16 @@
 #ifndef CLEARBUTTON_H
 #define CLEARBUTTON_H
 
-#include <qabstractbutton.h>
+#include <QAbstractButton>
 
 class ClearButton : public QAbstractButton
 {
     Q_OBJECT
 
 public:
-    ClearButton(QWidget *parent = 0);
+    ClearButton(QWidget *parent = nullptr);
 
-public slots:
+public Q_SLOTS:
     void textChanged(const QString &text);
 
 protected:
diff --git a/src/clearprivatedata.cpp b/src/clearprivatedata.cpp
index 5afeef02..13019238 100644
--- a/src/clearprivatedata.cpp
+++ b/src/clearprivatedata.cpp
@@ -21,21 +21,18 @@
 
 #include "browserapplication.h"
 #include "browsermainwindow.h"
-#include "cookiejar.h"
 #include "downloadmanager.h"
 #include "historymanager.h"
-#include "networkaccessmanager.h"
 #include "toolbarsearch.h"
 
-#include <qabstractnetworkcache.h>
-#include <qcheckbox.h>
-#include <qdialogbuttonbox.h>
-#include <qlabel.h>
-#include <qlayout.h>
-#include <qlist.h>
-#include <qpushbutton.h>
-#include <qsettings.h>
-#include <qwebsettings.h>
+#include <QCheckBox>
+#include <QDialogButtonBox>
+#include <QLabel>
+#include <QLayout>
+#include <QList>
+#include <QPushButton>
+#include <QSettings>
+#include <QWebEngineSettings>
 
 ClearPrivateData::ClearPrivateData(QWidget *parent)
     : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint)
@@ -46,36 +43,20 @@ ClearPrivateData::ClearPrivateData(QWidget *parent)
     layout->addWidget(new QLabel(tr("Clear the following items:")));
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("clearprivatedata"));
+    settings.beginGroup(QStringLiteral("clearprivatedata"));
 
     m_browsingHistory = new QCheckBox(tr("&Browsing History"));
-    m_browsingHistory->setChecked(settings.value(QLatin1String("browsingHistory"), true).toBool());
+    m_browsingHistory->setChecked(settings.value(QStringLiteral("browsingHistory"), true).toBool());
     layout->addWidget(m_browsingHistory);
 
     m_downloadHistory = new QCheckBox(tr("&Download History"));
-    m_downloadHistory->setChecked(settings.value(QLatin1String("downloadHistory"), true).toBool());
+    m_downloadHistory->setChecked(settings.value(QStringLiteral("downloadHistory"), true).toBool());
     layout->addWidget(m_downloadHistory);
 
     m_searchHistory = new QCheckBox(tr("&Search History"));
-    m_searchHistory->setChecked(settings.value(QLatin1String("searchHistory"), true).toBool());
+    m_searchHistory->setChecked(settings.value(QStringLiteral("searchHistory"), true).toBool());
     layout->addWidget(m_searchHistory);
 
-    m_cookies = new QCheckBox(tr("&Cookies"));
-    m_cookies->setChecked(settings.value(QLatin1String("cookies"), true).toBool());
-    layout->addWidget(m_cookies);
-
-    m_cache = new QCheckBox(tr("C&ached Web Pages"));
-    if (BrowserApplication::networkAccessManager()->cache()) {
-        m_cache->setChecked(settings.value(QLatin1String("cache"), true).toBool());
-    } else {
-        m_cache->setEnabled(false);
-    }
-    layout->addWidget(m_cache);
-
-    m_favIcons = new QCheckBox(tr("Website &Icons"));
-    m_favIcons->setChecked(settings.value(QLatin1String("favIcons"), true).toBool());
-    layout->addWidget(m_favIcons);
-
     settings.endGroup();
 
     QPushButton *acceptButton = new QPushButton(tr("Clear &Private Data"));
@@ -95,14 +76,12 @@ ClearPrivateData::ClearPrivateData(QWidget *parent)
 void ClearPrivateData::accept()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("clearprivatedata"));
+    settings.beginGroup(QStringLiteral("clearprivatedata"));
 
-    settings.setValue(QLatin1String("browsingHistory"), m_browsingHistory->isChecked());
-    settings.setValue(QLatin1String("downloadHistory"), m_downloadHistory->isChecked());
-    settings.setValue(QLatin1String("searchHistory"), m_searchHistory->isChecked());
-    settings.setValue(QLatin1String("cookies"), m_cookies->isChecked());
-    settings.setValue(QLatin1String("cache"), m_cache->isChecked());
-    settings.setValue(QLatin1String("favIcons"), m_favIcons->isChecked());
+    settings.setValue(QStringLiteral("browsingHistory"), m_browsingHistory->isChecked());
+    settings.setValue(QStringLiteral("downloadHistory"), m_downloadHistory->isChecked());
+    settings.setValue(QStringLiteral("searchHistory"), m_searchHistory->isChecked());
+    settings.setValue(QStringLiteral("cache"), m_cache->isChecked());
 
     settings.endGroup();
 
@@ -121,17 +100,5 @@ void ClearPrivateData::accept()
             mainWindows.at(i)->toolbarSearch()->setText(QString());
         }
     }
-
-    if (m_cookies->isChecked()) {
-        BrowserApplication::cookieJar()->clear();
-    }
-
-    if (m_cache->isChecked() && BrowserApplication::networkAccessManager()->cache()) {
-        BrowserApplication::networkAccessManager()->cache()->clear();
-    }
-
-    if (m_favIcons->isChecked()) {
-        QWebSettings::clearIconDatabase();
-    }
     QDialog::accept();
 }
diff --git a/src/clearprivatedata.h b/src/clearprivatedata.h
index db5d823e..f365f89d 100644
--- a/src/clearprivatedata.h
+++ b/src/clearprivatedata.h
@@ -20,7 +20,7 @@
 #ifndef CLEARPRIVATEDATA_H
 #define CLEARPRIVATEDATA_H
 
-#include <qdialog.h>
+#include <QDialog>
 
 class QCheckBox;
 
@@ -29,9 +29,9 @@ class ClearPrivateData : public QDialog
     Q_OBJECT
 
 public:
-    ClearPrivateData(QWidget *parent = 0);
+    ClearPrivateData(QWidget *parent = nullptr);
 
-public slots:
+public Q_SLOTS:
     void accept();
 
 private:
diff --git a/src/data/data.qrc b/src/data/data.qrc
index 85eff66e..6f7da0dc 100644
--- a/src/data/data.qrc
+++ b/src/data/data.qrc
@@ -2,11 +2,13 @@
 <qresource>
     <file>128x128/endorphin.png</file>
     <file>128x128/run.png</file>
+    <file>512x512/endorphin.png</file>
     <file>endorphin.svg</file>
     <file>defaultbookmarks.xbel</file>
+    <file>qwebchannel.js</file>
     <file>fetchLinks.js</file>
     <file>parseForms.js</file>
     <file>../../AUTHORS</file>
-    <file>../../LICENSE.GPL2</file>
+    <file>../../LICENSE</file>
 </qresource>
 </RCC>
diff --git a/src/data/defaultbookmarks.xbel b/src/data/defaultbookmarks.xbel
index 56e92d6d..0c8179f5 100644
--- a/src/data/defaultbookmarks.xbel
+++ b/src/data/defaultbookmarks.xbel
@@ -3,7 +3,7 @@
 <xbel version="1.0">
     <folder folded="yes">
         <title>Bookmarks Bar</title>
-        <bookmark href="http://aarondewes.github.io/endorphin/">
+        <bookmark href="http://EndorphinBrowser.gitlab.io/">
             <title>Endorphin</title>
         </bookmark>
     </folder>
diff --git a/src/data/endorphin.svg b/src/data/endorphin.svg
index 23af42cd..d981b474 100644
--- a/src/data/endorphin.svg
+++ b/src/data/endorphin.svg
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
 <svg
    xmlns:dc="http://purl.org/dc/elements/1.1/"
    xmlns:cc="http://creativecommons.org/ns#"
@@ -9,291 +8,282 @@
    xmlns:xlink="http://www.w3.org/1999/xlink"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="64px"
-   height="64px"
-   id="svg2383"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docname="endorphin.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/jbache/icon/endorphin-16.png"
+   version="1.1"
+   inkscape:export-ydpi="22.5"
    inkscape:export-xdpi="22.5"
-   inkscape:export-ydpi="22.5">
+   inkscape:export-filename="/home/jbache/icon/endorphin-16.png"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docname="endorphin.svg"
+   inkscape:version="1.0 (4035a4fb49, 2020-05-01)"
+   sodipodi:version="0.32"
+   id="svg2383"
+   height="64px"
+   width="64px">
   <defs
      id="defs2385">
     <linearGradient
        id="linearGradient4736">
       <stop
-         style="stop-color:#c7cde6;stop-opacity:1;"
+         id="stop4738"
          offset="0"
-         id="stop4738" />
+         style="stop-color:#c7cde6;stop-opacity:1;" />
       <stop
-         style="stop-color:#adbeff;stop-opacity:0;"
+         id="stop4740"
          offset="1"
-         id="stop4740" />
+         style="stop-color:#adbeff;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3536">
       <stop
-         style="stop-color:#5e86c1;stop-opacity:1;"
+         id="stop3538"
          offset="0"
-         id="stop3538" />
+         style="stop-color:#5e86c1;stop-opacity:1;" />
       <stop
-         style="stop-color:#103070;stop-opacity:1;"
+         id="stop3540"
          offset="1"
-         id="stop3540" />
+         style="stop-color:#103070;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3447">
       <stop
-         style="stop-color:#dbdbdb;stop-opacity:1;"
+         id="stop3449"
          offset="0"
-         id="stop3449" />
+         style="stop-color:#dbdbdb;stop-opacity:1;" />
       <stop
-         style="stop-color:#cbcbcb;stop-opacity:0;"
+         id="stop3451"
          offset="1"
-         id="stop3451" />
+         style="stop-color:#cbcbcb;stop-opacity:0;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3265">
       <stop
-         id="stop3267"
+         style="stop-color:#7c7c7c;stop-opacity:1;"
          offset="0"
-         style="stop-color:#7c7c7c;stop-opacity:1;" />
+         id="stop3267" />
       <stop
-         id="stop3269"
+         style="stop-color:#c8d1d2;stop-opacity:1;"
          offset="1"
-         style="stop-color:#c8d1d2;stop-opacity:1;" />
+         id="stop3269" />
     </linearGradient>
     <linearGradient
        id="linearGradient3217">
       <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
+         id="stop3219"
          offset="0"
-         id="stop3219" />
+         style="stop-color:#ffffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#c7d0d2;stop-opacity:1;"
+         id="stop3221"
          offset="1"
-         id="stop3221" />
+         style="stop-color:#c7d0d2;stop-opacity:1;" />
     </linearGradient>
     <linearGradient
        id="linearGradient3207">
       <stop
-         style="stop-color:#eaffff;stop-opacity:1;"
+         id="stop3209"
          offset="0"
-         id="stop3209" />
+         style="stop-color:#eaffff;stop-opacity:1;" />
       <stop
-         style="stop-color:#016792;stop-opacity:1;"
+         id="stop3211"
          offset="1"
-         id="stop3211" />
+         style="stop-color:#016792;stop-opacity:1;" />
     </linearGradient>
     <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 32 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="64 : 32 : 1"
+       id="perspective2391"
        inkscape:persp3d-origin="32 : 21.333333 : 1"
-       id="perspective2391" />
+       inkscape:vp_z="64 : 32 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_x="0 : 32 : 1"
+       sodipodi:type="inkscape:persp3d" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3207"
-       id="radialGradient3215"
-       cx="20.594498"
-       cy="30.985296"
-       fx="20.594498"
-       fy="30.985296"
+       gradientUnits="userSpaceOnUse"
        r="19.334753"
-       gradientUnits="userSpaceOnUse" />
+       fy="30.985296"
+       fx="20.594498"
+       cy="30.985296"
+       cx="20.594498"
+       id="radialGradient3215"
+       xlink:href="#linearGradient3207"
+       inkscape:collect="always" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3536"
-       id="radialGradient3542"
-       cx="23.45262"
-       cy="30.030596"
-       fx="23.45262"
-       fy="30.030596"
-       r="7.9169221"
+       gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(1.9707478,-1.8366141e-2,1.1251232e-2,1.4372967,-23.269368,-16.033148)"
-       gradientUnits="userSpaceOnUse" />
+       r="7.9169221"
+       fy="30.030596"
+       fx="23.45262"
+       cy="30.030596"
+       cx="23.45262"
+       id="radialGradient3542"
+       xlink:href="#linearGradient3536"
+       inkscape:collect="always" />
     <filter
-       inkscape:collect="always"
-       id="filter4316"
-       x="-0.21071652"
-       width="1.421433"
+       height="1.3186306"
        y="-0.15931528"
-       height="1.3186306">
+       width="1.421433"
+       x="-0.21071652"
+       id="filter4316"
+       inkscape:collect="always">
       <feGaussianBlur
-         inkscape:collect="always"
+         id="feGaussianBlur4318"
          stdDeviation="0.23850654"
-         id="feGaussianBlur4318" />
+         inkscape:collect="always" />
     </filter>
     <filter
-       inkscape:collect="always"
-       id="filter4384"
-       x="-0.17884872"
-       width="1.3576974"
+       height="1.2528456"
        y="-0.1264228"
-       height="1.2528456">
+       width="1.3576974"
+       x="-0.17884872"
+       id="filter4384"
+       inkscape:collect="always">
       <feGaussianBlur
-         inkscape:collect="always"
+         id="feGaussianBlur4386"
          stdDeviation="0.25371455"
-         id="feGaussianBlur4386" />
+         inkscape:collect="always" />
     </filter>
     <filter
-       inkscape:collect="always"
-       id="filter4654">
+       id="filter4654"
+       inkscape:collect="always">
       <feGaussianBlur
-         inkscape:collect="always"
+         id="feGaussianBlur4656"
          stdDeviation="0.57831467"
-         id="feGaussianBlur4656" />
+         inkscape:collect="always" />
     </filter>
     <filter
-       inkscape:collect="always"
-       id="filter4788">
+       id="filter4788"
+       inkscape:collect="always">
       <feGaussianBlur
-         inkscape:collect="always"
+         id="feGaussianBlur4790"
          stdDeviation="0.34061157"
-         id="feGaussianBlur4790" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter4812"
-       x="-0.15308"
-       width="1.30616"
-       y="-0.047069354"
-       height="1.0941387">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.40474704"
-         id="feGaussianBlur4814" />
+         inkscape:collect="always" />
     </filter>
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3207"
-       id="radialGradient3350"
-       gradientUnits="userSpaceOnUse"
-       cx="20.594498"
-       cy="30.985296"
-       fx="20.594498"
+       r="19.334753"
        fy="30.985296"
-       r="19.334753" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3217"
-       id="radialGradient3371"
+       fx="20.594498"
+       cy="30.985296"
+       cx="20.594498"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.190409,-1.3563182,0.4144609,0.3637627,-10.494798,36.63006)"
-       cx="21.118898"
-       cy="16.672932"
-       fx="21.118898"
-       fy="16.672932"
-       r="16.475277" />
+       id="radialGradient3350"
+       xlink:href="#linearGradient3207"
+       inkscape:collect="always" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3536"
-       id="radialGradient3376"
+       r="16.475277"
+       fy="16.672932"
+       fx="21.118898"
+       cy="16.672932"
+       cx="21.118898"
+       gradientTransform="matrix(1.190409,-1.3563182,0.4144609,0.3637627,-10.494798,36.63006)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0773698,-2.7724561e-2,1.7569068e-2,2.1696674,-48.645895,-43.130087)"
-       cx="23.45262"
-       cy="30.030596"
-       fx="23.45262"
+       id="radialGradient3371"
+       xlink:href="#linearGradient3217"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.9169221"
        fy="30.030596"
-       r="7.9169221" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3536"
-       id="linearGradient3380"
+       fx="23.45262"
+       cy="30.030596"
+       cx="23.45262"
+       gradientTransform="matrix(3.0773698,-2.7724561e-2,1.7569068e-2,2.1696674,-48.645895,-43.130087)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5736688,0,0,1.3851572,-11.304863,-9.0360665)"
-       x1="15.659304"
-       y1="25.818771"
+       id="radialGradient3376"
+       xlink:href="#linearGradient3536"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="37.90387"
        x2="22.89031"
-       y2="37.90387" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3265"
-       id="radialGradient3384"
+       y1="25.818771"
+       x1="15.659304"
+       gradientTransform="matrix(1.5736688,0,0,1.3851572,-11.304863,-9.0360665)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5119908,0,0,1.9265069,-16.649017,-31.851372)"
-       cx="17.947458"
-       cy="27.263075"
-       fx="17.947458"
-       fy="27.263075"
-       r="1.4711967" />
+       id="linearGradient3380"
+       xlink:href="#linearGradient3536"
+       inkscape:collect="always" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3217"
-       id="radialGradient3990"
+       r="1.4711967"
+       fy="27.263075"
+       fx="17.947458"
+       cy="27.263075"
+       cx="17.947458"
+       gradientTransform="matrix(1.5119908,0,0,1.9265069,-16.649017,-31.851372)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.190409,-1.3563182,0.4144609,0.3637627,-10.494798,36.63006)"
-       cx="21.118898"
-       cy="16.672932"
-       fx="21.118898"
-       fy="16.672932"
-       r="16.475277" />
+       id="radialGradient3384"
+       xlink:href="#linearGradient3265"
+       inkscape:collect="always" />
     <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3536"
-       id="radialGradient3995"
+       r="16.475277"
+       fy="16.672932"
+       fx="21.118898"
+       cy="16.672932"
+       cx="21.118898"
+       gradientTransform="matrix(1.190409,-1.3563182,0.4144609,0.3637627,-10.494798,36.63006)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.0773698,-2.7724561e-2,1.7569068e-2,2.1696674,-48.645895,-43.130087)"
-       cx="23.45262"
-       cy="30.030596"
-       fx="23.45262"
+       id="radialGradient3990"
+       xlink:href="#linearGradient3217"
+       inkscape:collect="always" />
+    <radialGradient
+       r="7.9169221"
        fy="30.030596"
-       r="7.9169221" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3536"
-       id="linearGradient3999"
+       fx="23.45262"
+       cy="30.030596"
+       cx="23.45262"
+       gradientTransform="matrix(3.0773698,-2.7724561e-2,1.7569068e-2,2.1696674,-48.645895,-43.130087)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5736688,0,0,1.3851572,-11.304863,-9.0360665)"
-       x1="15.659304"
-       y1="25.818771"
+       id="radialGradient3995"
+       xlink:href="#linearGradient3536"
+       inkscape:collect="always" />
+    <linearGradient
+       y2="37.90387"
        x2="22.89031"
-       y2="37.90387" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3265"
-       id="radialGradient4003"
+       y1="25.818771"
+       x1="15.659304"
+       gradientTransform="matrix(1.5736688,0,0,1.3851572,-11.304863,-9.0360665)"
        gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5119908,0,0,1.9265069,-16.649017,-31.851372)"
-       cx="17.947458"
-       cy="27.263075"
-       fx="17.947458"
+       id="linearGradient3999"
+       xlink:href="#linearGradient3536"
+       inkscape:collect="always" />
+    <radialGradient
+       r="1.4711967"
        fy="27.263075"
-       r="1.4711967" />
+       fx="17.947458"
+       cy="27.263075"
+       cx="17.947458"
+       gradientTransform="matrix(1.5119908,0,0,1.9265069,-16.649017,-31.851372)"
+       gradientUnits="userSpaceOnUse"
+       id="radialGradient4003"
+       xlink:href="#linearGradient3265"
+       inkscape:collect="always" />
     <filter
-       inkscape:collect="always"
-       id="filter4028"
-       x="-0.15308"
-       width="1.30616"
+       height="1.0941387"
        y="-0.047069354"
-       height="1.0941387">
+       width="1.30616"
+       x="-0.15308"
+       id="filter4028"
+       inkscape:collect="always">
       <feGaussianBlur
-         inkscape:collect="always"
+         id="feGaussianBlur4030"
          stdDeviation="0.40474704"
-         id="feGaussianBlur4030" />
+         inkscape:collect="always" />
     </filter>
   </defs>
   <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.313708"
-     inkscape:cx="12.420297"
-     inkscape:cy="32"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:document-units="px"
+     inkscape:window-maximized="1"
+     inkscape:document-rotation="0"
+     inkscape:window-y="27"
+     inkscape:window-x="72"
+     inkscape:window-height="1016"
+     inkscape:window-width="1848"
      inkscape:grid-bbox="true"
-     inkscape:window-width="1603"
-     inkscape:window-height="893"
-     inkscape:window-x="107"
-     inkscape:window-y="25" />
+     inkscape:document-units="px"
+     showgrid="true"
+     inkscape:current-layer="layer1"
+     inkscape:cy="32"
+     inkscape:cx="26.669396"
+     inkscape:zoom="11.313708"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0"
+     borderopacity="1.0"
+     bordercolor="#666666"
+     pagecolor="#ffffff"
+     id="base" />
   <metadata
      id="metadata2388">
     <rdf:RDF>
@@ -321,234 +311,234 @@
     </rdf:RDF>
   </metadata>
   <g
-     id="layer1"
+     inkscape:groupmode="layer"
      inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
+     id="layer1">
     <g
-       id="g4582"
+       style="opacity:0.30638296;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter4654)"
        transform="matrix(1.6131049,0,0,1.6131049,-11.967563,-18.602963)"
-       style="opacity:0.30638296;fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter4654)">
+       id="g4582">
       <path
-         sodipodi:nodetypes="cccc"
-         id="path4584"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8725009;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 14.371293,27.532931 C 14.710109,27.324179 14.319648,26.766879 14.50694,26.282521 C 14.765426,25.448405 15.25193,25.148043 15.665638,24.678078 C 16.417988,25.252628 16.127157,26.23141 16.000181,27.495992"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8725009;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="path4584"
+         sodipodi:nodetypes="cccc" />
       <path
-         transform="matrix(0.7572962,0,0,0.7572962,4.7171145,9.0365597)"
-         d="M 50.718842,35.908577 A 18.834753,18.834753 0 1 1 13.049335,35.908577 A 18.834753,18.834753 0 1 1 50.718842,35.908577 z"
-         sodipodi:ry="18.834753"
-         sodipodi:rx="18.834753"
-         sodipodi:cy="35.908577"
-         sodipodi:cx="31.884089"
-         id="path4586"
+         sodipodi:type="arc"
          style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.86756015;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
+         id="path4586"
+         sodipodi:cx="31.884089"
+         sodipodi:cy="35.908577"
+         sodipodi:rx="18.834753"
+         sodipodi:ry="18.834753"
+         d="M 50.718842,35.908577 A 18.834753,18.834753 0 1 1 13.049335,35.908577 A 18.834753,18.834753 0 1 1 50.718842,35.908577 z"
+         transform="matrix(0.7572962,0,0,0.7572962,4.7171145,9.0365597)" />
       <path
-         id="path4588"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 21.723931,35.702199 C 21.716935,37.075819 22.786476,38.263673 23.92922,39.228449 C 24.365293,39.645191 24.135093,40.470441 23.370945,40.510436 C 22.705891,40.579255 22.278279,41.297281 22.749732,41.708007 C 23.076912,42.301838 23.431499,42.889922 23.883649,43.430775 C 24.125568,43.88821 23.451976,44.134644 23.156778,44.435784 C 22.882669,44.816099 23.290948,45.361108 22.80825,45.706653 C 22.356523,45.991569 21.788539,45.682515 21.413234,45.454138 C 20.945913,45.143342 20.39412,44.816018 19.746948,44.873873 C 19.274508,45.085951 18.679911,45.617729 18.151757,45.151938 C 17.801019,44.809579 17.776807,44.328726 17.399615,43.997449 C 16.821097,43.216793 16.438585,42.333438 16.456987,41.42218 C 16.423264,40.38878 16.599757,39.359911 16.612318,38.327467 C 16.675935,37.712345 17.080611,37.171596 17.341203,36.604217 C 17.559651,35.997468 17.856419,35.2526 18.719971,35.056344 C 19.59493,34.887876 20.3507,35.392229 21.150814,35.574754 C 21.338311,35.626307 21.529276,35.670698 21.723931,35.702199 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         id="path4588" />
       <path
-         sodipodi:nodetypes="cccccccccccccccccccccccc"
-         id="path4590"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 35.280451,34.235092 C 34.299476,35.109172 33.243358,36.184531 31.887476,36.136952 C 31.410018,37.146163 32.33483,37.98621 32.895077,38.65891 C 33.647098,39.752078 34.799223,40.797574 34.696519,42.305028 C 34.12334,43.234611 34.524108,44.567216 33.6901,45.365487 C 32.985558,45.855334 32.881143,47.773128 33.925854,46.698632 C 34.842838,45.967794 35.865155,45.403863 36.906035,44.932744 C 37.964119,44.049746 38.718168,42.813971 39.76906,41.920884 C 40.660596,40.91243 41.501625,39.848933 42.375047,38.824326 C 43.159662,37.605524 41.159806,37.336026 40.494615,37.063831 C 39.664938,35.376268 38.873754,37.018805 38.838729,35.547119 C 38.692424,34.461989 38.822089,34.048678 39.247499,33.217933 C 39.76862,32.500346 39.47467,31.596919 39.083762,30.908361 C 38.69846,29.907323 38.633424,28.808236 38.340978,27.777233 C 37.494922,27.342734 37.152348,28.987843 36.764442,29.587481 C 36.634083,30.475144 35.677482,30.958133 35.287922,29.969957 C 34.463082,29.002064 33.172861,28.81486 32.25561,27.975094 C 31.257836,27.17887 30.238972,26.407455 29.187235,25.706806 C 28.631803,25.202111 27.725932,23.626697 27.099141,24.542659 C 26.884882,25.818778 27.227268,27.231443 26.544248,28.387923 C 26.004078,29.781956 27.510338,30.403489 27.727334,31.864513 C 27.771382,33.205689 27.650481,34.57809 28.659727,34.192313 C 29.688532,34.000624 30.736926,33.980888 31.753428,33.692787 C 32.906207,33.471141 34.376514,33.217935 35.280451,34.235092 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         id="path4590"
+         sodipodi:nodetypes="cccccccccccccccccccccccc" />
       <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         id="path4592"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 39.923783,32.787084 C 38.614736,35.274688 37.772365,34.879387 38.868821,36.156863 C 40.257442,37.646591 41.639348,35.482663 43.213123,34.376933 C 43.182182,31.608406 42.492165,30.669326 41.907894,29.191587 C 40.993949,25.539415 41.861298,25.466991 41.732495,24.273162 C 41.435039,20.581507 40.823658,19.499217 37.446579,16.630506 C 35.153445,15.752123 31.34721,15.234465 29.711364,15.332571 C 27.606019,15.235767 24.458376,19.831738 23.060208,21.823266 C 20.459174,24.540654 19.962944,24.690013 17.415108,27.512956 C 16.055358,29.494663 16.206353,29.367704 15.78981,32.144216 C 13.859739,38.823332 13.794152,37.455459 16.363136,38.352405 C 17.983369,37.33563 20.04289,34.295421 21.828338,33.584213 C 22.172272,30.710318 24.992675,30.674999 27.252756,29.002315 C 28.14034,28.87651 29.989014,28.628611 30.875302,30.447317 C 32.782289,33.347132 30.941671,42.456739 35.308094,37.098708 C 35.466389,35.068227 35.207618,37.05978 34.985074,34.977795 C 34.777229,32.836737 36.163227,30.518542 35.368127,28.537656 C 34.748537,27.243735 34.150883,27.217018 32.865574,24.880343"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="path4592"
+         sodipodi:nodetypes="cccccccccccccccccc" />
       <path
-         transform="matrix(1.1599619,-0.6165902,0.6730581,1.0626441,-12.182788,5.040139)"
-         d="M 25.970104,35.78001 A 11.34585,7.1996326 0 1 1 3.2784042,35.78001 A 11.34585,7.1996326 0 1 1 25.970104,35.78001 z"
-         sodipodi:ry="7.1996326"
-         sodipodi:rx="11.34585"
-         sodipodi:cy="35.78001"
-         sodipodi:cx="14.624254"
-         id="path4594"
+         sodipodi:type="arc"
          style="opacity:0.11063831;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         sodipodi:type="arc" />
+         id="path4594"
+         sodipodi:cx="14.624254"
+         sodipodi:cy="35.78001"
+         sodipodi:rx="11.34585"
+         sodipodi:ry="7.1996326"
+         d="M 25.970104,35.78001 A 11.34585,7.1996326 0 1 1 3.2784042,35.78001 A 11.34585,7.1996326 0 1 1 25.970104,35.78001 z"
+         transform="matrix(1.1599619,-0.6165902,0.6730581,1.0626441,-12.182788,5.040139)" />
       <path
-         sodipodi:nodetypes="cccccccccccccccccc"
-         id="path4596"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 40.433653,31.408807 C 38.955311,33.896411 38.003999,33.50111 39.242256,34.778586 C 40.810464,36.268314 42.371087,34.104386 44.148392,32.998656 C 44.11345,30.230129 43.334196,29.291049 42.674363,27.81331 C 41.642221,24.161138 42.62174,24.088714 42.476279,22.894885 C 42.140355,19.20323 41.449907,18.12094 37.636081,15.252229 C 35.046383,14.373846 30.747901,13.856188 28.900497,13.954294 C 26.522875,13.85749 22.968157,18.453461 21.389169,20.444989 C 18.451752,23.162377 17.891346,23.311736 15.014007,26.134679 C 13.478404,28.116386 13.648928,27.989427 13.178514,30.765939 C 10.998834,37.445055 10.924764,36.077182 13.825988,36.974128 C 15.65576,35.957353 17.981632,32.917144 19.997985,32.205936 C 20.3864,29.332041 23.571556,29.296722 26.123925,27.624038 C 27.126298,27.498233 29.214054,27.250334 30.214963,29.06904 C 32.368574,31.968855 30.289915,41.078462 35.221033,35.720431 C 35.399799,33.68995 35.107562,35.681503 34.856238,33.599518 C 34.621513,31.45846 36.186757,29.140265 35.28883,27.159379 C 34.589111,25.865458 33.914164,25.838741 32.46263,23.502066"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="path4596"
+         sodipodi:nodetypes="cccccccccccccccccc" />
       <path
-         sodipodi:nodetypes="cc"
-         id="path4598"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 35.268253,22.805321 C 36.206343,24.283062 35.453117,25.596138 35.869601,27.359013"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="path4598"
+         sodipodi:nodetypes="cc" />
       <path
-         id="path4600"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 34.133973,20.866487 C 34.712514,22.2807 35.098209,22.923524 35.355339,23.823479 C 35.612469,24.723433 35.483904,26.523341 35.483904,26.523341 L 33.941125,24.65915 L 34.133973,20.866487 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         id="path4600" />
       <path
-         sodipodi:nodetypes="cc"
-         id="path4602"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 35.741033,26.973318 C 37.219445,28.972262 39.355302,30.451291 40.10222,31.2639"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.69999999;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="path4602"
+         sodipodi:nodetypes="cc" />
       <path
-         sodipodi:nodetypes="cc"
-         id="path4604"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.55304056;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 14.166615,30.37313 C 14.663119,30.96025 14.625662,31.160689 15.556332,30.482864"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.55304056;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="path4604"
+         sodipodi:nodetypes="cc" />
       <path
-         sodipodi:nodetypes="cccc"
-         id="path4606"
+         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 13.119717,35.595267 C 12.81066,36.685127 12.847668,36.589489 11.681572,35.843862 L 12.249948,33.992556 C 13.183893,33.946971 12.766637,34.563042 13.119717,35.595267 z"
-         style="opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         id="path4606"
+         sodipodi:nodetypes="cccc" />
       <path
-         sodipodi:nodetypes="ccsc"
-         transform="matrix(1.3532078,0,0,1.5930591,-11.463268,-11.435411)"
-         id="path4608"
+         style="opacity:0.18297873;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4384)"
          d="M 38.686481,26.70957 C 40.893033,27.758305 36.702359,24.120051 36.685925,24.054314 C 36.596421,23.64407 36.467914,23.154928 36.364883,22.668486 C 36.269137,22.216441 36.195392,21.766728 36.195392,21.384828"
-         style="opacity:0.18297873;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4384)" />
+         id="path4608"
+         transform="matrix(1.3532078,0,0,1.5930591,-11.463268,-11.435411)"
+         sodipodi:nodetypes="ccsc" />
       <path
-         sodipodi:nodetypes="ccc"
-         transform="matrix(0.741485,0,0,1.5982971,5.0201391,-7.4791344)"
-         id="path4610"
+         style="opacity:0.40851063;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4316)"
          d="M 37.614083,26.742648 C 37.437449,26.276207 36.757388,23.748919 36.727682,23.277249 C 36.727682,22.893847 33.433303,21.339508 33.433303,21.154901"
-         style="opacity:0.40851063;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4316)" />
+         id="path4610"
+         transform="matrix(0.741485,0,0,1.5982971,5.0201391,-7.4791344)"
+         sodipodi:nodetypes="ccc" />
       <path
-         sodipodi:nodetypes="cc"
-         id="path4612"
+         style="opacity:0.25531915;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
          d="M 17.613387,28.066119 C 18.02298,27.856607 18.744615,27.278131 18.834754,26.780471"
-         style="opacity:0.25531915;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
+         id="path4612"
+         sodipodi:nodetypes="cc" />
       <path
-         sodipodi:nodetypes="cssscccssssc"
-         id="path4614"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 28.541401,14.37396 C 28.541401,14.37396 35.548186,14.502525 37.476659,15.595327 C 39.405132,16.688128 42.169277,18.745166 42.169277,23.052089 C 42.169277,27.359012 41.7193,25.880516 41.847865,26.909035 C 41.97643,27.937554 43.454926,30.701699 43.454926,30.701699 L 43.712056,32.758737 L 41.333606,34.68721 C 41.333606,34.68721 40.433652,34.108668 40.690781,33.530126 C 40.947911,32.951584 42.49139,32.244361 42.362124,31.473088 C 42.23308,30.703137 39.430795,27.169716 39.790826,26.201928 C 43.106639,17.288793 31.790463,14.016383 24.81302,16.816693 C 24.81302,16.816693 27.19147,13.731136 28.541401,14.37396 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         id="path4614"
+         sodipodi:nodetypes="cssscccssssc" />
       <path
-         sodipodi:nodetypes="csssssc"
-         id="path4616"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
          d="M 29.762767,22.152135 C 29.762767,22.152135 34.32682,25.816234 34.969644,27.616142 C 35.612469,29.41605 34.776797,30.573134 34.455385,31.730218 C 34.133973,32.887302 34.712515,34.365798 34.776797,34.880057 C 34.84108,35.394317 34.391103,36.165706 33.812561,36.422836 C 33.384913,36.612902 33.594124,29.434594 33.748278,28.387531 C 33.862569,27.611232 29.955614,23.502066 29.762767,22.152135 z"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+         id="path4616"
+         sodipodi:nodetypes="csssssc" />
       <path
-         sodipodi:nodetypes="cccc"
-         id="path4618"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.71399999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
          d="M 17.004565,27.773372 C 17.366038,27.642339 17.566698,27.292522 17.766515,26.988492 C 18.042287,26.464918 18.561326,26.276381 19.002701,25.981385 C 19.805364,26.342029 19.495083,26.95641 19.359616,27.750186"
-         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.71399999;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+         id="path4618"
+         sodipodi:nodetypes="cccc" />
     </g>
     <path
-       style="fill:url(#radialGradient4003);fill-opacity:1;fill-rule:evenodd;stroke:#99a2b5;stroke-width:1.4074353;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 9.5090016,22.973713 C 10.055548,22.636975 9.4256925,21.737991 9.7278156,20.95667 C 10.14478,19.611154 10.929561,19.126639 11.596916,18.368536 C 12.810535,19.295346 12.341395,20.874223 12.136569,22.914126"
+       sodipodi:nodetypes="cccc"
        id="path3606"
-       sodipodi:nodetypes="cccc" />
+       d="M 9.5090016,22.973713 C 10.055548,22.636975 9.4256925,21.737991 9.7278156,20.95667 C 10.14478,19.611154 10.929561,19.126639 11.596916,18.368536 C 12.810535,19.295346 12.341395,20.874223 12.136569,22.914126"
+       style="fill:url(#radialGradient4003);fill-opacity:1;fill-rule:evenodd;stroke:#99a2b5;stroke-width:1.4074353;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3350);fill-opacity:1;fill-rule:nonzero;stroke:#1d386c;stroke-width:1.23112547;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2395"
-       sodipodi:cx="31.884089"
-       sodipodi:cy="35.908577"
-       sodipodi:rx="18.834753"
-       sodipodi:ry="18.834753"
+       transform="matrix(1.2215982,0,0,1.2215982,-6.0641998,-6.8628725)"
        d="M 50.718842,35.908577 A 18.834753,18.834753 0 1 1 13.049335,35.908577 A 18.834753,18.834753 0 1 1 50.718842,35.908577 z"
-       transform="matrix(1.2215982,0,0,1.2215982,-6.0641998,-6.8628725)" />
+       sodipodi:ry="18.834753"
+       sodipodi:rx="18.834753"
+       sodipodi:cy="35.908577"
+       sodipodi:cx="31.884089"
+       id="path2395"
+       style="fill:url(#radialGradient3350);fill-opacity:1;fill-rule:nonzero;stroke:#1d386c;stroke-width:1.23112547;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
     <path
-       style="fill:url(#linearGradient3999);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       id="path3548"
        d="M 21.369578,34.202943 C 21.358293,36.683261 23.083574,38.828146 24.926941,40.570221 C 25.630372,41.322726 25.259036,42.812862 24.026384,42.88508 C 22.953582,43.009344 22.263799,44.305871 23.024302,45.04751 C 23.552079,46.119779 24.124064,47.18167 24.85343,48.158277 C 25.24367,48.984258 24.157096,49.429239 23.68091,49.973001 C 23.238743,50.659729 23.89734,51.643841 23.118698,52.267784 C 22.390015,52.782252 21.473797,52.224198 20.86839,51.811824 C 20.114554,51.250625 19.224454,50.659582 18.180497,50.76405 C 17.418402,51.146995 16.459255,52.107216 15.607286,51.266146 C 15.041509,50.647956 15.002454,49.77969 14.394002,49.181508 C 13.460792,47.771894 12.84376,46.176838 12.873445,44.531398 C 12.819047,42.665409 13.103748,40.807601 13.124011,38.943337 C 13.226631,37.832623 13.879416,36.856203 14.299778,35.831698 C 14.652158,34.736104 15.130876,33.391111 16.523875,33.036736 C 17.935276,32.732537 19.154412,33.643238 20.44508,33.97282 C 20.747532,34.065907 21.055579,34.146063 21.369578,34.202943 z"
-       id="path3548" />
+       style="fill:url(#linearGradient3999);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       sodipodi:type="arc"
-       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bbbdeb;stroke-width:0.86756015;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36040608"
-       id="path4706"
-       sodipodi:cx="31.884089"
-       sodipodi:cy="35.908577"
-       sodipodi:rx="18.834753"
-       sodipodi:ry="18.834753"
+       transform="matrix(1.1487654,0,0,1.1342651,-3.7409149,-3.2921731)"
        d="M 50.718842,35.908577 A 18.834753,18.834753 0 1 1 13.049335,35.908577 A 18.834753,18.834753 0 1 1 50.718842,35.908577 z"
-       transform="matrix(1.1487654,0,0,1.1342651,-3.7409149,-3.2921731)" />
+       sodipodi:ry="18.834753"
+       sodipodi:rx="18.834753"
+       sodipodi:cy="35.908577"
+       sodipodi:cx="31.884089"
+       id="path4706"
+       style="fill:none;fill-opacity:1;fill-rule:nonzero;stroke:#bbbdeb;stroke-width:0.86756015;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.36040608"
+       sodipodi:type="arc" />
     <path
-       style="fill:url(#radialGradient3995);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 42.781052,32.752204 C 41.249236,34.07167 39.600081,35.694975 37.482839,35.623153 C 36.737277,37.146605 38.181394,38.414696 39.056233,39.430168 C 40.230532,41.080357 42.029602,42.658582 41.869227,44.934154 C 40.974195,46.337406 41.600003,48.349035 40.297679,49.554063 C 39.19752,50.29351 39.034475,53.188512 40.665815,51.56651 C 42.097709,50.463275 43.69408,49.611993 45.319439,48.900818 C 46.971663,47.56789 48.14913,45.702429 49.790122,44.354272 C 51.182276,42.831963 52.495564,41.226563 53.859434,39.679871 C 55.084628,37.840031 51.961805,37.433212 50.923092,37.022321 C 49.627534,34.474864 48.39208,36.954351 48.337387,34.732772 C 48.10893,33.094716 48.311403,32.470804 48.975692,31.216755 C 49.789434,30.133524 49.330425,28.769757 48.720013,27.730347 C 48.118355,26.219232 48.0168,24.560108 47.560138,23.003761 C 46.239001,22.347865 45.704063,24.831234 45.09834,25.736416 C 44.89478,27.076385 43.401025,27.80548 42.792718,26.313782 C 41.50471,24.852701 39.489999,24.570109 38.05769,23.30244 C 36.499642,22.100503 34.90866,20.936016 33.266347,19.878353 C 32.399028,19.116492 30.984489,16.73833 30.00574,18.121019 C 29.671168,20.04738 30.205812,22.179865 29.139259,23.925626 C 28.295773,26.029985 30.647833,26.968219 30.986678,29.173704 C 31.05546,31.198272 30.86667,33.269977 32.442632,32.687628 C 34.049136,32.398265 35.686229,32.368472 37.273519,31.93357 C 39.073612,31.598984 41.369533,31.216758 42.781052,32.752204 z"
+       sodipodi:nodetypes="cccccccccccccccccccccccc"
        id="path3528"
-       sodipodi:nodetypes="cccccccccccccccccccccccc" />
+       d="M 42.781052,32.752204 C 41.249236,34.07167 39.600081,35.694975 37.482839,35.623153 C 36.737277,37.146605 38.181394,38.414696 39.056233,39.430168 C 40.230532,41.080357 42.029602,42.658582 41.869227,44.934154 C 40.974195,46.337406 41.600003,48.349035 40.297679,49.554063 C 39.19752,50.29351 39.034475,53.188512 40.665815,51.56651 C 42.097709,50.463275 43.69408,49.611993 45.319439,48.900818 C 46.971663,47.56789 48.14913,45.702429 49.790122,44.354272 C 51.182276,42.831963 52.495564,41.226563 53.859434,39.679871 C 55.084628,37.840031 51.961805,37.433212 50.923092,37.022321 C 49.627534,34.474864 48.39208,36.954351 48.337387,34.732772 C 48.10893,33.094716 48.311403,32.470804 48.975692,31.216755 C 49.789434,30.133524 49.330425,28.769757 48.720013,27.730347 C 48.118355,26.219232 48.0168,24.560108 47.560138,23.003761 C 46.239001,22.347865 45.704063,24.831234 45.09834,25.736416 C 44.89478,27.076385 43.401025,27.80548 42.792718,26.313782 C 41.50471,24.852701 39.489999,24.570109 38.05769,23.30244 C 36.499642,22.100503 34.90866,20.936016 33.266347,19.878353 C 32.399028,19.116492 30.984489,16.73833 30.00574,18.121019 C 29.671168,20.04738 30.205812,22.179865 29.139259,23.925626 C 28.295773,26.029985 30.647833,26.968219 30.986678,29.173704 C 31.05546,31.198272 30.86667,33.269977 32.442632,32.687628 C 34.049136,32.398265 35.686229,32.368472 37.273519,31.93357 C 39.073612,31.598984 41.369533,31.216758 42.781052,32.752204 z"
+       style="fill:url(#radialGradient3995);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:#001b52;fill-opacity:0.26943006;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 49.93235,30.388552 C 47.82072,34.401319 46.727054,33.189132 48.495752,35.249835 C 50.735744,37.652922 53.495233,35.797464 56.033898,34.013806 C 55.983985,29.547881 54.870916,28.033047 53.928426,25.649299 C 52.454137,19.757964 53.853262,19.641135 53.645489,17.715364 C 53.165661,11.760338 52.179439,10.014491 46.731858,5.3869589 C 43.032791,3.9700351 36.892935,3.1349984 34.254145,3.2932536 C 30.858002,3.1370986 25.780525,10.550881 23.525133,13.763425 C 19.329393,18.146857 18.528921,18.387788 14.418995,22.941492 C 12.225576,26.138193 12.469147,25.933394 11.797219,30.412199 C 8.6838122,41.186314 8.5780129,38.979792 12.722053,40.426658 C 15.33566,38.786494 18.657883,33.882319 21.537997,32.735065 C 22.092799,28.099171 26.642405,28.042198 30.288151,25.343983 C 31.719919,25.141047 32.97845,25.359878 34.408125,28.293641 C 36.600412,35.711386 35.973593,45.014448 43.017092,36.371383 C 43.272437,33.096004 44.666975,37.899578 44.307987,34.541118 C 43.972712,31.087367 46.120083,27.966594 44.837503,24.771217 C 43.83804,22.683987 41.415554,22.464112 39.342216,18.69481"
+       sodipodi:nodetypes="cccccccccccccccccc"
        id="path4556"
-       sodipodi:nodetypes="cccccccccccccccccc" />
+       d="M 49.93235,30.388552 C 47.82072,34.401319 46.727054,33.189132 48.495752,35.249835 C 50.735744,37.652922 53.495233,35.797464 56.033898,34.013806 C 55.983985,29.547881 54.870916,28.033047 53.928426,25.649299 C 52.454137,19.757964 53.853262,19.641135 53.645489,17.715364 C 53.165661,11.760338 52.179439,10.014491 46.731858,5.3869589 C 43.032791,3.9700351 36.892935,3.1349984 34.254145,3.2932536 C 30.858002,3.1370986 25.780525,10.550881 23.525133,13.763425 C 19.329393,18.146857 18.528921,18.387788 14.418995,22.941492 C 12.225576,26.138193 12.469147,25.933394 11.797219,30.412199 C 8.6838122,41.186314 8.5780129,38.979792 12.722053,40.426658 C 15.33566,38.786494 18.657883,33.882319 21.537997,32.735065 C 22.092799,28.099171 26.642405,28.042198 30.288151,25.343983 C 31.719919,25.141047 32.97845,25.359878 34.408125,28.293641 C 36.600412,35.711386 35.973593,45.014448 43.017092,36.371383 C 43.272437,33.096004 44.666975,37.899578 44.307987,34.541118 C 43.972712,31.087367 46.120083,27.966594 44.837503,24.771217 C 43.83804,22.683987 41.415554,22.464112 39.342216,18.69481"
+       style="fill:#001b52;fill-opacity:0.26943006;fill-rule:evenodd;stroke:none;stroke-width:0.89999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       sodipodi:type="arc"
-       style="opacity:0.21645023;fill:#d6d6d6;fill-opacity:0.5076142;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path4093"
-       sodipodi:cx="14.624254"
-       sodipodi:cy="35.78001"
-       sodipodi:rx="11.34585"
-       sodipodi:ry="7.1996326"
+       transform="matrix(1.8711401,-0.9946246,1.0857133,1.7141564,-33.182923,-13.594701)"
        d="M 25.970104,35.78001 A 11.34585,7.1996326 0 1 1 3.2784042,35.78001 A 11.34585,7.1996326 0 1 1 25.970104,35.78001 z"
-       transform="matrix(1.8711401,-0.9946246,1.0857133,1.7141564,-33.182923,-13.594701)" />
+       sodipodi:ry="7.1996326"
+       sodipodi:rx="11.34585"
+       sodipodi:cy="35.78001"
+       sodipodi:cx="14.624254"
+       id="path4093"
+       style="opacity:0.21645023;fill:#d6d6d6;fill-opacity:0.5076142;fill-rule:nonzero;stroke:none;stroke-width:0.69999999;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       sodipodi:type="arc" />
     <path
-       style="fill:url(#radialGradient3990);fill-opacity:1;fill-rule:evenodd;stroke:#737f98;stroke-width:1.45179427;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 50.99577,29.364545 C 48.61105,33.377311 47.631034,32.601011 49.628473,34.661714 C 52.158156,37.064801 54.675605,33.574158 57.542584,31.7905 C 57.48622,27.324577 56.2292,25.809742 55.164821,23.425993 C 53.499867,17.534657 55.079935,17.417831 54.845291,15.492059 C 54.303409,9.5370327 53.189645,7.7911846 47.037543,3.1636536 C 42.860089,1.7467298 35.926187,0.9116931 32.946132,1.0699483 C 29.110778,0.91379344 23.376645,8.3275768 20.829572,11.54012 C 16.09121,15.923552 15.187217,16.164484 10.545767,20.718187 C 8.0686783,23.914888 8.3437519,23.71009 7.5849245,28.188895 C 4.0688721,38.963009 3.9493895,36.756486 8.6293676,38.203353 C 11.580981,36.563188 15.332857,31.659014 18.585447,30.51176 C 19.212,25.875866 24.349991,25.818892 28.467229,23.120678 C 30.084162,22.917742 32.656436,22.473661 34.271006,25.407424 C 37.745007,30.08513 35.187407,44.824075 43.141818,36.181009 C 43.430187,32.905631 42.958778,36.118214 42.553366,32.759754 C 42.17473,29.306003 44.699633,25.566511 43.251183,22.371135 C 42.122461,20.283904 41.033702,20.240807 38.692224,16.471505"
+       sodipodi:nodetypes="cccccccccccccccccc"
        id="path3177"
-       sodipodi:nodetypes="cccccccccccccccccc" />
+       d="M 50.99577,29.364545 C 48.61105,33.377311 47.631034,32.601011 49.628473,34.661714 C 52.158156,37.064801 54.675605,33.574158 57.542584,31.7905 C 57.48622,27.324577 56.2292,25.809742 55.164821,23.425993 C 53.499867,17.534657 55.079935,17.417831 54.845291,15.492059 C 54.303409,9.5370327 53.189645,7.7911846 47.037543,3.1636536 C 42.860089,1.7467298 35.926187,0.9116931 32.946132,1.0699483 C 29.110778,0.91379344 23.376645,8.3275768 20.829572,11.54012 C 16.09121,15.923552 15.187217,16.164484 10.545767,20.718187 C 8.0686783,23.914888 8.3437519,23.71009 7.5849245,28.188895 C 4.0688721,38.963009 3.9493895,36.756486 8.6293676,38.203353 C 11.580981,36.563188 15.332857,31.659014 18.585447,30.51176 C 19.212,25.875866 24.349991,25.818892 28.467229,23.120678 C 30.084162,22.917742 32.656436,22.473661 34.271006,25.407424 C 37.745007,30.08513 35.187407,44.824075 43.141818,36.181009 C 43.430187,32.905631 42.958778,36.118214 42.553366,32.759754 C 42.17473,29.306003 44.699633,25.566511 43.251183,22.371135 C 42.122461,20.283904 41.033702,20.240807 38.692224,16.471505"
+       style="fill:url(#radialGradient3990);fill-opacity:1;fill-rule:evenodd;stroke:#737f98;stroke-width:1.45179427;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:#727ba6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80435652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 8.0197082,28.956274 L 9.5750039,28.901155 L 9.5309088,28.269629 L 8.2261446,28.022015 L 8.0197082,28.956274 z"
+       sodipodi:nodetypes="ccccc"
        id="path4732"
-       sodipodi:nodetypes="ccccc" />
+       d="M 8.0197082,28.956274 L 9.5750039,28.901155 L 9.5309088,28.269629 L 8.2261446,28.022015 L 8.0197082,28.956274 z"
+       style="fill:#727ba6;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80435652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:#879bc8;fill-opacity:0.34010153;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 41.486308,12.416104 C 42.419555,14.697378 43.041722,15.73432 43.456499,17.186042 C 43.871277,18.637762 43.663887,21.541202 43.663887,21.541202 L 40.881129,18.485051 L 41.486308,12.416104 z"
+       sodipodi:nodetypes="csccc"
        id="path4560"
-       sodipodi:nodetypes="csccc" />
+       d="M 41.486308,12.416104 C 42.419555,14.697378 43.041722,15.73432 43.456499,17.186042 C 43.871277,18.637762 43.663887,21.541202 43.663887,21.541202 L 40.881129,18.485051 L 41.486308,12.416104 z"
+       style="fill:#879bc8;fill-opacity:0.34010153;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#737f98;stroke-width:1.1291734;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 43.980632,22.070999 C 46.365466,25.295505 49.810827,28.027927 51.015685,29.338751"
+       sodipodi:nodetypes="cc"
        id="path3181"
-       sodipodi:nodetypes="cc" />
+       d="M 43.980632,22.070999 C 46.365466,25.295505 49.810827,28.027927 51.015685,29.338751"
+       style="fill:none;fill-rule:evenodd;stroke:#737f98;stroke-width:1.1291734;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:#7c84ac;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80435652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 10.93913,28.812444 C 10.82321,28.984802 10.707289,29.157158 10.59137,29.329515 C 11.109648,29.782834 11.981478,30.059378 12.455561,30.33592 C 13.860344,30.123634 13.689393,29.701892 14.065171,29.375273 C 13.359709,29.026173 13.124253,29.355199 12.344713,29.283581 C 12.03823,29.259118 11.245613,28.836908 10.93913,28.812444 z"
+       sodipodi:nodetypes="cccccc"
        id="path3334"
-       sodipodi:nodetypes="cccccc" />
+       d="M 10.93913,28.812444 C 10.82321,28.984802 10.707289,29.157158 10.59137,29.329515 C 11.109648,29.782834 11.981478,30.059378 12.455561,30.33592 C 13.860344,30.123634 13.689393,29.701892 14.065171,29.375273 C 13.359709,29.026173 13.124253,29.355199 12.344713,29.283581 C 12.03823,29.259118 11.245613,28.836908 10.93913,28.812444 z"
+       style="fill:#7c84ac;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.80435652;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="opacity:0.18297873;fill:none;fill-rule:evenodd;stroke:#fefefe;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4384)"
-       d="M 39.321598,26.574697 C 41.52815,27.623432 36.702359,24.120051 36.685925,24.054314 C 36.596421,23.64407 36.467914,23.154928 36.364883,22.668486 C 36.269137,22.216441 36.195392,21.766728 36.195392,21.384828"
-       id="path4302"
+       sodipodi:nodetypes="ccsc"
        transform="matrix(2.1828661,0,0,2.5697713,-32.164853,-39.886307)"
-       sodipodi:nodetypes="ccsc" />
+       id="path4302"
+       d="M 39.321598,26.574697 C 41.52815,27.623432 36.702359,24.120051 36.685925,24.054314 C 36.596421,23.64407 36.467914,23.154928 36.364883,22.668486 C 36.269137,22.216441 36.195392,21.766728 36.195392,21.384828"
+       style="opacity:0.18297873;fill:none;fill-rule:evenodd;stroke:#fefefe;stroke-width:1.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;filter:url(#filter4384)" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#b0cada;stroke-width:1.61310494px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 14.73884,23.8338 C 15.399556,23.495837 16.563629,22.562694 16.709032,21.759917"
+       sodipodi:nodetypes="cc"
        id="path4506"
-       sodipodi:nodetypes="cc" />
+       d="M 14.73884,23.8338 C 15.399556,23.495837 16.563629,22.562694 16.709032,21.759917"
+       style="fill:none;fill-rule:evenodd;stroke:#b0cada;stroke-width:1.61310494px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:#a9b4ca;fill-opacity:0.41624367;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 34.256206,1.8984169 C 34.256206,1.8984169 44.198481,1.9071018 46.976443,4.1582488 C 47.881561,4.8917197 55.197633,7.8369716 54.055969,15.741188 C 53.272579,21.164926 53.771252,20.749337 54.027656,22.359429 C 54.290608,24.010643 56.42395,28.085268 56.42395,28.085268 L 56.838729,31.403486 L 52.51188,34.514316 C 52.51188,34.514316 51.060161,33.728114 51.965095,32.647818 C 52.6209,31.864928 54.869666,30.573744 54.661146,29.3296 C 54.452985,28.087588 50.485968,22.492111 50.513373,20.826666 C 50.728838,7.7321671 40.8118,-1.1871094 25.069279,7.5409861 C 25.069279,7.5409861 30.657169,0.46934798 34.256206,1.8984169 z"
+       sodipodi:nodetypes="cssscccssssc"
        id="path4544"
-       sodipodi:nodetypes="cssscccssssc" />
+       d="M 34.256206,1.8984169 C 34.256206,1.8984169 44.198481,1.9071018 46.976443,4.1582488 C 47.881561,4.8917197 55.197633,7.8369716 54.055969,15.741188 C 53.272579,21.164926 53.771252,20.749337 54.027656,22.359429 C 54.290608,24.010643 56.42395,28.085268 56.42395,28.085268 L 56.838729,31.403486 L 52.51188,34.514316 C 52.51188,34.514316 51.060161,33.728114 51.965095,32.647818 C 52.6209,31.864928 54.869666,30.573744 54.661146,29.3296 C 54.452985,28.087588 50.485968,22.492111 50.513373,20.826666 C 50.728838,7.7321671 40.8118,-1.1871094 25.069279,7.5409861 C 25.069279,7.5409861 30.657169,0.46934798 34.256206,1.8984169 z"
+       style="fill:#a9b4ca;fill-opacity:0.41624367;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:#7891cb;fill-opacity:0.2538071;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 34.337062,14.293925 C 34.337062,14.293925 41.699358,20.204501 42.736301,23.107941 C 43.773246,26.011382 42.42522,27.87788 41.906748,29.744377 C 41.388277,31.610875 42.321525,33.995845 42.42522,34.825398 C 42.528913,35.654953 41.803054,36.899283 40.869805,37.314062 C 40.179963,37.620658 40.517443,26.041296 40.76611,24.352273 C 40.950474,23.100021 34.648145,16.471505 34.337062,14.293925 z"
+       sodipodi:nodetypes="csssssc"
        id="path4554"
-       sodipodi:nodetypes="csssssc" />
+       d="M 34.337062,14.293925 C 34.337062,14.293925 41.699358,20.204501 42.736301,23.107941 C 43.773246,26.011382 42.42522,27.87788 41.906748,29.744377 C 41.388277,31.610875 42.321525,33.995845 42.42522,34.825398 C 42.528913,35.654953 41.803054,36.899283 40.869805,37.314062 C 40.179963,37.620658 40.517443,26.041296 40.76611,24.352273 C 40.950474,23.100021 34.648145,16.471505 34.337062,14.293925 z"
+       style="fill:#7891cb;fill-opacity:0.2538071;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
     <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#9fa7b9;stroke-width:1.15175676;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 13.756746,23.36157 C 14.33984,23.1502 14.663525,22.585908 14.985851,22.095476 C 15.4307,21.250896 16.267965,20.946766 16.979949,20.470907 C 18.274728,21.052663 17.774212,22.043724 17.55569,23.324168"
+       sodipodi:nodetypes="cccc"
        id="path3227"
-       sodipodi:nodetypes="cccc" />
+       d="M 13.756746,23.36157 C 14.33984,23.1502 14.663525,22.585908 14.985851,22.095476 C 15.4307,21.250896 16.267965,20.946766 16.979949,20.470907 C 18.274728,21.052663 17.774212,22.043724 17.55569,23.324168"
+       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#9fa7b9;stroke-width:1.15175676;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:#ffffff;fill-opacity:0.44041448999999999;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4028)"
-       d="M 32.854577,16.883491 C 32.854577,16.883491 33.994965,21.606525 37.520854,25.285904 C 38.684401,26.500103 37.741825,33.373437 38.316349,34.920234 C 38.890873,36.46703 39.200232,36.99736 39.200232,36.99736 L 38.581514,37.483496 C 38.581514,37.483496 37.874407,38.190602 37.255689,33.461826 C 36.63697,28.733049 36.088334,25.46268 33.171519,23.606525 L 32.854577,16.883491 z"
-       id="path4764"
+       transform="matrix(1.1091008,0,0,1.1091008,-3.466475,-3.446122)"
        sodipodi:nodetypes="cssccscc"
-       transform="matrix(1.1091008,0,0,1.1091008,-3.466475,-3.446122)" />
+       id="path4764"
+       d="M 32.854577,16.883491 C 32.854577,16.883491 33.994965,21.606525 37.520854,25.285904 C 38.684401,26.500103 37.741825,33.373437 38.316349,34.920234 C 38.890873,36.46703 39.200232,36.99736 39.200232,36.99736 L 38.581514,37.483496 C 38.581514,37.483496 37.874407,38.190602 37.255689,33.461826 C 36.63697,28.733049 36.088334,25.46268 33.171519,23.606525 L 32.854577,16.883491 z"
+       style="fill:#ffffff;fill-opacity:0.44041448999999999;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4028)" />
     <path
-       style="fill:#ffffff;fill-opacity:0.44041449;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4788)"
-       d="M 42.603184,14.502525 C 44.105786,16.358681 45.343222,17.949671 45.343222,20.336156 C 45.343222,22.722642 48.70198,28.114331 49.939417,28.998214 C 51.176853,29.882098 50.911688,29.882098 50.911688,29.882098 L 48.436815,33.240855 L 50.027805,29.174991 C 50.027805,29.174991 43.663844,24.40202 43.575455,22.634253 C 43.487067,20.866486 43.487067,18.038059 43.045125,16.181904 C 42.603184,14.325749 42.426407,14.23736 42.603184,14.502525 z"
+       transform="matrix(1.1091008,0,0,1.1091008,-3.466475,-3.446122)"
        id="path4768"
-       transform="matrix(1.1091008,0,0,1.1091008,-3.466475,-3.446122)" />
+       d="M 42.603184,14.502525 C 44.105786,16.358681 45.343222,17.949671 45.343222,20.336156 C 45.343222,22.722642 48.70198,28.114331 49.939417,28.998214 C 51.176853,29.882098 50.911688,29.882098 50.911688,29.882098 L 48.436815,33.240855 L 50.027805,29.174991 C 50.027805,29.174991 43.663844,24.40202 43.575455,22.634253 C 43.487067,20.866486 43.487067,18.038059 43.045125,16.181904 C 42.603184,14.325749 42.426407,14.23736 42.603184,14.502525 z"
+       style="fill:#ffffff;fill-opacity:0.44041449;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;filter:url(#filter4788)" />
     <path
-       style="fill:none;fill-rule:evenodd;stroke:#737f98;stroke-width:1.29048383;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 43.806178,15.151521 C 45.319416,17.535271 43.397278,19.476624 44.069109,22.320326"
+       sodipodi:nodetypes="cc"
        id="path3179"
-       sodipodi:nodetypes="cc" />
+       d="M 43.806178,15.151521 C 45.319416,17.535271 43.397278,19.476624 44.069109,22.320326"
+       style="fill:none;fill-rule:evenodd;stroke:#737f98;stroke-width:1.29048383;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     <path
-       style="fill:#5e616f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 6.0987963,34.478291 C 6.9237541,34.684531 6.9974108,34.669799 8.3968931,35.097009 C 8.4263568,35.921967 8.1022652,36.393372 7.9107572,36.864777 C 10.408268,35.943223 11.028966,33.449466 11.474603,33.488412 C 12.201734,34.157192 12.22176,34.693392 8.5736698,37.571884 C 7.6161295,37.32145 6.6585888,37.071017 5.7010485,36.820583 C 5.8041683,36.15767 5.7747055,36.15767 6.0987963,34.478291 z"
+       sodipodi:nodetypes="ccccccc"
        id="path2467"
-       sodipodi:nodetypes="ccccccc" />
+       d="M 6.0987963,34.478291 C 6.9237541,34.684531 6.9974108,34.669799 8.3968931,35.097009 C 8.4263568,35.921967 8.1022652,36.393372 7.9107572,36.864777 C 10.408268,35.943223 11.028966,33.449466 11.474603,33.488412 C 12.201734,34.157192 12.22176,34.693392 8.5736698,37.571884 C 7.6161295,37.32145 6.6585888,37.071017 5.7010485,36.820583 C 5.8041683,36.15767 5.7747055,36.15767 6.0987963,34.478291 z"
+       style="fill:#5e616f;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
   </g>
 </svg>
diff --git a/src/data/qwebchannel.js b/src/data/qwebchannel.js
new file mode 100644
index 00000000..1fb83624
--- /dev/null
+++ b/src/data/qwebchannel.js
@@ -0,0 +1,475 @@
+/*
+ * Copyright 2021 Aaron Dewes <aaron.dewes@web.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Copyright (C) 2016 Klarälvdalens Datakonsult AB, a KDAB Group company, info@kdab.com, author Milian Wolff <milian.wolff@kdab.com>
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebChannel module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+var QWebChannelMessageTypes = {
+    signal: 1,
+    propertyUpdate: 2,
+    init: 3,
+    idle: 4,
+    debug: 5,
+    invokeMethod: 6,
+    connectToSignal: 7,
+    disconnectFromSignal: 8,
+    setProperty: 9,
+    response: 10,
+};
+
+var QWebChannel = function(transport, initCallback)
+{
+    if (typeof transport !== "object" || typeof transport.send !== "function") {
+        console.error("The QWebChannel expects a transport object with a send function and onmessage callback property." +
+                      " Given is: transport: " + typeof(transport) + ", transport.send: " + typeof(transport.send));
+        return;
+    }
+
+    var channel = this;
+    this.transport = transport;
+
+    this.send = function(data)
+    {
+        if (typeof(data) !== "string") {
+            data = JSON.stringify(data);
+        }
+        channel.transport.send(data);
+    }
+
+    this.transport.onmessage = function(message)
+    {
+        var data = message.data;
+        if (typeof data === "string") {
+            data = JSON.parse(data);
+        }
+        switch (data.type) {
+            case QWebChannelMessageTypes.signal:
+                channel.handleSignal(data);
+                break;
+            case QWebChannelMessageTypes.response:
+                channel.handleResponse(data);
+                break;
+            case QWebChannelMessageTypes.propertyUpdate:
+                channel.handlePropertyUpdate(data);
+                break;
+            default:
+                console.error("invalid message received:", message.data);
+                break;
+        }
+    }
+
+    this.execCallbacks = {};
+    this.execId = 0;
+    this.exec = function(data, callback)
+    {
+        if (!callback) {
+            // if no callback is given, send directly
+            channel.send(data);
+            return;
+        }
+        if (channel.execId === Number.MAX_VALUE) {
+            // wrap
+            channel.execId = Number.MIN_VALUE;
+        }
+        if (data.hasOwnProperty("id")) {
+            console.error("Cannot exec message with property id: " + JSON.stringify(data));
+            return;
+        }
+        data.id = channel.execId++;
+        channel.execCallbacks[data.id] = callback;
+        channel.send(data);
+    };
+
+    this.objects = {};
+
+    this.handleSignal = function(message)
+    {
+        var object = channel.objects[message.object];
+        if (object) {
+            object.signalEmitted(message.signal, message.args);
+        } else {
+            console.warn("Unhandled signal: " + message.object + "::" + message.signal);
+        }
+    }
+
+    this.handleResponse = function(message)
+    {
+        if (!message.hasOwnProperty("id")) {
+            console.error("Invalid response message received: ", JSON.stringify(message));
+            return;
+        }
+        channel.execCallbacks[message.id](message.data);
+        delete channel.execCallbacks[message.id];
+    }
+
+    this.handlePropertyUpdate = function(message)
+    {
+        message.data.forEach(data => {
+            var object = channel.objects[data.object];
+            if (object) {
+                object.propertyUpdate(data.signals, data.properties);
+            } else {
+                console.warn("Unhandled property update: " + data.object + "::" + data.signal);
+            }
+        });
+        channel.exec({type: QWebChannelMessageTypes.idle});
+    }
+
+    this.debug = function(message)
+    {
+        channel.send({type: QWebChannelMessageTypes.debug, data: message});
+    };
+
+    channel.exec({type: QWebChannelMessageTypes.init}, function(data) {
+        for (const objectName of Object.keys(data)) {
+            new QObject(objectName, data[objectName], channel);
+        }
+
+        // now unwrap properties, which might reference other registered objects
+        for (const objectName of Object.keys(channel.objects)) {
+            channel.objects[objectName].unwrapProperties();
+        }
+
+        if (initCallback) {
+            initCallback(channel);
+        }
+        channel.exec({type: QWebChannelMessageTypes.idle});
+    });
+};
+
+function QObject(name, data, webChannel)
+{
+    this.__id__ = name;
+    webChannel.objects[name] = this;
+
+    // List of callbacks that get invoked upon signal emission
+    this.__objectSignals__ = {};
+
+    // Cache of all properties, updated when a notify signal is emitted
+    this.__propertyCache__ = {};
+
+    var object = this;
+
+    // ----------------------------------------------------------------------
+
+    this.unwrapQObject = function(response)
+    {
+        if (response instanceof Array) {
+            // support list of objects
+            return response.map(qobj => object.unwrapQObject(qobj))
+        }
+        if (!(response instanceof Object))
+            return response;
+
+        if (!response["__QObject*__"] || response.id === undefined) {
+            var jObj = {};
+            for (const propName of Object.keys(response)) {
+                jObj[propName] = object.unwrapQObject(response[propName]);
+            }
+            return jObj;
+        }
+
+        var objectId = response.id;
+        if (webChannel.objects[objectId])
+            return webChannel.objects[objectId];
+
+        if (!response.data) {
+            console.error("Cannot unwrap unknown QObject " + objectId + " without data.");
+            return;
+        }
+
+        var qObject = new QObject( objectId, response.data, webChannel );
+        qObject.destroyed.connect(function() {
+            if (webChannel.objects[objectId] === qObject) {
+                delete webChannel.objects[objectId];
+                // reset the now deleted QObject to an empty {} object
+                // just assigning {} though would not have the desired effect, but the
+                // below also ensures all external references will see the empty map
+                // NOTE: this detour is necessary to workaround QTBUG-40021
+                Object.keys(qObject).forEach(name => delete qObject[name]);
+            }
+        });
+        // here we are already initialized, and thus must directly unwrap the properties
+        qObject.unwrapProperties();
+        return qObject;
+    }
+
+    this.unwrapProperties = function()
+    {
+        for (const propertyIdx of Object.keys(object.__propertyCache__)) {
+            object.__propertyCache__[propertyIdx] = object.unwrapQObject(object.__propertyCache__[propertyIdx]);
+        }
+    }
+
+    function addSignal(signalData, isPropertyNotifySignal)
+    {
+        var signalName = signalData[0];
+        var signalIndex = signalData[1];
+        object[signalName] = {
+            connect: function(callback) {
+                if (typeof(callback) !== "function") {
+                    console.error("Bad callback given to connect to signal " + signalName);
+                    return;
+                }
+
+                object.__objectSignals__[signalIndex] = object.__objectSignals__[signalIndex] || [];
+                object.__objectSignals__[signalIndex].push(callback);
+
+                // only required for "pure" signals, handled separately for properties in propertyUpdate
+                if (isPropertyNotifySignal)
+                    return;
+
+                // also note that we always get notified about the destroyed signal
+                if (signalName === "destroyed" || signalName === "destroyed()" || signalName === "destroyed(QObject*)")
+                    return;
+
+                // and otherwise we only need to be connected only once
+                if (object.__objectSignals__[signalIndex].length == 1) {
+                    webChannel.exec({
+                        type: QWebChannelMessageTypes.connectToSignal,
+                        object: object.__id__,
+                        signal: signalIndex
+                    });
+                }
+            },
+            disconnect: function(callback) {
+                if (typeof(callback) !== "function") {
+                    console.error("Bad callback given to disconnect from signal " + signalName);
+                    return;
+                }
+                object.__objectSignals__[signalIndex] = object.__objectSignals__[signalIndex] || [];
+                var idx = object.__objectSignals__[signalIndex].indexOf(callback);
+                if (idx === -1) {
+                    console.error("Cannot find connection of signal " + signalName + " to " + callback.name);
+                    return;
+                }
+                object.__objectSignals__[signalIndex].splice(idx, 1);
+                if (!isPropertyNotifySignal && object.__objectSignals__[signalIndex].length === 0) {
+                    // only required for "pure" signals, handled separately for properties in propertyUpdate
+                    webChannel.exec({
+                        type: QWebChannelMessageTypes.disconnectFromSignal,
+                        object: object.__id__,
+                        signal: signalIndex
+                    });
+                }
+            }
+        };
+    }
+
+    /**
+     * Invokes all callbacks for the given signalname. Also works for property notify callbacks.
+     */
+    function invokeSignalCallbacks(signalName, signalArgs)
+    {
+        var connections = object.__objectSignals__[signalName];
+        if (connections) {
+            connections.forEach(function(callback) {
+                callback.apply(callback, signalArgs);
+            });
+        }
+    }
+
+    this.propertyUpdate = function(signals, propertyMap)
+    {
+        // update property cache
+        for (const propertyIndex of Object.keys(propertyMap)) {
+            var propertyValue = propertyMap[propertyIndex];
+            object.__propertyCache__[propertyIndex] = this.unwrapQObject(propertyValue);
+        }
+
+        for (const signalName of Object.keys(signals)) {
+            // Invoke all callbacks, as signalEmitted() does not. This ensures the
+            // property cache is updated before the callbacks are invoked.
+            invokeSignalCallbacks(signalName, signals[signalName]);
+        }
+    }
+
+    this.signalEmitted = function(signalName, signalArgs)
+    {
+        invokeSignalCallbacks(signalName, this.unwrapQObject(signalArgs));
+    }
+
+    function addMethod(methodData)
+    {
+        var methodName = methodData[0];
+        var methodIdx = methodData[1];
+
+        // Fully specified methods are invoked by id, others by name for host-side overload resolution
+        var invokedMethod = methodName[methodName.length - 1] === ')' ? methodIdx : methodName
+
+        object[methodName] = function() {
+            var args = [];
+            var callback;
+            var errCallback;
+            for (var i = 0; i < arguments.length; ++i) {
+                var argument = arguments[i];
+                if (typeof argument === "function")
+                    callback = argument;
+                else if (argument instanceof QObject && webChannel.objects[argument.__id__] !== undefined)
+                    args.push({
+                        "id": argument.__id__
+                    });
+                else
+                    args.push(argument);
+            }
+
+            var result;
+            // during test, webChannel.exec synchronously calls the callback
+            // therefore, the promise must be constucted before calling
+            // webChannel.exec to ensure the callback is set up
+            if (!callback && (typeof(Promise) === 'function')) {
+              result = new Promise(function(resolve, reject) {
+                callback = resolve;
+                errCallback = reject;
+              });
+            }
+
+            webChannel.exec({
+                "type": QWebChannelMessageTypes.invokeMethod,
+                "object": object.__id__,
+                "method": invokedMethod,
+                "args": args
+            }, function(response) {
+                if (response !== undefined) {
+                    var result = object.unwrapQObject(response);
+                    if (callback) {
+                        (callback)(result);
+                    }
+                } else if (errCallback) {
+                  (errCallback)();
+                }
+            });
+
+            return result;
+        };
+    }
+
+    function bindGetterSetter(propertyInfo)
+    {
+        var propertyIndex = propertyInfo[0];
+        var propertyName = propertyInfo[1];
+        var notifySignalData = propertyInfo[2];
+        // initialize property cache with current value
+        // NOTE: if this is an object, it is not directly unwrapped as it might
+        // reference other QObject that we do not know yet
+        object.__propertyCache__[propertyIndex] = propertyInfo[3];
+
+        if (notifySignalData) {
+            if (notifySignalData[0] === 1) {
+                // signal name is optimized away, reconstruct the actual name
+                notifySignalData[0] = propertyName + "Changed";
+            }
+            addSignal(notifySignalData, true);
+        }
+
+        Object.defineProperty(object, propertyName, {
+            configurable: true,
+            get: function () {
+                var propertyValue = object.__propertyCache__[propertyIndex];
+                if (propertyValue === undefined) {
+                    // This shouldn't happen
+                    console.warn("Undefined value in property cache for property \"" + propertyName + "\" in object " + object.__id__);
+                }
+
+                return propertyValue;
+            },
+            set: function(value) {
+                if (value === undefined) {
+                    console.warn("Property setter for " + propertyName + " called with undefined value!");
+                    return;
+                }
+                object.__propertyCache__[propertyIndex] = value;
+                var valueToSend = value;
+                if (valueToSend instanceof QObject && webChannel.objects[valueToSend.__id__] !== undefined)
+                    valueToSend = { "id": valueToSend.__id__ };
+                webChannel.exec({
+                    "type": QWebChannelMessageTypes.setProperty,
+                    "object": object.__id__,
+                    "property": propertyIndex,
+                    "value": valueToSend
+                });
+            }
+        });
+
+    }
+
+    // ----------------------------------------------------------------------
+
+    data.methods.forEach(addMethod);
+
+    data.properties.forEach(bindGetterSetter);
+
+    data.signals.forEach(function(signal) { addSignal(signal, false); });
+
+    Object.assign(object, data.enums);
+}
+
+//required for use with nodejs
+if (typeof module === 'object') {
+    module.exports = {
+        QWebChannel: QWebChannel
+    };
+}
+
+new QWebChannel(qt.webChannelTransport, function (channel) {
+    window.endorphin = channel.objects.endorphin;
+    const links = document.getElementsByTagName("link");
+    for(link of links) {
+        if(link.rel == "search") {
+            window.endorphin.addSearchProvider(link.href);
+        }
+    }
+});
+
diff --git a/src/devtoolswindow.cpp b/src/devtoolswindow.cpp
new file mode 100644
index 00000000..441907b1
--- /dev/null
+++ b/src/devtoolswindow.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301  USA
+ */
+
+#include "devtoolswindow.h"
+#include <QApplication>
+#include <QWidget>
+#include <QWebEngineView>
+#include <QWebEnginePage>
+#include <QScreen>
+#include <QWebEngineProfile>
+
+DevToolsWindow::DevToolsWindow(QWidget *parent, Qt::WindowFlags flags)
+    : QMainWindow(parent, flags)
+    , m_webView(new QWebEngineView())
+{
+    setCentralWidget(m_webView);
+}
+
+DevToolsWindow::~DevToolsWindow()
+{
+}
+
+void DevToolsWindow::geometryChangeRequested(const QRect &geometry)
+{
+    setGeometry(geometry);
+}
+
+QWebEnginePage *DevToolsWindow::page()
+{
+    return m_webView->page();
+}
+
+QSize DevToolsWindow::sizeHint() const
+{
+    QRect desktopRect = qApp->primaryScreen()->geometry();
+    QSize size = desktopRect.size() * 0.4;
+    return size;
+}
diff --git a/tools/htmlToXBel/mainapp.h b/src/devtoolswindow.h
similarity index 57%
rename from tools/htmlToXBel/mainapp.h
rename to src/devtoolswindow.h
index 64aa4be7..bdc8e780 100644
--- a/tools/htmlToXBel/mainapp.h
+++ b/src/devtoolswindow.h
@@ -17,26 +17,34 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef MAINAPP_H
-#define MAINAPP_H
+#ifndef DEVTOOLSWINDOW_H
+#define DEVTOOLSWINDOW_H
 
-#include <QObject>
-#include <QVariant>
+#include <QMainWindow>
+#include <QWebEngineView>
 
-class QWebEngineView;
-class QPushButton;
+class QWebEnginePage;
+/*!
+    The MainWindow of the Browser Application.
 
-class MainApp : public QObject
+    Handles the tab widget and all the actions
+ */
+class DevToolsWindow : public QMainWindow
 {
-Q_OBJECT
+    Q_OBJECT
+
 public:
-    MainApp(QObject *parent = nullptr);
-    QString get(QString &input);
-    void ranJavaScript(QString &value);
+    DevToolsWindow(QWidget *parent = nullptr, Qt::WindowFlags flags = Qt::WindowFlags());
+    ~DevToolsWindow();
+    QWebEnginePage *page();
+    QSize sizeHint() const;
 
-Q_SIGNALS:
-    void notifyRanJavaScript();
+private Q_SLOTS:
+    void geometryChangeRequested(const QRect &geometry);
 
+private:
+    QWebEngineView *m_webView;
 };
 
-#endif // MAINAPP_H
\ No newline at end of file
+#endif // DEVTOOLSWINDOW_H
+
diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp
index 2bf07cff..a3cec345 100644
--- a/src/downloadmanager.cpp
+++ b/src/downloadmanager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2008 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,55 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA  02110-1301  USA
  */
-
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
 /****************************************************************************
 **
 ** Copyright (C) 2008-2008 Trolltech ASA. All rights reserved.
@@ -64,24 +112,28 @@
 #include "downloadmanager.h"
 
 #include "autosaver.h"
+#ifndef NO_BROWSERAPPLICATION
 #include "browserapplication.h"
-#include "networkaccessmanager.h"
+#endif
 
 #include <math.h>
 
-#include <qdesktopservices.h>
-#include <qfiledialog.h>
-#include <qfileiconprovider.h>
-#include <qheaderview.h>
-#include <qmessagebox.h>
-#include <qmetaobject.h>
-#include <qmimedata.h>
-#include <qprocess.h>
-#include <qsettings.h>
+#include <QDesktopServices>
+#include <QFileDialog>
+#include <QFileIconProvider>
+#include <QHeaderView>
+#include <QMessageBox>
+#include <QMetaObject>
+#include <QMimeData>
+#include <QProcess>
+#include <QSettings>
+#include <QNetworkAccessManager>
+#include <QWebEngineDownloadItem>
+#include <QMetaEnum>
 
-#include <qdebug.h>
+#include <QDebug>
 
-#include <qwebsettings.h>
+#include <QWebEngineSettings>
 
 //#define DOWNLOADMANAGER_DEBUG
 
@@ -90,30 +142,23 @@
     It moves the data from the QNetworkReply into the QFile as well
     as update the information/progressbar and report errors.
  */
-DownloadItem::DownloadItem(QNetworkReply *reply, bool requestFileName, QWidget *parent)
+DownloadItem::DownloadItem(QWebEngineDownloadItem *download, QWidget *parent)
     : QWidget(parent)
-    , m_reply(reply)
-    , m_requestFileName(requestFileName)
-    , m_bytesReceived(0)
-    , m_startedSaving(false)
-    , m_finishedDownloading(false)
-    , m_gettingFileName(false)
-    , m_canceledFileSelect(false)
+    , m_download(download)
 {
     setupUi(this);
     QPalette p = downloadInfoLabel->palette();
     p.setColor(QPalette::Text, Qt::darkGray);
     downloadInfoLabel->setPalette(p);
     progressBar->setMaximum(0);
-    tryAgainButton->hide();
-    connect(stopButton, SIGNAL(clicked()), this, SLOT(stop()));
+    tryAgainButton->hide();  
     connect(openButton, SIGNAL(clicked()), this, SLOT(open()));
     connect(tryAgainButton, SIGNAL(clicked()), this, SLOT(tryAgain()));
 
-    if (!requestFileName) {
-        QSettings settings;
-        settings.beginGroup(QLatin1String("downloadmanager"));
-        m_requestFileName = settings.value(QLatin1String("alwaysPromptForFileName"), false).toBool();
+    if (download) {
+        QString file = QDir::cleanPath(download->downloadDirectory() + QDir::separator() + download->downloadFileName());
+        m_file.setFile(file);
+        m_url = download->url();
     }
 
     init();
@@ -121,26 +166,12 @@ DownloadItem::DownloadItem(QNetworkReply *reply, bool requestFileName, QWidget *
 
 void DownloadItem::init()
 {
-    if (!m_reply)
-        return;
-
-    m_startedSaving = false;
-    m_finishedDownloading = false;
-
-    openButton->setEnabled(false);
-
-    // attach to the m_reply
-    m_url = m_reply->url();
-    m_reply->setParent(this);
-    connect(m_reply, SIGNAL(readyRead()), this, SLOT(downloadReadyRead()));
-    connect(m_reply, SIGNAL(error(QNetworkReply::NetworkError)),
-            this, SLOT(error(QNetworkReply::NetworkError)));
-    connect(m_reply, SIGNAL(downloadProgress(qint64, qint64)),
-            this, SLOT(downloadProgress(qint64, qint64)));
-    connect(m_reply, SIGNAL(metaDataChanged()),
-            this, SLOT(metaDataChanged()));
-    connect(m_reply, SIGNAL(finished()),
-            this, SLOT(finished()));
+    if (m_download) {
+        connect(m_download.data(), SIGNAL(downloadProgress(qint64,qint64)),
+                this, SLOT(downloadProgress()));
+        connect(m_download.data(), SIGNAL(finished()),
+                this, SLOT(finished()));
+    }
 
     // reset info
     downloadInfoLabel->clear();
@@ -149,96 +180,43 @@ void DownloadItem::init()
 
     // start timer for the download estimation
     m_downloadTime.start();
-
-    if (m_reply->error() != QNetworkReply::NoError) {
-        error(m_reply->error());
-        finished();
-    }
 }
 
-void DownloadItem::getFileName()
+bool DownloadItem::getFileName(bool promptForFileName)
 {
-    if (m_gettingFileName)
-        return;
-
-    QString downloadDirectory = BrowserApplication::downloadManager()->downloadDirectory();
+    QSettings settings;
+    settings.beginGroup(QStringLiteral("downloadmanager"));
+#ifndef NO_BROWSERAPPLICATION
+    QString defaultLocation = BrowserApplication::downloadManager()->downloadDirectory();
+#else
+    QString defaultLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation) + '/';
+#endif
+    if (m_file.absoluteDir().exists())
+        defaultLocation = m_file.absolutePath();
+    QString downloadDirectory = settings.value(QStringLiteral("downloadDirectory"), defaultLocation).toString();
+    if (!downloadDirectory.isEmpty())
+        downloadDirectory += QChar('/');
 
-    QString defaultFileName = saveFileName(downloadDirectory);
+    QString defaultFileName = QFileInfo(downloadDirectory, m_file.fileName()).absoluteFilePath();
     QString fileName = defaultFileName;
-    if (m_requestFileName) {
-        m_gettingFileName = true;
+    if (promptForFileName) {
         fileName = QFileDialog::getSaveFileName(this, tr("Save File"), defaultFileName);
-        m_gettingFileName = false;
         if (fileName.isEmpty()) {
-            progressBar->setVisible(false);
-            stop();
+            if (m_download)
+                m_download->cancel();
             fileNameLabel->setText(tr("Download canceled: %1").arg(QFileInfo(defaultFileName).fileName()));
-            m_canceledFileSelect = true;
-            return;
-        }
-        QFileInfo fileInfo = QFileInfo(fileName);
-        BrowserApplication::downloadManager()->setDownloadDirectory(fileInfo.absoluteDir().absolutePath());
-        fileNameLabel->setText(fileInfo.fileName());
-    }
-    m_output.setFileName(fileName);
-
-    // Check file path for saving.
-    QDir saveDirPath = QFileInfo(m_output.fileName()).dir();
-    if (!saveDirPath.exists()) {
-        if (!saveDirPath.mkpath(saveDirPath.absolutePath())) {
-            progressBar->setVisible(false);
-            stop();
-            downloadInfoLabel->setText(tr("Download directory (%1) couldn't be created.").arg(saveDirPath.absolutePath()));
-            return;
-        }
-    }
-
-    fileNameLabel->setText(QFileInfo(m_output.fileName()).fileName());
-    if (m_requestFileName)
-        downloadReadyRead();
-}
-
-QString DownloadItem::saveFileName(const QString &directory) const
-{
-    // Move this function into QNetworkReply to also get file name sent from the server
-    QString path;
-    if (m_reply->hasRawHeader("Content-Disposition")) {
-        QString value = QLatin1String(m_reply->rawHeader("Content-Disposition"));
-        int pos = value.indexOf(QLatin1String("filename="));
-        if (pos != -1) {
-            QString name = value.mid(pos + 9);
-            if (name.startsWith(QLatin1Char('"')) && name.endsWith(QLatin1Char('"')))
-                name = name.mid(1, name.size() - 2);
-            path = name;
+            return false;
         }
     }
-    if (path.isEmpty())
-        path = m_url.path();
+    m_file.setFile(fileName);
 
-    QFileInfo info(path);
-    QString baseName = info.completeBaseName();
-    QString endName = info.suffix();
-
-    if (baseName.isEmpty()) {
-        baseName = QLatin1String("unnamed_download");
-
-#ifdef DOWNLOADMANAGER_DEBUG
-        qDebug() << "DownloadItem::" << __FUNCTION__ << "downloading unknown file:" << m_url;
-#endif
+    if (m_download && m_download->state() == QWebEngineDownloadItem::DownloadRequested) {
+        m_download->setDownloadFileName(m_file.fileName());
+        m_download->setDownloadDirectory(m_file.absolutePath());
     }
 
-    if (!endName.isEmpty())
-        endName = QLatin1Char('.') + endName;
-
-    QString name = directory + baseName + endName;
-    if (!m_requestFileName && QFile::exists(name)) {
-        // already exists, don't overwrite
-        int i = 1;
-        do {
-            name = directory + baseName + QLatin1Char('-') + QString::number(i++) + endName;
-        } while (QFile::exists(name));
-    }
-    return name;
+    fileNameLabel->setText(m_file.fileName());
+    return true;
 }
 
 void DownloadItem::stop()
@@ -246,17 +224,17 @@ void DownloadItem::stop()
     setUpdatesEnabled(false);
     stopButton->setEnabled(false);
     stopButton->hide();
-    tryAgainButton->setEnabled(true);
-    tryAgainButton->show();
     setUpdatesEnabled(true);
-    m_reply->abort();
-    emit downloadFinished();
+    if (m_download)
+        m_download->cancel();
+
+    Q_EMIT statusChanged();
+    Q_EMIT downloadFinished();
 }
 
 void DownloadItem::open()
 {
-    QFileInfo info(m_output);
-    QUrl url = QUrl::fromLocalFile(info.absoluteFilePath());
+    QUrl url = QUrl::fromLocalFile(m_file.absoluteFilePath());
     QDesktopServices::openUrl(url);
 }
 
@@ -271,73 +249,12 @@ void DownloadItem::tryAgain()
     stopButton->setVisible(true);
     progressBar->setVisible(true);
 
-    QNetworkReply *r = BrowserApplication::networkAccessManager()->get(QNetworkRequest(m_url));
-    if (m_reply)
-        m_reply->deleteLater();
-    if (m_output.exists())
-        m_output.remove();
-    m_reply = r;
+    m_download.data()->resume();
     init();
-    emit statusChanged();
-}
-
-void DownloadItem::downloadReadyRead()
-{
-    if (m_requestFileName && m_output.fileName().isEmpty())
-        return;
-    if (!m_output.isOpen()) {
-        // in case someone else has already put a file there
-        if (!m_requestFileName)
-            getFileName();
-        if (!m_output.open(QIODevice::WriteOnly)) {
-            downloadInfoLabel->setText(tr("Error opening output file: %1")
-                    .arg(m_output.errorString()));
-            stop();
-            emit statusChanged();
-            return;
-        }
-        emit statusChanged();
-    }
-    if (-1 == m_output.write(m_reply->readAll())) {
-        downloadInfoLabel->setText(tr("Error saving: %1")
-                .arg(m_output.errorString()));
-        stopButton->click();
-    } else {
-        m_startedSaving = true;
-        if (m_finishedDownloading)
-            finished();
-    }
-}
-
-void DownloadItem::error(QNetworkReply::NetworkError)
-{
-#ifdef DOWNLOADMANAGER_DEBUG
-    qDebug() << "DownloadItem::" << __FUNCTION__ << m_reply->errorString() << m_url;
-#endif
-
-    downloadInfoLabel->setText(tr("Network Error: %1").arg(m_reply->errorString()));
-    tryAgainButton->setEnabled(true);
-    tryAgainButton->setVisible(true);
-    emit downloadFinished();
+    Q_EMIT statusChanged();
 }
 
-void DownloadItem::metaDataChanged()
-{
-    QVariant locationHeader = m_reply->header(QNetworkRequest::LocationHeader);
-    if (locationHeader.isValid()) {
-        m_url = locationHeader.toUrl();
-        m_reply->deleteLater();
-        m_reply = BrowserApplication::networkAccessManager()->get(QNetworkRequest(m_url));
-        init();
-        return;
-    }
-
-#ifdef DOWNLOADMANAGER_DEBUG
-    qDebug() << "DownloadItem::" << __FUNCTION__ << "not handled.";
-#endif
-}
-
-void DownloadItem::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
+void DownloadItem::downloadProgress()
 {
     QTime now = QTime::currentTime();
     if (m_lastProgressTime.msecsTo(now) < 200)
@@ -345,84 +262,56 @@ void DownloadItem::downloadProgress(qint64 bytesReceived, qint64 bytesTotal)
 
     m_lastProgressTime = now;
 
-    m_bytesReceived = bytesReceived;
-    qint64 currentValue = 0;
-    qint64 totalValue = 0;
-    if (bytesTotal > 0) {
-        currentValue = bytesReceived * 100 / bytesTotal;
-        totalValue = 100;
+    if (m_download.data()->totalBytes() == -1) {
+        progressBar->setValue(0);
+        progressBar->setMaximum(0);
+    } else {
+        progressBar->setValue(m_download.data()->receivedBytes());
+        progressBar->setMaximum(m_download.data()->totalBytes());
     }
-    progressBar->setValue(currentValue);
-    progressBar->setMaximum(totalValue);
-
-    emit progress(currentValue, totalValue);
     updateInfoLabel();
 }
 
-qint64 DownloadItem::bytesTotal() const
-{
-    return m_reply->header(QNetworkRequest::ContentLengthHeader).toULongLong();
+QString DownloadItem::dataString(qint64 size) {
+    return DownloadManager::dataString(size);
 }
 
-qint64 DownloadItem::bytesReceived() const
-{
-    return m_bytesReceived;
-}
-
-double DownloadItem::remainingTime() const
+void DownloadItem::updateInfoLabel()
 {
-    if (!downloading())
-        return -1.0;
 
-    double timeRemaining = ((double)(bytesTotal() - bytesReceived())) / currentSpeed();
+    // update info label
+    double speed = m_download.data()->receivedBytes() * 1000.0 / m_downloadTime.elapsed();
+    double timeRemaining = ((double)(m_download.data()->totalBytes() - m_download.data()->receivedBytes())) / speed;
+    QString timeRemainingString = tr("seconds");
+    if (timeRemaining > 60) {
+        timeRemaining = timeRemaining / 60;
+        timeRemainingString = tr("minutes");
+    }
+    timeRemaining = floor(timeRemaining);
 
     // When downloading the eta should never be 0
     if (timeRemaining == 0)
         timeRemaining = 1;
 
-    return timeRemaining;
-}
-
-double DownloadItem::currentSpeed() const
-{
-    if (!downloading())
-        return -1.0;
-
-    return m_bytesReceived * 1000.0 / m_downloadTime.elapsed();
-}
-
-void DownloadItem::updateInfoLabel()
-{
-    if (m_reply->error() != QNetworkReply::NoError)
-        return;
-
-    qint64 bytesTotal = m_reply->header(QNetworkRequest::ContentLengthHeader).toULongLong();
-    bool running = !downloadedSuccessfully();
-
-    // update info label
-    double speed = currentSpeed();
-    double timeRemaining = remainingTime();
-
     QString info;
-    if (running) {
+    if (!downloadedSuccessfully()) {
         QString remaining;
-
-        if (bytesTotal != 0) {
-            remaining = DownloadManager::timeString(timeRemaining);
-        }
-
-        info = QString(tr("%1 of %2 (%3/sec) - %4"))
-            .arg(DownloadManager::dataString(m_bytesReceived))
-            .arg(bytesTotal == 0 ? tr("?") : DownloadManager::dataString(bytesTotal))
-            .arg(DownloadManager::dataString((int)speed))
+        if (m_download.data()->totalBytes() != 0)
+            remaining = tr("- %4 %5 remaining")
+            .arg(timeRemaining)
+            .arg(timeRemainingString);
+        info = tr("%1 of %2 (%3/sec) %4")
+            .arg(dataString(m_download.data()->receivedBytes()))
+            .arg(m_download.data()->totalBytes() == 0 ? tr("?") : dataString(m_download.data()->totalBytes()))
+            .arg(dataString((int)speed))
             .arg(remaining);
     } else {
-        if (m_bytesReceived == bytesTotal)
-            info = DownloadManager::dataString(m_output.size());
-        else
-            info = tr("%1 of %2 - Download Complete")
-                .arg(DownloadManager::dataString(m_bytesReceived))
-                .arg(DownloadManager::dataString(bytesTotal));
+        if (m_download.data()->receivedBytes() != m_download.data()->totalBytes()) {
+            info = tr("%1 of %2 - Stopped")
+                .arg(dataString(m_download.data()->receivedBytes()))
+                .arg(dataString(m_download.data()->totalBytes()));
+        } else
+            info = dataString(m_download.data()->receivedBytes());
     }
     downloadInfoLabel->setText(info);
 }
@@ -434,23 +323,48 @@ bool DownloadItem::downloading() const
 
 bool DownloadItem::downloadedSuccessfully() const
 {
-    return (stopButton->isHidden() && tryAgainButton->isHidden());
+    bool completed = m_download
+            && m_download->isFinished()
+            && m_download->state() == QWebEngineDownloadItem::DownloadCompleted;
+    return completed || !stopButton->isVisible();
 }
 
 void DownloadItem::finished()
 {
-    m_finishedDownloading = true;
-    if (!m_startedSaving) {
-        return;
+    if (m_download) {
+        QWebEngineDownloadItem::DownloadState state = m_download->state();
+        QString message;
+        bool interrupted = false;
+
+        switch (state) {
+        case QWebEngineDownloadItem::DownloadRequested: // Fall-through.
+        case QWebEngineDownloadItem::DownloadInProgress:
+            Q_UNREACHABLE();
+            break;
+        case QWebEngineDownloadItem::DownloadCompleted:
+            break;
+        case QWebEngineDownloadItem::DownloadCancelled:
+            message = QStringLiteral("Download cancelled");
+            interrupted = true;
+            break;
+        case QWebEngineDownloadItem::DownloadInterrupted:
+            message = QStringLiteral("Download interrupted");
+            interrupted = true;
+            break;
+        }
+
+        if (interrupted) {
+            downloadInfoLabel->setText(message);
+            return;
+        }
     }
+
     progressBar->hide();
     stopButton->setEnabled(false);
     stopButton->hide();
-    openButton->setEnabled(true);
-    m_output.close();
     updateInfoLabel();
-    emit statusChanged();
-    emit downloadFinished();
+    Q_EMIT statusChanged();
+    Q_EMIT downloadFinished();
 }
 
 /*!
@@ -463,16 +377,15 @@ DownloadManager::DownloadManager(QWidget *parent)
     : QDialog(parent)
     , m_autoSaver(new AutoSaver(this))
     , m_model(new DownloadModel(this))
-    , m_manager(BrowserApplication::networkAccessManager())
-    , m_iconProvider(0)
+    , m_iconProvider(nullptr)
     , m_removePolicy(Never)
 {
     setupUi(this);
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("downloadmanager"));
+    settings.beginGroup(QStringLiteral("downloadmanager"));
     QString defaultLocation = QStandardPaths::writableLocation(QStandardPaths::DesktopLocation);
-    setDownloadDirectory(settings.value(QLatin1String("downloadDirectory"), defaultLocation).toString());
+    setDownloadDirectory(settings.value(QStringLiteral("downloadDirectory"), defaultLocation).toString());
 
     downloadsView->setShowGrid(false);
     downloadsView->verticalHeader()->hide();
@@ -481,7 +394,6 @@ DownloadManager::DownloadManager(QWidget *parent)
     downloadsView->horizontalHeader()->setStretchLastSection(true);
     downloadsView->setModel(m_model);
     connect(cleanupButton, SIGNAL(clicked()), this, SLOT(cleanup()));
-    connect(buttonBox, SIGNAL(rejected()), this, SLOT(close()));
     load();
 }
 
@@ -507,10 +419,10 @@ bool DownloadManager::allowQuit()
 {
     if (activeDownloads() >= 1) {
         int choice = QMessageBox::warning(this, QString(),
-                                        tr("There are %1 downloads in progress\n"
-                                           "Do you want to quit anyway?").arg(activeDownloads()),
-                                        QMessageBox::Yes | QMessageBox::No,
-                                        QMessageBox::No);
+                                          tr("There are %1 downloads in progress\n"
+                                             "Do you want to quit anyway?").arg(activeDownloads()),
+                                          QMessageBox::Yes | QMessageBox::No,
+                                          QMessageBox::No);
         if (choice == QMessageBox::No) {
             show();
             return false;
@@ -522,16 +434,16 @@ bool DownloadManager::allowQuit()
 bool DownloadManager::externalDownload(const QUrl &url)
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("downloadmanager"));
-    if (!settings.value(QLatin1String("external"), false).toBool())
+    settings.beginGroup(QStringLiteral("downloadmanager"));
+    if (!settings.value(QStringLiteral("external"), false).toBool())
         return false;
 
-    QString program = settings.value(QLatin1String("externalPath")).toString();
+    QString program = settings.value(QStringLiteral("externalPath")).toString();
     if (program.isEmpty())
         return false;
 
     // Split program at every space not inside double quotes
-    QRegExp regex(QLatin1String("\"([^\"]+)\"|([^ ]+)"));
+    QRegExp regex(QStringLiteral("\"([^\"]+)\"|([^ ]+)"));
     QStringList args;
     for (int pos = 0; (pos = regex.indexIn(program, pos)) != -1; pos += regex.matchedLength())
         args << regex.cap(1) + regex.cap(2);
@@ -541,38 +453,13 @@ bool DownloadManager::externalDownload(const QUrl &url)
     return QProcess::startDetached(args.takeFirst(), args << QString::fromUtf8(url.toEncoded()));
 }
 
-void DownloadManager::download(const QNetworkRequest &request, bool requestFileName)
-{
-    if (request.url().isEmpty())
-        return;
-    if (externalDownload(request.url()))
-        return;
-    handleUnsupportedContent(m_manager->get(request), requestFileName);
-}
-
-void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool requestFileName)
+void DownloadManager::download(QWebEngineDownloadItem *download)
 {
-    if (!reply || reply->url().isEmpty())
-        return;
-    if (externalDownload(reply->url()))
+    if (externalDownload(download->url()))
         return;
-
-    QVariant header = reply->header(QNetworkRequest::ContentLengthHeader);
-    bool ok;
-    int size = header.toInt(&ok);
-    if (ok && size == 0)
-        return;
-
-#ifdef DOWNLOADMANAGER_DEBUG
-    qDebug() << "DownloadManager::" << __FUNCTION__ << reply->url() << "requestFileName" << requestFileName;
-#endif
-
-    DownloadItem *item = new DownloadItem(reply, requestFileName, this);
+    DownloadItem *item = new DownloadItem(download, this);
     addItem(item);
 
-    if (item->m_canceledFileSelect)
-        return;
-
     if (!isVisible())
         show();
 
@@ -589,6 +476,8 @@ void DownloadManager::addItem(DownloadItem *item)
     m_downloads.append(item);
     m_model->endInsertRows();
     updateItemCount();
+    if (row == 0)
+        show();
     downloadsView->setIndexWidget(m_model->index(row, 0), item);
     QIcon icon = style()->standardIcon(QStyle::SP_FileIcon);
     item->fileIcon->setPixmap(icon.pixmap(48, 48));
@@ -629,22 +518,20 @@ void DownloadManager::updateRow(DownloadItem *item)
         return;
     if (!m_iconProvider)
         m_iconProvider = new QFileIconProvider();
-    QIcon icon = m_iconProvider->icon(item->m_output.fileName());
+    QIcon icon = m_iconProvider->icon(item->m_file);
     if (icon.isNull())
         icon = style()->standardIcon(QStyle::SP_FileIcon);
     item->fileIcon->setPixmap(icon.pixmap(48, 48));
-
-    int oldHeight = downloadsView->rowHeight(row);
-    downloadsView->setRowHeight(row, qMax(oldHeight, item->minimumSizeHint().height()));
+    downloadsView->setRowHeight(row, item->minimumSizeHint().height());
 
     bool remove = false;
-    QWebSettings *globalSettings = QWebSettings::globalSettings();
     if (!item->downloading()
-        && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
-        remove = true;
+        && BrowserApplication::instance()->isPrivate())
+            remove = true;
+    
 
     if (item->downloadedSuccessfully()
-        && removePolicy() == DownloadManager::SuccessFullDownload) {
+            && removePolicy() == DownloadManager::SuccessFullDownload) {
         remove = true;
     }
     if (remove)
@@ -669,61 +556,59 @@ void DownloadManager::setRemovePolicy(RemovePolicy policy)
 void DownloadManager::save() const
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("downloadmanager"));
+    settings.beginGroup(QStringLiteral("downloadmanager"));
     QMetaEnum removePolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("RemovePolicy"));
-    settings.setValue(QLatin1String("removeDownloadsPolicy"), QLatin1String(removePolicyEnum.valueToKey(m_removePolicy)));
-    settings.setValue(QLatin1String("size"), size());
+    settings.setValue(QStringLiteral("removeDownloadsPolicy"), QString(removePolicyEnum.valueToKey(m_removePolicy)));
+    settings.setValue(QStringLiteral("size"), size());
     if (m_removePolicy == Exit)
         return;
 
     for (int i = 0; i < m_downloads.count(); ++i) {
-        QString key = QString(QLatin1String("download_%1_")).arg(i);
-        settings.setValue(key + QLatin1String("url"), m_downloads[i]->m_url);
-        settings.setValue(key + QLatin1String("location"), QFileInfo(m_downloads[i]->m_output).filePath());
-        settings.setValue(key + QLatin1String("done"), m_downloads[i]->downloadedSuccessfully());
+        QString key = QString(QStringLiteral("download_%1_")).arg(i);
+        settings.setValue(key + QStringLiteral("url"), m_downloads[i]->m_url);
+        settings.setValue(key + QStringLiteral("location"), m_downloads[i]->m_file.filePath());
+        settings.setValue(key + QStringLiteral("done"), m_downloads[i]->downloadedSuccessfully());
     }
     int i = m_downloads.count();
-    QString key = QString(QLatin1String("download_%1_")).arg(i);
-    while (settings.contains(key + QLatin1String("url"))) {
-        settings.remove(key + QLatin1String("url"));
-        settings.remove(key + QLatin1String("location"));
-        settings.remove(key + QLatin1String("done"));
-        key = QString(QLatin1String("download_%1_")).arg(++i);
+    QString key = QString(QStringLiteral("download_%1_")).arg(i);
+    while (settings.contains(key + QStringLiteral("url"))) {
+        settings.remove(key + QStringLiteral("url"));
+        settings.remove(key + QStringLiteral("location"));
+        settings.remove(key + QStringLiteral("done"));
+        key = QString(QStringLiteral("download_%1_")).arg(++i);
     }
 }
 
 void DownloadManager::load()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("downloadmanager"));
-    QSize size = settings.value(QLatin1String("size")).toSize();
+    settings.beginGroup(QStringLiteral("downloadmanager"));
+    QSize size = settings.value(QStringLiteral("size")).toSize();
     if (size.isValid())
         resize(size);
-    QByteArray value = settings.value(QLatin1String("removeDownloadsPolicy"), QLatin1String("Never")).toByteArray();
+    QByteArray value = settings.value(QStringLiteral("removeDownloadsPolicy"), QStringLiteral("Never")).toByteArray();
     QMetaEnum removePolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("RemovePolicy"));
     m_removePolicy = removePolicyEnum.keyToValue(value) == -1 ?
-                        Never :
-                        static_cast<RemovePolicy>(removePolicyEnum.keyToValue(value));
+                     Never :
+                     static_cast<RemovePolicy>(removePolicyEnum.keyToValue(value));
 
     int i = 0;
-    QString key = QString(QLatin1String("download_%1_")).arg(i);
-    while (settings.contains(key + QLatin1String("url"))) {
-        QUrl url = settings.value(key + QLatin1String("url")).toUrl();
-        QString fileName = settings.value(key + QLatin1String("location")).toString();
-        bool done = settings.value(key + QLatin1String("done"), true).toBool();
-        if (!url.isEmpty() && !fileName.isEmpty()) {
+    QString key = QString(QStringLiteral("download_%1_")).arg(i);
+    while (settings.contains(key + QStringLiteral("url"))) {
+        QUrl url = settings.value(key + QStringLiteral("url")).toUrl();
+        QString fileName = settings.value(key + QStringLiteral("location")).toString();
+        bool done = settings.value(key + QStringLiteral("done"), true).toBool();
+        if (done && !url.isEmpty() && !fileName.isEmpty()) {
             DownloadItem *item = new DownloadItem(0, this);
-            item->m_output.setFileName(fileName);
-            item->fileNameLabel->setText(QFileInfo(item->m_output.fileName()).fileName());
+            item->m_file.setFile(fileName);
+            item->fileNameLabel->setText(item->m_file.fileName());
             item->m_url = url;
             item->stopButton->setVisible(false);
             item->stopButton->setEnabled(false);
-            item->tryAgainButton->setVisible(!done);
-            item->tryAgainButton->setEnabled(!done);
-            item->progressBar->setVisible(false);
+            item->progressBar->hide();
             addItem(item);
         }
-        key = QString(QLatin1String("download_%1_")).arg(++i);
+        key = QString(QStringLiteral("download_%1_")).arg(++i);
     }
     cleanupButton->setEnabled(m_downloads.count() - activeDownloads() > 0);
     updateActiveItemCount();
@@ -738,7 +623,7 @@ void DownloadManager::cleanup()
     updateActiveItemCount();
     if (m_downloads.isEmpty() && m_iconProvider) {
         delete m_iconProvider;
-        m_iconProvider = 0;
+        m_iconProvider = nullptr;
     }
     m_autoSaver->changeOccurred();
 }
@@ -753,7 +638,7 @@ void DownloadManager::setDownloadDirectory(const QString &directory)
 {
     m_downloadDirectory = directory;
     if (!m_downloadDirectory.isEmpty())
-        m_downloadDirectory += QLatin1Char('/');
+        m_downloadDirectory += QChar('/');
 }
 
 QString DownloadManager::downloadDirectory()
@@ -797,7 +682,7 @@ QString DownloadManager::dataString(qint64 size)
         unit = tr("GB");
     }
 
-    return QString(QLatin1String("%1 %2")).arg(newSize, 0, 'f', 1).arg(unit);
+    return QString(QStringLiteral("%1 %2")).arg(newSize, 0, 'f', 1).arg(unit);
 }
 
 DownloadModel::DownloadModel(DownloadManager *downloadManager, QObject *parent)
@@ -829,7 +714,7 @@ bool DownloadModel::removeRows(int row, int count, const QModelIndex &parent)
     int lastRow = row + count - 1;
     for (int i = lastRow; i >= row; --i) {
         if (m_downloadManager->m_downloads.at(i)->downloadedSuccessfully()
-            || m_downloadManager->m_downloads.at(i)->tryAgainButton->isEnabled()) {
+                || m_downloadManager->m_downloads.at(i)->tryAgainButton->isEnabled()) {
             beginRemoveRows(parent, i, i);
             m_downloadManager->m_downloads.takeAt(i)->deleteLater();
             endRemoveRows();
@@ -843,7 +728,7 @@ bool DownloadModel::removeRows(int row, int count, const QModelIndex &parent)
 Qt::ItemFlags DownloadModel::flags(const QModelIndex &index) const
 {
     if (index.row() < 0 || index.row() >= rowCount(index.parent()))
-        return 0;
+        return Qt::ItemFlags();
 
     Qt::ItemFlags defaultFlags = QAbstractItemModel::flags(index);
 
@@ -858,11 +743,11 @@ QMimeData *DownloadModel::mimeData(const QModelIndexList &indexes) const
 {
     QMimeData *mimeData = new QMimeData();
     QList<QUrl> urls;
-    foreach (const QModelIndex &index, indexes) {
+    Q_FOREACH (const QModelIndex &index, indexes) {
         if (!index.isValid())
             continue;
         DownloadItem *item = m_downloadManager->m_downloads.at(index.row());
-        urls.append(QUrl::fromLocalFile(QFileInfo(item->m_output).absoluteFilePath()));
+        urls.append(QUrl::fromLocalFile(item->m_file.absoluteFilePath()));
     }
     mimeData->setUrls(urls);
     return mimeData;
diff --git a/src/downloadmanager.h b/src/downloadmanager.h
index aecba983..55961245 100644
--- a/src/downloadmanager.h
+++ b/src/downloadmanager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2008 Jason A. Donenfeld <Jason@zx2c4.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -67,64 +67,54 @@
 #include "ui_downloads.h"
 #include "ui_downloaditem.h"
 
-#include <qnetworkreply.h>
+#include <QNetworkReply>
 
-#include <qfile.h>
-#include <qdatetime.h>
+#include <QFile>
+#include <QFileInfo>
+#include <QDateTime>
 #include <QElapsedTimer>
+#include <QWebEngineDownloadItem>
 
 class DownloadItem : public QWidget, public Ui_DownloadItem
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void statusChanged();
-    void progress(qint64 bytesReceived = 0, qint64 bytesTotal = 0);
     void downloadFinished();
 
 public:
-    DownloadItem(QNetworkReply *reply = 0, bool requestFileName = false, QWidget *parent = 0);
+    DownloadItem(QWebEngineDownloadItem *download, QWidget *parent = 0);
     bool downloading() const;
     bool downloadedSuccessfully() const;
 
-    qint64 bytesTotal() const;
-    qint64 bytesReceived() const;
-    double remainingTime() const;
-    double currentSpeed() const;
-
-    QUrl m_url;
+    void init();
+    bool getFileName(bool promptForFileName = false);
 
-    QFile m_output;
-    QNetworkReply *m_reply;
+    QFileInfo m_file;
 
-private slots:
+private Q_SLOTS:
     void stop();
     void tryAgain();
     void open();
 
-    void downloadReadyRead();
-    void error(QNetworkReply::NetworkError code);
-    void downloadProgress(qint64 bytesReceived, qint64 bytesTotal);
-    void metaDataChanged();
+    void downloadProgress();
     void finished();
 
 private:
-    void getFileName();
-    void init();
+    friend class DownloadManager;
     void updateInfoLabel();
 
-    QString saveFileName(const QString &directory) const;
-
-    bool m_requestFileName;
+    QUrl m_url;
     qint64 m_bytesReceived;
     QElapsedTimer m_downloadTime;
-    bool m_startedSaving;
-    bool m_finishedDownloading;
-    bool m_gettingFileName;
-    bool m_canceledFileSelect;
+    bool m_stopped;
     QTime m_lastProgressTime;
 
+    QScopedPointer<QWebEngineDownloadItem> m_download;
     friend class DownloadManager;
+
+    static QString dataString(qint64 size);
 };
 
 class AutoSaver;
@@ -137,8 +127,7 @@ QT_END_NAMESPACE
 class DownloadManager : public QDialog, public Ui_DownloadDialog
 {
     Q_OBJECT
-    Q_PROPERTY(RemovePolicy removePolicy READ removePolicy WRITE setRemovePolicy)
-    Q_ENUMS(RemovePolicy)
+    Q_PROPERTY(RemovePolicy removePolicy READ removePolicy WRITE setRemovePolicy NOTIFY removePolicyChanged)
 
 public:
     enum RemovePolicy {
@@ -146,14 +135,16 @@ class DownloadManager : public QDialog, public Ui_DownloadDialog
         Exit,
         SuccessFullDownload
     };
+    Q_ENUM(RemovePolicy)
 
-    DownloadManager(QWidget *parent = 0);
+    DownloadManager(QWidget *parent = nullptr);
     ~DownloadManager();
     int activeDownloads() const;
     bool allowQuit();
 
     RemovePolicy removePolicy() const;
     void setRemovePolicy(RemovePolicy policy);
+    void removePolicyChanged(){};
 
     static QString timeString(double timeRemaining);
     static QString dataString(qint64 size);
@@ -161,14 +152,11 @@ class DownloadManager : public QDialog, public Ui_DownloadDialog
     void setDownloadDirectory(const QString &directory);
     QString downloadDirectory();
 
-public slots:
-    void download(const QNetworkRequest &request, bool requestFileName = false);
-    inline void download(const QUrl &url, bool requestFileName = false)
-        { download(QNetworkRequest(url), requestFileName); }
-    void handleUnsupportedContent(QNetworkReply *reply, bool requestFileName = false);
+public Q_SLOTS:
+    void download(QWebEngineDownloadItem *download);
     void cleanup();
 
-private slots:
+private Q_SLOTS:
     void save() const;
     void updateRow(DownloadItem *item);
     void updateRow();
@@ -183,7 +171,6 @@ private slots:
 
     AutoSaver *m_autoSaver;
     DownloadModel *m_model;
-    QNetworkAccessManager *m_manager;
     QFileIconProvider *m_iconProvider;
     QList<DownloadItem*> m_downloads;
     RemovePolicy m_removePolicy;
@@ -198,7 +185,7 @@ class DownloadModel : public QAbstractListModel
     Q_OBJECT
 
 public:
-    DownloadModel(DownloadManager *downloadManager, QObject *parent = 0);
+    DownloadModel(DownloadManager *downloadManager, QObject *parent = nullptr);
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
diff --git a/src/downloads.ui b/src/downloads.ui
index 134148b2..8cd9c2b4 100644
--- a/src/downloads.ui
+++ b/src/downloads.ui
@@ -6,15 +6,24 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>340</width>
-    <height>233</height>
+    <width>552</width>
+    <height>366</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Downloads</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="margin">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
     <number>0</number>
    </property>
    <property name="spacing">
@@ -82,13 +91,6 @@
        </property>
       </spacer>
      </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Close</set>
-       </property>
-      </widget>
-     </item>
     </layout>
    </item>
   </layout>
diff --git a/src/history/history.cpp b/src/history/history.cpp
index 5045c899..eb0e1ab3 100644
--- a/src/history/history.cpp
+++ b/src/history/history.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -69,24 +69,23 @@
 #include "historymanager.h"
 #include "treesortfilterproxymodel.h"
 
-#include <qbuffer.h>
-#include <qclipboard.h>
-#include <qdesktopservices.h>
-#include <qheaderview.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <QBuffer>
+#include <QClipboard>
+#include <QDesktopServices>
+#include <QHeaderView>
+#include <QDir>
+#include <QFile>
 #include <qfileinfo.h>
-#include <qsettings.h>
-#include <qstyle.h>
-#include <qtemporaryfile.h>
-#include <qtextstream.h>
-#include <qmessagebox.h>
-#include <qmimedata.h>
+#include <QSettings>
+#include <QStyle>
+#include <QTemporaryFile>
+#include <QTextStream>
+#include <QMessageBox>
+#include <QMimeData>
 
-#include <qwebhistoryinterface.h>
-#include <qwebsettings.h>
+#include <QWebEngineSettings>
 
-#include <qdebug.h>
+#include <QDebug>
 
 HistoryModel::HistoryModel(HistoryManager *history, QObject *parent)
     : QAbstractTableModel(parent)
@@ -124,16 +123,18 @@ void HistoryModel::entryAdded()
 void HistoryModel::entryUpdated(int offset)
 {
     QModelIndex idx = index(offset, 0);
-    emit dataChanged(idx, idx);
+    Q_EMIT dataChanged(idx, idx);
 }
 
 QVariant HistoryModel::headerData(int section, Qt::Orientation orientation, int role) const
 {
     if (orientation == Qt::Horizontal
-        && role == Qt::DisplayRole) {
+            && role == Qt::DisplayRole) {
         switch (section) {
-        case 0: return tr("Title");
-        case 1: return tr("Address");
+        case 0:
+            return tr("Title");
+        case 1:
+            return tr("Address");
         }
     }
     return QAbstractTableModel::headerData(section, orientation, role);
@@ -236,12 +237,12 @@ int HistoryMenuModel::rowCount(const QModelIndex &parent) const
         int folders = sourceModel()->rowCount();
         int bumpedItems = bumpedRows();
         if (bumpedItems <= MOVEDROWS
-            && bumpedItems == sourceModel()->rowCount(sourceModel()->index(0, 0)))
+                && bumpedItems == sourceModel()->rowCount(sourceModel()->index(0, 0)))
             --folders;
         return bumpedItems + folders;
     }
 
-    if (parent.internalId() == -1) {
+    if (parent.internalId() == (quintptr)-1) {
         if (parent.row() < bumpedRows())
             return 0;
     }
@@ -271,7 +272,7 @@ QModelIndex HistoryMenuModel::mapToSource(const QModelIndex &proxyIndex) const
     if (!proxyIndex.isValid())
         return QModelIndex();
 
-    if (proxyIndex.internalId() == -1) {
+    if (proxyIndex.internalId() == (quintptr)-1) {
         int bumpedItems = bumpedRows();
         if (proxyIndex.row() < bumpedItems)
             return m_treeModel->index(proxyIndex.row(), proxyIndex.column(), m_treeModel->index(0, 0));
@@ -288,8 +289,8 @@ QModelIndex HistoryMenuModel::mapToSource(const QModelIndex &proxyIndex) const
 QModelIndex HistoryMenuModel::index(int row, int column, const QModelIndex &parent) const
 {
     if (row < 0
-        || column < 0 || column >= columnCount(parent)
-        || parent.column() > 0)
+            || column < 0 || column >= columnCount(parent)
+            || parent.column() > 0)
         return QModelIndex();
     if (!parent.isValid())
         return createIndex(row, column, -1);
@@ -328,7 +329,7 @@ QMimeData *HistoryMenuModel::mimeData(const QModelIndexList &indexes) const
 {
     QMimeData *mimeData = new QMimeData;
     QList<QUrl> urls;
-    foreach (const QModelIndex &idx, indexes) {
+    Q_FOREACH (const QModelIndex &idx, indexes) {
         QUrl url = idx.data(HistoryModel::UrlRole).toUrl();
         urls.append(url);
     }
@@ -339,8 +340,8 @@ QMimeData *HistoryMenuModel::mimeData(const QModelIndexList &indexes) const
 #ifndef NO_BROWSERAPPLICATION
 HistoryMenu::HistoryMenu(QWidget *parent)
     : ModelMenu(parent)
-    , m_history(0)
-    , m_historyMenuModel(0)
+    , m_history(nullptr)
+    , m_historyMenuModel(nullptr)
 {
     setMaxRows(7);
     connect(this, SIGNAL(activated(const QModelIndex &)),
@@ -350,7 +351,7 @@ HistoryMenu::HistoryMenu(QWidget *parent)
 
 void HistoryMenu::activated(const QModelIndex &index)
 {
-    emit openUrl(index.data(HistoryModel::UrlRole).toUrl(),
+    Q_EMIT openUrl(index.data(HistoryModel::UrlRole).toUrl(),
                  index.data(HistoryModel::TitleRole).toString());
 }
 
@@ -399,8 +400,8 @@ void HistoryMenu::showHistoryDialog()
 
 void HistoryMenu::clearHistoryDialog()
 {
-    if (m_history && QMessageBox::question(0, tr("Clear History"), tr("Do you want to clear the history?"),
-            QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) {
+    if (m_history && QMessageBox::question(nullptr, tr("Clear History"), tr("Do you want to clear the history?"),
+                                           QMessageBox::Yes | QMessageBox::No, QMessageBox::No) == QMessageBox::Yes) {
         m_history->clear();
     }
 }
@@ -412,11 +413,16 @@ void HistoryMenu::setInitialActions(QList<QAction*> actions)
         addAction(m_initialActions.at(i));
 }
 
+#endif
+
+#ifndef NO_HISTORYDIALOG
 HistoryDialog::HistoryDialog(QWidget *parent, HistoryManager *setHistory) : QDialog(parent)
 {
     HistoryManager *history = setHistory;
+#ifndef NO_BROWSERAPPLICATION
     if (!history)
         history = BrowserApplication::historyManager();
+#endif
     setupUi(this);
     tree->setUniformRowHeights(true);
     tree->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -435,7 +441,7 @@ HistoryDialog::HistoryDialog(QWidget *parent, HistoryManager *setHistory) : QDia
     tree->setExpanded(proxyModel->index(0, 0), true);
     tree->setAlternatingRowColors(true);
     QFontMetrics fm(font());
-    int header = fm.horizontalAdvance(QLatin1Char('m')) * 40;
+    int header = fm.horizontalAdvance(QChar('m')) * 40;
     tree->header()->resizeSection(0, header);
     tree->header()->setStretchLastSection(true);
     connect(tree, SIGNAL(activated(const QModelIndex&)),
@@ -464,9 +470,11 @@ void HistoryDialog::open()
     QModelIndex index = tree->currentIndex();
     if (!index.parent().isValid())
         return;
+#ifndef NO_BROWSERAPPLICATION
     BrowserApplication::instance()->setEventMouseButtons(qApp->mouseButtons());
     BrowserApplication::instance()->setEventKeyboardModifiers(qApp->keyboardModifiers());
-    emit openUrl(index.data(HistoryModel::UrlRole).toUrl(),
+#endif
+    Q_EMIT openUrl(index.data(HistoryModel::UrlRole).toUrl(),
                  index.data(HistoryModel::TitleRole).toString());
 }
 
@@ -552,7 +560,7 @@ void HistoryFilterModel::setSourceModel(QAbstractItemModel *newSourceModel)
 
 void HistoryFilterModel::sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 {
-    emit dataChanged(mapFromSource(topLeft), mapFromSource(bottomRight));
+    Q_EMIT dataChanged(mapFromSource(topLeft), mapFromSource(bottomRight));
 }
 
 QVariant HistoryFilterModel::headerData(int section, Qt::Orientation orientation, int role) const
@@ -602,7 +610,7 @@ QModelIndex HistoryFilterModel::mapFromSource(const QModelIndex &sourceIndex) co
     int sourceOffset = sourceModel()->rowCount() - sourceIndex.row();
 
     QList<HistoryData>::iterator pos = std::lower_bound(m_filteredRows.begin(),
-        m_filteredRows.end(), HistoryData(sourceOffset, -1));
+                                       m_filteredRows.end(), HistoryData(sourceOffset, -1));
 
     if (pos == m_filteredRows.end())
         return QModelIndex();
@@ -614,7 +622,7 @@ QModelIndex HistoryFilterModel::index(int row, int column, const QModelIndex &pa
 {
     load();
     if (row < 0 || row >= rowCount(parent)
-        || column < 0 || column >= columnCount(parent))
+            || column < 0 || column >= columnCount(parent))
         return QModelIndex();
 
     return createIndex(row, column, m_filteredRows[row].tailOffset);
@@ -643,7 +651,7 @@ void HistoryFilterModel::load() const
         } else {
             // we already know about this url: just increment its frecency score
             QList<HistoryData>::iterator pos = std::lower_bound(m_filteredRows.begin(),
-                m_filteredRows.end(), HistoryData(m_historyHash[url], -1));
+                                               m_filteredRows.end(), HistoryData(m_historyHash[url], -1));
             Q_ASSERT(pos != m_filteredRows.end());
             pos->frecency += frecencyScore(idx);
         }
@@ -662,7 +670,7 @@ void HistoryFilterModel::sourceRowsInserted(const QModelIndex &parent, int start
     int currentFrecency = 0;
     if (m_historyHash.contains(url)) {
         QList<HistoryData>::iterator pos = std::lower_bound(m_filteredRows.begin(),
-            m_filteredRows.end(), HistoryData(m_historyHash[url], -1));
+                                           m_filteredRows.end(), HistoryData(m_historyHash[url], -1));
         Q_ASSERT(pos != m_filteredRows.end());
         int realRow = pos - m_filteredRows.begin();
         currentFrecency = pos->frecency;
@@ -753,7 +761,7 @@ QVariant HistoryTreeModel::data(const QModelIndex &index, int role) const
                 QDate date = idx.data(HistoryModel::DateRole).toDate();
                 if (date == QDate::currentDate())
                     return tr("Earlier Today");
-                return date.toString(QLatin1String("dddd, MMMM d, yyyy"));
+                return date.toString(QStringLiteral("dddd, MMMM d, yyyy"));
             }
             if (index.column() == 1) {
                 return tr("%n item(s)", "", rowCount(index.sibling(index.row(), 0)));
@@ -784,8 +792,8 @@ int HistoryTreeModel::columnCount(const QModelIndex &parent) const
 int HistoryTreeModel::rowCount(const QModelIndex &parent) const
 {
     if (parent.internalId() != 0
-        || parent.column() > 0
-        || !sourceModel())
+            || parent.column() > 0
+            || !sourceModel())
         return 0;
 
     // row count OF dates
@@ -843,12 +851,12 @@ QModelIndex HistoryTreeModel::mapToSource(const QModelIndex &proxyIndex) const
 QModelIndex HistoryTreeModel::index(int row, int column, const QModelIndex &parent) const
 {
     if (row < 0
-        || column < 0 || column >= columnCount(parent)
-        || parent.column() > 0)
+            || column < 0 || column >= columnCount(parent)
+            || parent.column() > 0)
         return QModelIndex();
 
     if (!parent.isValid())
-        return createIndex(row, column, (void*) 0);
+        return createIndex(row, column, (void*) nullptr);
     return createIndex(row, column, parent.row() + 1);
 }
 
@@ -857,7 +865,7 @@ QModelIndex HistoryTreeModel::parent(const QModelIndex &index) const
     int offset = index.internalId();
     if (offset == 0 || !index.isValid())
         return QModelIndex();
-    return createIndex(offset - 1, 0, (void*) 0);
+    return createIndex(offset - 1, 0, (void*) nullptr);
 }
 
 bool HistoryTreeModel::hasChildren(const QModelIndex &parent) const
@@ -986,26 +994,26 @@ void HistoryTreeModel::sourceRowsRemoved(const QModelIndex &parent, int start, i
     Q_UNUSED(parent); // Avoid warnings when compiling release
     Q_ASSERT(!parent.isValid());
     if (!m_sourceRowCache.isEmpty())
-    for (int i = end; i >= start;) {
-        QList<int>::iterator it;
-        it = std::lower_bound(m_sourceRowCache.begin(), m_sourceRowCache.end(), i);
-        if (*it != i)
-            --it;
-        int row = qMax(0, it - m_sourceRowCache.begin());
-        int offset = m_sourceRowCache[row];
-        QModelIndex dateParent = index(row, 0);
-        // If we can remove all the rows in the date do that and skip over them
-        int rc = rowCount(dateParent);
-        if (i - rc + 1 == offset && start <= i - rc + 1) {
-            m_sourceRowCache.removeAt(row);
-            i -= rc + 1;
-        } else {
-            ++row;
-            --i;
+        for (int i = end; i >= start;) {
+            QList<int>::iterator it;
+            it = std::lower_bound(m_sourceRowCache.begin(), m_sourceRowCache.end(), i);
+            if (*it != i)
+                --it;
+            int row = qMax(0, it - m_sourceRowCache.begin());
+            int offset = m_sourceRowCache[row];
+            QModelIndex dateParent = index(row, 0);
+            // If we can remove all the rows in the date do that and skip over them
+            int rc = rowCount(dateParent);
+            if (i - rc + 1 == offset && start <= i - rc + 1) {
+                m_sourceRowCache.removeAt(row);
+                i -= rc + 1;
+            } else {
+                ++row;
+                --i;
+            }
+            for (int j = row; j < m_sourceRowCache.count(); ++j)
+                --m_sourceRowCache[j];
         }
-        for (int j = row; j < m_sourceRowCache.count(); ++j)
-            --m_sourceRowCache[j];
-    }
     if (removingDown) {
         endRemoveRows();
         removingDown = false;
diff --git a/src/history/history.h b/src/history/history.h
index de064256..c8ddb08d 100644
--- a/src/history/history.h
+++ b/src/history/history.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,21 +65,19 @@
 
 #include "modelmenu.h"
 
-#include <qdatetime.h>
+#include <QDateTime>
 #include <qhash.h>
-#include <qobject.h>
-#include <qsortfilterproxymodel.h>
-#include <qtimer.h>
-#include <qurl.h>
-
-#include <qwebhistoryinterface.h>
+#include <QObject>
+#include <QSortFilterProxyModel>
+#include <QTimer>
+#include <QUrl>
 
 class HistoryManager;
 class HistoryModel : public QAbstractTableModel
 {
     Q_OBJECT
 
-public slots:
+public Q_SLOTS:
     void historyReset();
     void historyGoingToChange();
     void entryAdded();
@@ -95,7 +93,7 @@ public slots:
         MaxRole = TitleRole
     };
 
-    HistoryModel(HistoryManager *history, QObject *parent = 0);
+    HistoryModel(HistoryManager *history, QObject *parent = nullptr);
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -116,10 +114,13 @@ class HistoryFilterModel : public QAbstractProxyModel
     Q_OBJECT
 
 public:
-    HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
+    HistoryFilterModel(QAbstractItemModel *sourceModel, QObject *parent = nullptr);
 
     inline bool historyContains(const QString &url) const
-        { load(); return m_historyHash.contains(url); }
+    {
+        load();
+        return m_historyHash.contains(url);
+    }
     int historyLocation(const QString &url) const;
 
     enum Roles {
@@ -140,7 +141,7 @@ class HistoryFilterModel : public QAbstractProxyModel
 
     void recalculateFrecencies();
 
-private slots:
+private Q_SLOTS:
     void sourceReset();
     void sourceDataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight);
     void sourceRowsInserted(const QModelIndex &parent, int start, int end);
@@ -162,7 +163,7 @@ private slots:
 
         bool operator==(const HistoryData &other) const {
             return (tailOffset == other.tailOffset)
-                && (frecency == -1 || other.frecency == -1 || frecency == other.frecency);
+                   && (frecency == -1 || other.frecency == -1 || frecency == other.frecency);
         }
         bool operator!=(const HistoryData &other) const {
             return !(*this == other);
@@ -194,7 +195,7 @@ class HistoryMenuModel : public QAbstractProxyModel
     Q_OBJECT
 
 public:
-    HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent = 0);
+    HistoryMenuModel(HistoryTreeModel *sourceModel, QObject *parent = nullptr);
     int columnCount(const QModelIndex &parent) const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     QModelIndex mapFromSource(const QModelIndex & sourceIndex) const;
@@ -217,18 +218,18 @@ class HistoryMenu : public ModelMenu
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void openUrl(const QUrl &url, const QString &title);
 
 public:
-    HistoryMenu(QWidget *parent = 0);
+    HistoryMenu(QWidget *parent = nullptr);
     void setInitialActions(QList<QAction*> actions);
 
 protected:
     bool prePopulated();
     void postPopulated();
 
-private slots:
+private Q_SLOTS:
     void activated(const QModelIndex &index);
     void showHistoryDialog();
     void clearHistoryDialog();
@@ -248,7 +249,7 @@ class HistoryTreeModel : public QAbstractProxyModel
     Q_OBJECT
 
 public:
-    HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent = 0);
+    HistoryTreeModel(QAbstractItemModel *sourceModel, QObject *parent = nullptr);
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
     int columnCount(const QModelIndex &parent) const;
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
@@ -263,7 +264,7 @@ class HistoryTreeModel : public QAbstractProxyModel
 
     void setSourceModel(QAbstractItemModel *sourceModel);
 
-private slots:
+private Q_SLOTS:
     void sourceReset();
     void sourceRowsInserted(const QModelIndex &parent, int start, int end);
     void sourceRowsRemoved(const QModelIndex &parent, int start, int end);
@@ -275,20 +276,24 @@ private slots:
 
 };
 
-#ifndef NO_BROWSERAPPLICATION
+#ifndef NO_HISTORYDIALOG
 #include "ui_history.h"
 
 class HistoryDialog : public QDialog, public Ui_HistoryDialog
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void openUrl(const QUrl &url, const QString &title);
 
 public:
-    HistoryDialog(QWidget *parent = 0, HistoryManager *history = 0);
+#ifndef NO_BROWSERAPPLICATION
+    HistoryDialog(QWidget *parent = nullptr, HistoryManager *history = nullptr);
+#else
+    HistoryDialog(QWidget *parent, HistoryManager *history);
+#endif
 
-private slots:
+private Q_SLOTS:
     void customContextMenuRequested(const QPoint &pos);
     void open();
     void copy();
diff --git a/src/history/history.pri b/src/history/history.pri
deleted file mode 100644
index 96ff3e59..00000000
--- a/src/history/history.pri
+++ /dev/null
@@ -1,16 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += \
-  history.h \
-  historycompleter.h \
-  historymanager.h
-
-SOURCES += \
-  history.cpp \
-  historycompleter.cpp \
-  historymanager.cpp
-
-FORMS += \
-    history.ui
diff --git a/src/history/historymanager.cpp b/src/history/historymanager.cpp
index 937d5865..29689c12 100644
--- a/src/history/historymanager.cpp
+++ b/src/history/historymanager.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -64,17 +64,19 @@
 
 #include "autosaver.h"
 #include "history.h"
+#ifndef NO_BROWSERAPPLICATION
+#include "browserapplication.h"
+#endif
 
-#include <qbuffer.h>
-#include <qdesktopservices.h>
-#include <qdir.h>
-#include <qfile.h>
-#include <qsettings.h>
-#include <qtemporaryfile.h>
-#include <qwebhistoryinterface.h>
-#include <qwebsettings.h>
+#include <QBuffer>
+#include <QDesktopServices>
+#include <QDir>
+#include <QFile>
+#include <QSettings>
+#include <QTemporaryFile>
+#include <QWebEngineSettings>
 
-#include <qdebug.h>
+#include <QDebug>
 
 
 // Fix so we don't have to include browserapplication. Reduces the size.
@@ -85,7 +87,7 @@ QString  HistoryManager::dataFilePath(const QString &fileName)
         QDir dir;
         dir.mkpath(directory);
     }
-    return directory + QLatin1String("/") + fileName;
+    return directory + QStringLiteral("/") + fileName;
 }
 
 QString HistoryEntry::userTitle() const
@@ -103,12 +105,12 @@ QString HistoryEntry::userTitle() const
 static const unsigned int HISTORY_VERSION = 23;
 
 HistoryManager::HistoryManager(QObject *parent)
-    : QWebHistoryInterface(parent)
+    : QObject(parent)
     , m_saveTimer(new AutoSaver(this))
     , m_daysToExpire(30)
-    , m_historyModel(0)
-    , m_historyFilterModel(0)
-    , m_historyTreeModel(0)
+    , m_historyModel(nullptr)
+    , m_historyFilterModel(nullptr)
+    , m_historyTreeModel(nullptr)
 {
     m_expiredTimer.setSingleShot(true);
     connect(&m_expiredTimer, SIGNAL(timeout()),
@@ -122,9 +124,6 @@ HistoryManager::HistoryManager(QObject *parent)
     m_historyModel = new HistoryModel(this, this);
     m_historyFilterModel = new HistoryFilterModel(m_historyModel, this);
     m_historyTreeModel = new HistoryTreeModel(m_historyFilterModel, this);
-
-    // QWebHistoryInterface will delete the history manager
-    QWebHistoryInterface::setDefaultInterface(this);
 }
 
 HistoryManager::~HistoryManager()
@@ -147,16 +146,23 @@ bool HistoryManager::historyContains(const QString &url) const
 
 void HistoryManager::addHistoryEntry(const QString &url)
 {
+#ifndef NO_BROWSERAPPLICATION
+    if (BrowserApplication::instance()->isPrivate())
+        return;
+#endif
+
     QUrl cleanUrl(url);
     cleanUrl.setPassword(QString());
     cleanUrl.setHost(cleanUrl.host().toLower());
-    HistoryEntry item(atomicString(cleanUrl.toString()), QDateTime::currentDateTime());
-    prependHistoryEntry(item);
+    if(!cleanUrl.toString().toLower().contains("endorphinbrowser.gitlab.io/newTab/")) {
+        HistoryEntry item(atomicString(cleanUrl.toString()), QDateTime::currentDateTime());
+        prependHistoryEntry(item);
+    }
 }
 
 void HistoryManager::setHistory(const QList<HistoryEntry> &history, bool loadedAndSorted)
 {
-    emit historyGoingToChange();
+    Q_EMIT historyGoingToChange();
     m_history = history;
 
     // verify that it is sorted by date
@@ -171,7 +177,7 @@ void HistoryManager::setHistory(const QList<HistoryEntry> &history, bool loadedA
         m_lastSavedUrl.clear();
         m_saveTimer->changeOccurred();
     }
-    emit historyReset();
+    Q_EMIT historyReset();
 }
 
 HistoryModel *HistoryManager::historyModel() const
@@ -211,7 +217,7 @@ void HistoryManager::checkForExpired()
         HistoryEntry item = m_history.takeLast();
         // remove from saved file also
         m_lastSavedUrl.clear();
-        emit entryRemoved(item);
+        Q_EMIT entryRemoved(item);
     }
 
     if (nextTimeout > 0)
@@ -220,12 +226,14 @@ void HistoryManager::checkForExpired()
 
 void HistoryManager::prependHistoryEntry(const HistoryEntry &item)
 {
-    QWebSettings *globalSettings = QWebSettings::globalSettings();
-    if (globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled))
+    /*
+    QWebEngineSettings *globalSettings = QWebEngineSettings::globalSettings();
+    if (globalSettings->testAttribute(QWebEngineSettings::PrivateBrowsingEnabled))
         return;
+    */
 
     m_history.prepend(item);
-    emit entryAdded(item);
+    Q_EMIT entryAdded(item);
     if (m_history.count() == 1)
         checkForExpired();
 }
@@ -238,7 +246,7 @@ void HistoryManager::updateHistoryEntry(const QUrl &url, const QString &title)
             m_saveTimer->changeOccurred();
             if (m_lastSavedUrl.isEmpty())
                 m_lastSavedUrl = m_history.at(i).url;
-            emit entryUpdated(i);
+            Q_EMIT entryUpdated(i);
             break;
         }
     }
@@ -248,14 +256,14 @@ void HistoryManager::removeHistoryEntry(const HistoryEntry &item)
 {
     m_lastSavedUrl.clear();
     m_history.removeOne(item);
-    emit entryRemoved(item);
+    Q_EMIT entryRemoved(item);
 }
 
 void HistoryManager::removeHistoryEntry(const QUrl &url, const QString &title)
 {
     for (int i = 0; i < m_history.count(); ++i) {
         if (url == m_history.at(i).url
-            && (title.isEmpty() || title == m_history.at(i).title)) {
+                && (title.isEmpty() || title == m_history.at(i).title)) {
             removeHistoryEntry(m_history.at(i));
             break;
         }
@@ -278,29 +286,29 @@ void HistoryManager::setDaysToExpire(int limit)
 
 void HistoryManager::clear()
 {
-    emit historyGoingToChange();
+    Q_EMIT historyGoingToChange();
     m_history.clear();
     m_atomicStringHash.clear();
     m_lastSavedUrl.clear();
     m_saveTimer->changeOccurred();
     m_saveTimer->saveIfNeccessary();
-    emit historyReset();
-    emit historyCleared();
+    Q_EMIT historyReset();
+    Q_EMIT historyCleared();
 }
 
 void HistoryManager::loadSettings()
 {
     // load settings
     QSettings settings;
-    settings.beginGroup(QLatin1String("history"));
-    m_daysToExpire = settings.value(QLatin1String("historyLimit"), 30).toInt();
+    settings.beginGroup(QStringLiteral("history"));
+    m_daysToExpire = settings.value(QStringLiteral("historyLimit"), 30).toInt();
 }
 
 void HistoryManager::load()
 {
     loadSettings();
 
-    QFile historyFile(HistoryManager::dataFilePath(QLatin1String("history")));
+    QFile historyFile(HistoryManager::dataFilePath(QStringLiteral("history")));
 
     if (!historyFile.exists())
         return;
@@ -374,8 +382,8 @@ QString HistoryManager::atomicString(const QString &string) {
 void HistoryManager::save()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("history"));
-    settings.setValue(QLatin1String("historyLimit"), m_daysToExpire);
+    settings.beginGroup(QStringLiteral("history"));
+    settings.setValue(QStringLiteral("historyLimit"), m_daysToExpire);
 
     bool saveAll = m_lastSavedUrl.isEmpty();
     int first = m_history.count() - 1;
@@ -391,7 +399,7 @@ void HistoryManager::save()
     if (first == m_history.count() - 1)
         saveAll = true;
 
-    QFile historyFile(HistoryManager::dataFilePath(QLatin1String("history")));
+    QFile historyFile(HistoryManager::dataFilePath(QStringLiteral("history")));
 
     // When saving everything use a temporary file to prevent possible data loss.
     QTemporaryFile tempFile;
diff --git a/src/history/historymanager.h b/src/history/historymanager.h
index 548ab6ab..b5fbb4ed 100644
--- a/src/history/historymanager.h
+++ b/src/history/historymanager.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,19 +63,18 @@
 #ifndef HISTORYMANAGER_H
 #define HISTORYMANAGER_H
 
-#include <qdatetime.h>
+#include <QDateTime>
 #include <qhash.h>
-#include <qtimer.h>
-#include <qurl.h>
-#include <qwebhistoryinterface.h>
+#include <QTimer>
+#include <QUrl>
 
 class HistoryEntry
 {
 public:
     HistoryEntry() {}
     HistoryEntry(const QString &u,
-                const QDateTime &d = QDateTime(), const QString &t = QString())
-            : url(u), title(t), dateTime(d) {}
+                 const QDateTime &d = QDateTime(), const QString &t = QString())
+        : url(u), title(t), dateTime(d) {}
 
     inline bool operator==(const HistoryEntry &other) const {
         return other.title == title
@@ -84,7 +83,9 @@ class HistoryEntry
 
     // history is sorted in reverse
     inline bool operator <(const HistoryEntry &other) const
-        { return dateTime > other.dateTime; }
+    {
+        return dateTime > other.dateTime;
+    }
 
     QString userTitle() const;
 
@@ -97,12 +98,12 @@ class AutoSaver;
 class HistoryModel;
 class HistoryFilterModel;
 class HistoryTreeModel;
-class HistoryManager : public QWebHistoryInterface
+class HistoryManager : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(int daysToExpire READ daysToExpire WRITE setDaysToExpire)
+    Q_PROPERTY(int daysToExpire READ daysToExpire WRITE setDaysToExpire NOTIFY daysToExpireChanged)
 
-signals:
+Q_SIGNALS:
     void historyCleared();
     void historyGoingToChange();
     void historyReset();
@@ -111,7 +112,7 @@ class HistoryManager : public QWebHistoryInterface
     void entryUpdated(int offset);
 
 public:
-    HistoryManager(QObject *parent = 0);
+    HistoryManager(QObject *parent = nullptr);
     ~HistoryManager();
 
     bool historyContains(const QString &url) const;
@@ -121,6 +122,7 @@ class HistoryManager : public QWebHistoryInterface
 
     int daysToExpire() const;
     void setDaysToExpire(int limit);
+    void daysToExpireChanged();
 
     QList<HistoryEntry> history() const;
     void setHistory(const QList<HistoryEntry> &history, bool loadedAndSorted = false);
@@ -129,14 +131,14 @@ class HistoryManager : public QWebHistoryInterface
     HistoryModel *historyModel() const;
     HistoryFilterModel *historyFilterModel() const;
     HistoryTreeModel *historyTreeModel() const;
-    
+
     QString dataFilePath(const QString &fileName);
 
-public slots:
+public Q_SLOTS:
     void clear();
     void loadSettings();
 
-private slots:
+private Q_SLOTS:
     void save();
     void checkForExpired();
 
diff --git a/src/htmls/dirlist.html b/src/htmls/dirlist.html
index eef1c10f..543f759f 100644
--- a/src/htmls/dirlist.html
+++ b/src/htmls/dirlist.html
@@ -4,71 +4,90 @@
 <title>%1</title>
 <style>
 body {
-  padding: 1em 0em;
-  background: #eeeeee;
+    padding: 1em 0em;
+background:
+#eeeeee;
 }
 hr {
-  color: lightgray;
-  width: 100%;
+color:
+    lightgray;
+    width: 100%;
 }
 img {
-  float: left;
-  opacity: .8;
+float:
+    left;
+opacity:
+    .8;
 }
 #box {
-  background: white;
-  border: 1px solid lightgray;
-  width: 600px;
-  padding: 30px;
-  margin: auto;
+background:
+white;
+border: 1px solid lightgray;
+width: 600px;
+padding: 30px;
+margin:
+auto;
 }
 h1 {
-  font-size: 130%;
-  font-weight: bold;
-  border-bottom: 1px solid lightgray;
-  margin-left: 48px;
+    font-size: 130%;
+font-weight:
+    bold;
+    border-bottom: 1px solid lightgray;
+    margin-left: 48px;
 }
 h2 {
-  font-size: 100%;
-  font-weight: normal;
-  border-bottom: 1px solid lightgray;
-  margin-left: 48px;
+    font-size: 100%;
+font-weight:
+    normal;
+    border-bottom: 1px solid lightgray;
+    margin-left: 48px;
 }
 table {
-  font-size: 80%;
-  padding-left: 48px;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  margin: 5px 0;
-  width: 100%;
+    font-size: 80%;
+    padding-left: 48px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    margin: 5px 0;
+    width: 100%;
 }
 .modified {
-  text-align: left;
-  vertical-align: top;
-  white-space: nowrap;
+text-align:
+    left;
+vertical-align:
+    top;
+white-space:
+    nowrap;
 }
 .size {
-  text-align: right;
-  vertical-align: top;
-  white-space: nowrap;
-  padding-right: 8px;
+text-align:
+    right;
+vertical-align:
+    top;
+white-space:
+    nowrap;
+    padding-right: 8px;
 }
 .name {
-  text-align: left;
-  vertical-align: top;
-  white-space: pre-wrap;
-  width: 100%
+text-align:
+    left;
+vertical-align:
+    top;
+white-space:
+    pre-wrap;
+    width: 100%
 }
 %3
 #reloadButton {
-  padding-left: 48px;
+padding-left: 48px;
 }
-body:not(.showDotFiles) .hidden {
-  display: none;
+body:
+not(.showDotFiles) .hidden {
+display:
+    none;
 }
 .showHide{
-  font-size: 80%;
-  padding-left: 48px;
+    font-size: 80%;
+    padding-left: 48px;
 }
 </style>
 <script>
@@ -79,14 +98,14 @@
 </script>
 </head>
 <body>
-  <div id="box">
-    <h1>%2</h1>
-    <div class='showHide'>
-        <input type="checkbox" onchange="showHide()" name="Show Hidden Files"/> %5
-    </div>
-    <table>
-%4
-    </table>
-  </div>
-</body>
-</html>
+<div id="box">
+        <h1>%2</h1>
+        <div class='showHide'>
+                       <input type="checkbox" onchange="showHide()" name="Show Hidden Files"/> %5
+                                   </div>
+                                   <table>
+                                   %4
+                                   </table>
+                                   </div>
+                                   </body>
+                                   </html>
diff --git a/src/htmls/htmls.qrc b/src/htmls/htmls.qrc
index da555367..0b986866 100644
--- a/src/htmls/htmls.qrc
+++ b/src/htmls/htmls.qrc
@@ -2,6 +2,7 @@
 <qresource>
     <file>dirlist.html</file>
     <file>notfound.html</file>
+    <file>settings.html</file>
     <file>startpage.html</file>
     <file>startpage.css</file>
 </qresource>
diff --git a/src/htmls/notfound.html b/src/htmls/notfound.html
index 485cc73f..ec49785c 100644
--- a/src/htmls/notfound.html
+++ b/src/htmls/notfound.html
@@ -4,56 +4,64 @@
 <title>%1</title>
 <style>
 body {
-  padding: 3em 0em;
-  background: #eeeeee;
+    padding: 3em 0em;
+background:
+#eeeeee;
 }
 hr {
-  color: lightgray;
-  width: 100%;
+color:
+    lightgray;
+    width: 100%;
 }
 img {
-  float: left;
-  opacity: .8;
+float:
+    left;
+opacity:
+    .8;
 }
 #box {
-  background: white;
-  border: 1px solid lightgray;
-  width: 600px;
-  padding: 60px;
-  margin: auto;
+background:
+white;
+border: 1px solid lightgray;
+width: 600px;
+padding: 60px;
+margin:
+auto;
 }
 h1 {
-  font-size: 130%;
-  font-weight: bold;
-  border-bottom: 1px solid lightgray;
-  margin-left: 48px;
+    font-size: 130%;
+font-weight:
+    bold;
+    border-bottom: 1px solid lightgray;
+    margin-left: 48px;
 }
 h2 {
-  font-size: 100%;
-  font-weight: normal;
-  border-bottom: 1px solid lightgray;
-  margin-left: 48px;
+    font-size: 100%;
+font-weight:
+    normal;
+    border-bottom: 1px solid lightgray;
+    margin-left: 48px;
 }
 ul {
-  font-size: 80%;
-  padding-left: 48px;
-  margin: 5px 0;
+    font-size: 80%;
+    padding-left: 48px;
+    margin: 5px 0;
 }
 #reloadButton {
-  padding-left: 48px;
+padding-left: 48px;
 }
 </style>
 </head>
 <body>
-  <div id="box">
-    <img src="data:image/png;base64,IMAGE_BINARY_DATA_HERE" width="32" height="32"/>
-    <h1>%2</h1>
-    <h2>%3</h2>
-    <ul>
-      <li>%4</li>
-      <li>%5</li>
-      <li>%6</li>
-    </ul>
-  </div>
-</body>
-</html>
+<div id="box">
+        <img src="data:image/png;base64,IMAGE_BINARY_DATA_HERE" width="32" height="32"/>
+                 <h1>%2</h1>
+                 <h2>%3</h2>
+                 <ul>
+                 <li>%4</li>
+                 <li>%5</li>
+                 <li>%6</li>
+                 </ul>
+                 </div>
+                 </body>
+                 </html>
diff --git a/src/htmls/settings.html b/src/htmls/settings.html
new file mode 100644
index 00000000..0236f6b7
--- /dev/null
+++ b/src/htmls/settings.html
@@ -0,0 +1,18 @@
+<html>
+    <head>
+        <title>Settings</title>
+        <meta charset="utf-8">
+        <link rel="stylesheet" href="qrc:/settings.css" type="text/css">
+    </head>
+    <body>
+        <nav class="side element">
+            <div id="general" class="active">General</div>
+            <div id="theme">Theme</div>
+            <div id="plugins">Plugins</div>
+            <div id="about">About</div>
+        </nav>
+        <div id="content"></div>
+        <script src="qrc:/settings.js"></script>
+        <script>loadLatestContent();</script>
+    </body>
+</html>
\ No newline at end of file
diff --git a/src/htmls/startpage.html b/src/htmls/startpage.html
index 127509e3..9e4047e1 100644
--- a/src/htmls/startpage.html
+++ b/src/htmls/startpage.html
@@ -1,32 +1,20 @@
 <!DOCTYPE html>
 <html>
 <head>
-    <title></title>
-    <link rel="stylesheet" href="qrc:/startpage.css">
+    <title>New Tab</title>
+    <link rel="stylesheet" href="startpage.css">
     <script>
-        //<![CDATA[
-        function update()
+        async function update()
         {
-            var searchEngine = window.endorphin.currentEngine;
-
-            document.title = window.endorphin.translate('Welcome to Endorphin!');
-            document.getElementById('headerTitle').innerHTML = window.endorphin.translate('Endorphin Start');
-            document.getElementById('searchButton').value = window.endorphin.translate('Search!');
-            document.getElementById('footer').innerHTML = window.endorphin.translate('Search results provided by') + ' '
-                                                          + searchEngine.name + ' | ' + '<a href="http://aarondewes.github.io/endorphin/">'
-                                                          + window.endorphin.translate('About Endorphin') + '</a>';
-            document.getElementById('lineEdit').placeholder = window.endorphin.translate('Search the Web with') + ' ' + searchEngine.name;
-
-            // Try to change the direction of the page:
-            //   This string is defined in QApplication
-            //   src/gui/kernel/qapplication.cpp#qt_detectRTLLanguage()
-            //   it should contain LTR or RTL
-
-            var newDir = window.endorphin.translate('QT_LAYOUT_DIRECTION');
-            newDir = newDir.toLowerCase();
-            if ((newDir != 'ltr') && (newDir != 'rtl'))
-                newDir = 'ltr';
-            document.getElementsByTagName('body')[0].setAttribute('dir', newDir);
+            const providedBy = await window?.endorphin?.translate('Search results provided by') ?? 'Search results provided by';
+            const engine = window?.endorphin?.currentEngine?.name ?? "Google";
+            const aboutText = await window?.endorphin?.translate('About Endorphin') ?? "About Endorphin";
+            const searchWith = await window?.endorphin?.translate('Search the web with') ?? "Search the web with";
+            document.title = await window?.endorphin?.translate('Welcome to Endorphin!') ?? 'Welcome to Endorphin!';
+            document.getElementById('headerTitle').innerHTML = await window?.endorphin?.translate('Endorphin Start') ?? 'Endorphin Start';
+            document.getElementById('searchButton').value = await window?.endorphin?.translate('Search!') ?? 'Search!';
+            document.getElementById('footer').innerHTML = `${providedBy} ${engine} | <a href="http://EndorphinBrowser.gitlab.io/">${aboutText}</a>`;
+            document.getElementById('lineEdit').placeholder = `${searchWith} ${engine}`;
         }
 
         function formSubmitted()
@@ -36,16 +24,15 @@
             if (string.length == 0)
                 return;
 
-            var url = window.endorphin.searchUrl(string);
+            var url = window?.endorphin?.searchUrl(string) ?? 'http://www.google.com/search?q=' + string;
             window.location.href = url;
         }
-        //]]>
     </script>
 </head>
 <body onload="document.forms[0].lineEdit.select(); update();">
     <div id="header">
         <h1 id="headerTitle"></h1>
-        <img src="qrc:/endorphin.svg" alt="Endorphin">
+        <img src="/endorphin.svg" alt="Endorphin Logo">
     </div>
     <div id="search">
         <form action="javascript:formSubmitted();">
@@ -58,3 +45,4 @@ <h1 id="headerTitle"></h1>
     <div id="footer"></div>
 </body>
 </html>
+
diff --git a/src/locale/cs_CZ.ts b/src/locale/cs_CZ.ts
index 3e78ad2f..755504b9 100644
--- a/src/locale/cs_CZ.ts
+++ b/src/locale/cs_CZ.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="cs">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">O prohlížeči</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>O %1</translation>
@@ -19,142 +15,6 @@
         <source>License</source>
         <translation>Licence</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Lehký webový prohlížeč založený na WebKitu</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Autorská práva vyhrazena © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Zavřít</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>Verze WebKitu: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Autorská práva vyhrazena © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Jazyky</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Jazyky seřazené podle vašich preferencí:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Posunout &amp;výše</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Posunout &amp;níže</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Odstranit</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Přidat...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>Blokováno AdBlock pravidlem: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Přidat vlastní pravidlo</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Více informací o psaní pravidel...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Aktualizovat cizí filtry</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Prohlížet cizí filtry...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Odstranit cizí filtry</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>Konfigurace AdBlock</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>Povolit AdBlock</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Akce</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Vlastní pravidla</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Pravidlo</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Přidat cizí filtry?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Přidat tyto cizí AdBlock filtry?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -162,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Přidat záložku</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Napište jméno pro záložku a vyberte, kde má být uložena.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Adresa</translation>
@@ -179,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Přidat složku</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Formulář hesel</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Odstranit</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Odstranit vše</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Chcete uložit toto heslo?&lt;/b&gt;&lt;br&gt;         Pro prohlížení uložených hesel a jejich odstranění otevřete kartu Automatické doplňování v dialogu nastavení.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Nikdy na této stránce</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Nyní ne</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Webová stránka</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Uživatelské jméno</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -238,18 +49,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nová složka</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Záložky</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Odstranit</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Přidat složku</translation>
-    </message>
     <message>
         <source>Open in New Tab</source>
         <translation>Otevřít v nové kartě</translation>
@@ -290,24 +89,10 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Otevřít soubor</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>Importováno %1</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Chyba při načítání HTML záložek: %1
-</translation>
-    </message>
     <message>
         <source>Save File</source>
         <translation>Uložit soubor</translation>
@@ -332,14 +117,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Vložit záložku</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Změna jména</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Změna adresy</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -362,10 +139,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>je vyžadován nástroj htmlToXBel</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>Nástroj htmlToXBel, který je dodáván s Arorou a je nutný k importu HTML záložek, není nainstalován nebo není dostupný v hledaných cestách.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Načítání záložky</translation>
@@ -376,6 +149,10 @@ p, li { white-space: pre-wrap; }
         <translation>Chyba při načítání HTML záložek: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -397,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Záložky</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Otevřít</translation>
@@ -421,10 +194,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Přidat složku...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Záložky</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -439,16 +208,8 @@ Přesto ukončit?</translation>
         <translation>Obnovení selhalo</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Uložená relace nebude obnovena, protože Arora spadla při pokusu o její obnovení.</translation>
-    </message>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete">(Revize: %1 %2)</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora spadla při pokusu o obnovu této relace. Zkusit znovu?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -481,14 +242,6 @@ Přesto ukončit?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Exportovat záložky...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Ná&amp;hled tisku...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Tisk...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Soukro&amp;mé prohlížení...</translation>
@@ -534,27 +287,11 @@ Přesto ukončit?</translation>
         <comment>About Browser</comment>
         <translation>O &amp;%1</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Když je zapnuto soukromé prohlížení, některé akce narušující tvoje soukromí budou zakázány:&lt;ul&gt;&lt;li&gt; Stránky nejsou přidávány do historie.&lt;/li&gt;&lt;li&gt; Položky jsou automaticky smazány z okna stahování.&lt;/li&gt;&lt;li&gt; Nové cookies nejsou uloženy, aktuální nebudou přístupné.&lt;/li&gt;&lt;li&gt; Ikony stránek nejsou ukládány, relace taky ne.&lt;/li&gt;&lt;li&gt; Hledání nejsou přidávány do vyjížděcího menu v políčku hledání.&lt;/li&gt;&lt;/ul&gt;Dokud nezavřeš okno, můžeš vždy klikat Zpět a Vpřed pro vrácení na dříve otevřené stránky.</translation>
-    </message>
     <message>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
         <translation>Ctrl+Y</translation>
     </message>
-    <message>
-        <source>&amp;Find Next</source>
-        <translation type="obsolete">Nají&amp;t další</translation>
-    </message>
-    <message>
-        <source>&amp;Find Previous</source>
-        <translation type="obsolete">Najít &amp;předchozí</translation>
-    </message>
-    <message>
-        <source>&amp;Preferences</source>
-        <translation type="obsolete">Před&amp;volby</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -563,10 +300,6 @@ Přesto ukončit?</translation>
         <source>&amp;View</source>
         <translation>&amp;Zobrazit</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
@@ -579,22 +312,6 @@ Přesto ukončit?</translation>
         <source>&amp;Stop</source>
         <translation>Z&amp;astavit</translation>
     </message>
-    <message>
-        <source>Reload Page</source>
-        <translation type="obsolete">O&amp;bnovit</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Bigger</source>
-        <translation type="obsolete">Z&amp;většit písmo</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Normal</source>
-        <translation type="obsolete">&amp;Normální velikost písma</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Smaller</source>
-        <translation type="obsolete">Z&amp;menšit písmo</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>&amp;Zdrojový kód stránky</translation>
@@ -631,10 +348,6 @@ Přesto ukončit?</translation>
         <source>&amp;Bookmarks</source>
         <translation>Zál&amp;ožky</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Spravovat záložky...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Přidat záložku...</translation>
@@ -660,14 +373,6 @@ Přesto ukončit?</translation>
         <comment>Web Search</comment>
         <translation>Ctrl+K</translation>
     </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">Zobrazit &amp;monitor sítě</translation>
-    </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Povolit Web &amp;Inspector</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>Nápo&amp;věda</translation>
@@ -676,10 +381,6 @@ Přesto ukončit?</translation>
         <source>About &amp;Qt</source>
         <translation>O &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">O &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Navigace</translation>
@@ -700,31 +401,6 @@ Přesto ukončit?</translation>
         <source>Hide Toolbar</source>
         <translation>Skrýt panel nástrojů</translation>
     </message>
-    <message>
-        <source>Show Bookmarks bar</source>
-        <translation type="obsolete">Zobrazit panel záložek</translation>
-    </message>
-    <message>
-        <source>Hide Bookmarks bar</source>
-        <translation type="obsolete">Skrýt panel záložek</translation>
-    </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">O prohlížeči</translation>
-    </message>
-    <message>
-        <source>Version %1&lt;p&gt;This demo demonstrates Qt&apos;s webkit facilities in action, providing an example browser for you to experiment with.&lt;p&gt;&lt;p&gt;QtWebKit is based on the Open Source WebKit Project developed at &lt;a href=&quot;http://webkit.org/&quot;&gt;http://webkit.org/&lt;/a&gt;.</source>
-        <translation type="obsolete">Verze %1&lt;p&gt;Tato ukázka předvádí schopnosti WebKitu v Qt v akci, poskytnutím vzorového prohlížeče, abys s ním mohl(a) experimentovat.&lt;p&gt;&lt;p&gt;QtWebKit je založen na open-source projektu WebKit vyvíjeného na &lt;a href=&quot;http://webkit.org/&quot;&gt;http://webkit.org/&lt;/a&gt;.</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Otevřít webovou stránku</translation>
@@ -733,36 +409,14 @@ Přesto ukončit?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Webové stránky (*.html *.htm *.svg *.png *.gif *.svgz);;Všechny soubory (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Vytisknout dokument</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Opravdu chcete zapnout soukromé prohlížení?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing in turned on, webpages are not added to the history, items are automatically removed from the Downloads window, new cookies are not stored, current cookies can&apos;t be accessed, site icons wont be stored, session wont be saved,  and searches are not addded to the pop-up menu in the Google search box.  Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Když je zapnuto soukromé prohlížení, stránky nejsou přidávány do historie, soubory jsou automaticky smazány z okna stahování, nové cookies nejsou ukládány, aktuální cookies nejsou přístupné, ikony stránek nejsou ukládány, relace se neukádá a hledání nejsou přidávány do vysouvacího menu v políčku Google hledání. Dokud nezavřeš okno, můžeš vždy klikat Zpět a Vpřed pro vrácení na dříve otevřené stránky.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Opravdu chcete zavřít okno? Je otevřeno %1 karet</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">Zdrojový kód stránky %1</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Web Inspector</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Webový inspektor bude fungovat pouze pro stránky načtené po jeho povolení.
-Chcete znovu načíst všechny stránky?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Zastaví načítání aktuální stránky</translation>
@@ -775,11 +429,6 @@ Chcete znovu načíst všechny stránky?</translation>
         <source>Downloads</source>
         <translation>Stahování</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
     <message>
         <source>&amp;Clear Private Data</source>
         <translation>Smazat &amp;soukromá data</translation>
@@ -789,14 +438,6 @@ Chcete znovu načíst všechny stránky?</translation>
         <comment>Clear Private Data</comment>
         <translation></translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttonsto return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Když je zapnuto soukromé prohlížení, některé akce narušující tvoje soukromí budou zakázány:&lt;ul&gt;&lt;li&gt; Stránky nejsou přidávány do historie.&lt;/li&gt;&lt;li&gt; Položky jsou automaticky smazány z okna stahování.&lt;/li&gt;&lt;li&gt; Nové cookies nejsou uloženy, aktuální nebudou přístupné.&lt;/li&gt;&lt;li&gt; Ikony stránek nejsou ukládány, relace taky ne.&lt;/li&gt;&lt;li&gt; Hledání nejsou přidávány do vyjížděcího menu v políčku hledání.&lt;/li&gt;&lt;/ul&gt;Dokud nezavřeš okno, můžeš vždy klikat Zpět a Vpřed pro vrácení na dříve otevřené stránky.</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Když je zapnuto soukromé prohlížení, některé akce narušující tvoje soukromí budou zakázány:&lt;ul&gt;&lt;li&gt; Stránky nejsou přidávány do historie.&lt;/li&gt;&lt;li&gt; Položky jsou automaticky smazány z okna stahování.&lt;/li&gt;&lt;li&gt; Nové cookies nejsou uloženy, aktuální nebudou přístupné.&lt;/li&gt;&lt;li&gt; Ikony stránek nejsou ukládány, relace taky ne.&lt;/li&gt;&lt;li&gt; Hledání nejsou přidávány do vyjížděcího menu v políčku hledání.&lt;/li&gt;&lt;/ul&gt;Dokud nezavřeš okno, můžeš vždy klikat Zpět a Vpřed pro vrácení na dříve otevřené stránky.</translation>
-    </message>
     <message>
         <source>Show Bookmarks Bar</source>
         <translation>Zobrazit lištu záložek</translation>
@@ -805,42 +446,18 @@ Chcete znovu načíst všechny stránky?</translation>
         <source>Hide Bookmarks Bar</source>
         <translation>Skrýt lištu záložek</translation>
     </message>
-    <message>
-        <source>Find &amp;Next</source>
-        <translation type="obsolete">Nají&amp;t další</translation>
-    </message>
     <message>
         <source>Find P&amp;revious</source>
         <translation>Najít &amp;předchozí</translation>
     </message>
-    <message>
-        <source>Prefe&amp;rences</source>
-        <translation type="obsolete">Před&amp;volby</translation>
-    </message>
     <message>
         <source>&amp;Reload Page</source>
         <translation>O&amp;bnovit stránku</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">Z&amp;většit text</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">&amp;Normální velikost textu</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">Z&amp;menšit text</translation>
-    </message>
     <message>
         <source>Find Nex&amp;t</source>
         <translation>Nají&amp;t další</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Před&amp;volby...</translation>
-    </message>
     <message>
         <source>Show Menu Bar</source>
         <translation>Zobrazit menu</translation>
@@ -893,10 +510,6 @@ Chcete znovu načíst všechny stránky?</translation>
         <source>Configure Search Engines...</source>
         <translation>Nastavit vyhledávače...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;AdBlock...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Při zapnutém soukromém prolížení budou některé akce týkající se vašeho soukromí zakázány:</translation>
@@ -909,10 +522,6 @@ Chcete znovu načíst všechny stránky?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Soubory jsou automaticky odstraňovány z okna stahování.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Nové cookies nejsou ukládány, ke stávajícím cookies nemůže být přistupováno.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Ikony stránek nebudou ukládány.</translation>
@@ -953,6 +562,19 @@ Chcete znovu načíst všechny stránky?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -983,14 +605,6 @@ Chcete znovu načíst všechny stránky?</translation>
         <source>&amp;Search History</source>
         <translation>Historie vyhledávání</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
-    <message>
-        <source>C&amp;ache</source>
-        <translation type="obsolete">Vyrovnávací &amp;paměť</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Ikony stránek</translation>
@@ -1003,1213 +617,366 @@ Chcete znovu načíst všechny stránky?</translation>
         <source>&amp;Cancel</source>
         <translation>Zrušit</translation>
     </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>Stránky v &amp;mezipaměti</translation>
-    </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation>Načíst</translation>
+        <source>Downloads</source>
+        <translation>Stahování</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>Načíst vše</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Přidat %1 do povolených</translation>
+        <source>Save File</source>
+        <translation>Uložit soubor</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>Odebrat z povolených</translation>
+        <source>Download canceled: %1</source>
+        <translation>Stahování zrušeno: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Nastavení</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 z %2 (%3/sek) - %4</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Načíst flash</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Chyba při ukládání: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Povolené weby</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Chyba sítě: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Webová stránka</translation>
+        <source>?</source>
+        <translation></translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation type="obsolete">Stav</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Chyba při otevírání výstupního souboru: %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Povoleno</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Složka pro stahování (%1) nemůže být vytvořena.</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Blokovat</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Povolit pro relaci</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Pravidlo</translation>
-    </message>
-</context>
-<context>
-    <name>CookieModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Webová stránka</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Jméno</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>Cesta</translation>
-    </message>
-    <message>
-        <source>Secure</source>
-        <translation>Zabezpečené</translation>
-    </message>
-    <message>
-        <source>Expires</source>
-        <translation>Vyprší</translation>
-    </message>
-    <message>
-        <source>Contents</source>
-        <translation>Obsah</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>Relační cookie</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Smazat</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Smazat &amp;vše</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation>Přidat &amp;pravidlo</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Výjimky pro cookies</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Nová výjimka</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Doména:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Blokovat</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Povolit pro relaci</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Povolit</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Výjimky</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Odstranit</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Odstranit &amp;vše</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Stahování</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Vyčistit</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 položek</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Ico</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Název souboru</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Zkusit znovu</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Zastavit</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Otevřít</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Uložit soubor</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Stahování zrušeno: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 z %2 (%3/sek) - %4</translation>
-    </message>
-    <message>
-        <source>Error opening save file: %1</source>
-        <translation type="obsolete">Chyba při otevírání souboru pro uložení: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Chyba při ukládání: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Chyba sítě: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">sekund</translation>
-    </message>
-    <message>
-        <source>minutes</source>
-        <translation type="obsolete">minut</translation>
-    </message>
-    <message>
-        <source>- %4 %5 remaining</source>
-        <translation type="obsolete">- %4 %5 zbývá</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 z %2 (%3/s) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 z %2 - Zastaveno</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">bajtů</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n minuta zbývá</numerusform>
-            <numerusform>- %n minuty zbývají</numerusform>
-            <numerusform>- %n minut zbývá</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n sekunda zbývá</numerusform>
-            <numerusform>- %n sekundy zbývají</numerusform>
-            <numerusform>- %n sekund zbývá</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Chyba při otevírání výstupního souboru: %1</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Složka pro stahování (%1) nemůže být vytvořena.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Právě probíhá %1 stahování
-Přesto ukončit?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minuta zbývá</numerusform>
-            <numerusform>%n minuty zbývají</numerusform>
-            <numerusform>%n minut zbývá</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n sekunda zbývá</numerusform>
-            <numerusform>%n sekundy zbývají</numerusform>
-            <numerusform>%n sekund zbývá</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bajtů</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>1 Download</source>
-        <translation type="obsolete">1 stahování</translation>
-    </message>
-    <message>
-        <source>%1 Downloads</source>
-        <translation type="obsolete">%1 stahování</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n stahování</numerusform>
-            <numerusform>%n stahování</numerusform>
-            <numerusform>%n stahování</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Žádná chyba</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Chyba při otevírání %1: Soubor nebo složka neexistuje</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Chyba při čtení %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Obsah %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Otevřít</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopírovat</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Smazat</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Historie</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Odstranit</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Odstranit &amp;vše</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Zobrazit celou historii</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Vyčistit historii</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Vyčistit historii...</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Chcete vyčistit historii?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Titulek</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Dříve dnes</translation>
-    </message>
-    <message>
-        <source>%1 items</source>
-        <translation type="obsolete">%1 položek</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n položka</numerusform>
-            <numerusform>%n položky</numerusform>
-            <numerusform>%n položek</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation>Vítejte v Aroře!</translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation>Vyhledat!</translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation>Výsledky vyhledávání poskytovány</translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation>O Aroře</translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Default</source>
-        <translation type="obsolete">Výchozí</translation>
-    </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Žádné překlady nejsou nainstalovány</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Vyberte jazyk</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Arora může používat jiný jazyk, než&lt;br&gt;je výchozí jazyk operačního systému.&lt;/p&gt;&lt;p&gt;Prosím vyberte, který jazyk má být použit&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation>Žádné překladové soubory nejsou nainstalovány v %1.</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Zadejte uživatelské jméno a heslo pro &quot;%1&quot; na %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Připojit k proxy &quot;%1&quot; pomocí:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - Chyby SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Chyby SSL:&lt;br/&gt;&lt;br/&gt;pro: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Chcete ignorovat tyto chyby?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Certifikáty:&lt;br/&gt;%1&lt;br/&gt;Chcete přijmout všechny tyto certifikáty?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Certifikáty:&lt;br/&gt;%1&lt;br/&gt;Chceš přijmout všechny tyto certifikáty?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">Chyby SSL:
-
-%1
-
-%2
-
-Chceš ignorovat tyto chyby?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Chceš přijmout všechny tyto certifikáty?</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Vydal: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Neplatný před: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Platný do: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Alternativní jména:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Název</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Hodnota</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Monitor sítě</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Síťové požadavky</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Hlavičky požadavku</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Hlavičky odpovědi</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Smazat</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">Smazat &amp;všechny požadavky</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation>Otevřít soubor</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation>OpenSearch</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Chyba</translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation>%1 není validní OpenSearch 1.1 popis, nebo už je na seznamu.</translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation>Musíte mít alespoň jeden vyhledávač.</translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Správce OpenSearch</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Obnovit původní</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Smazat</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Přidat</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Zavřít</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation>&lt;strong&gt;Popis:&lt;/strong&gt; %1</translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation>&lt;strong&gt;Poskytuje kontextové návrhy&lt;/strong&gt;</translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation>Seznam čárkou oddělených klíčových slov, která mají být vložena do vyhledávacího políčka následovány vyhledávanými slovy s tímto vyhledávačem</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Název</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation>Klíčová slova</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation>Chcete přidat následující vyhledávač do seznamu svých vyhledávačů?&lt;br /&gt;&lt;br /&gt;Jméno: %1&lt;br /&gt;Vyhledává na: %2</translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Vyžadováno přihlášení</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Uživatelské jméno:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Heslo:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Nenalezeno</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Přihlášení k proxy</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Připojit k proxy</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Uživatelské jméno:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Heslo:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Soubor není souborem XBEL verze 1.0.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Neznámý titulek</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation>Toto není soubor OpenSearch 1.1.</translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Přesměrování: %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Metoda</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Adresa</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Odpověď</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Délka</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Typ obsahu</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Info</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Done</source>
-        <translation>Hotovo</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Vyznačit vše</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Hledat</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Nastavení</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Obecné</translation>
-    </message>
-    <message>
-        <source>Home:</source>
-        <translation type="obsolete">Domov:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Nastavit na aktuální stránku</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Odstranit položky historie:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Po jednom dni</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Po jednom týdnu</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Po dvou týdnech</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Po měsíci</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Po roce</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Ručně</translation>
-    </message>
-    <message>
-        <source>Save downloads to:</source>
-        <translation type="obsolete">Uložit stahování do:</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Otevřít odkazy z aplikací:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">V panelu v aktuálním okně</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>V novém okně</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Vzhled</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Standardní písmo:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Vybrat...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Písmo s pevnou šířkou:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Upřednostňované jazyky pro prohlížení stránek:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Soukromí</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Obsah webu</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Blokovat vyskakovací okna</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Povolit zásuvné moduly</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Povolit JavaScript</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Přijímat cookies:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Vždy</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Nikdy</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Pouze z navštívených stránek</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Výjimky...</translation>
-    </message>
-    <message>
-        <source>Keep until:</source>
-        <translation type="obsolete">Uchovat dokud:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Vyprší</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Ukončení aplikace</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Maximálně 90 dní</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Enable proxy</source>
-        <translation type="obsolete">Povolit proxy</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Typ:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="obsolete">Server:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User Name:</source>
-        <translation>Uživatelské jméno:</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Heslo:</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Rozšířené</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bajtů</translation>
     </message>
     <message>
-        <source>Style Sheet:</source>
-        <translation>CSS styl:</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Downloads</source>
-        <translation>Stahování</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
+</context>
+<context>
+    <name>DownloadManager</name>
     <message>
-        <source>Ask for a destination each time</source>
-        <translation>Vždy se ptát na umístění stahování</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Právě probíhá %1 stahování
+Přesto ukončit?</translation>
     </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Použít toto umístění:</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n minuta zbývá</numerusform>
+            <numerusform>%n minuty zbývají</numerusform>
+            <numerusform>%n minut zbývá</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Při ukončení aplikace</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n sekunda zbývá</numerusform>
+            <numerusform>%n sekundy zbývají</numerusform>
+            <numerusform>%n sekund zbývá</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Enable Images</source>
-        <translation type="obsolete">Povolit obrázky</translation>
+        <source>bytes</source>
+        <translation>bajtů</translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Karty</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Přepínat na okna nebo karty, když jsou vytvořeny</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
-    <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Vyžadovat potvrzení při zavírání více panelů</translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n stahování</numerusform>
+            <numerusform>%n stahování</numerusform>
+            <numerusform>%n stahování</numerusform>
+        </translation>
     </message>
     <message>
-        <source>On startup:</source>
-        <translation>Po spuštění:</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Show my home page</source>
-        <translation>Zobrazit moji domovskou stránku</translation>
+        <source>Open</source>
+        <translation>Otevřít</translation>
     </message>
     <message>
-        <source>Show a blank page</source>
-        <translation>Zobrazit prázdnou stránku</translation>
+        <source>Copy</source>
+        <translation>Kopírovat</translation>
     </message>
     <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Obnovit okna a karty z poslední relace</translation>
+        <source>Delete</source>
+        <translation>Smazat</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Preferences</source>
-        <translation>Předvolby</translation>
+        <source>Show All History</source>
+        <translation>Zobrazit celou historii</translation>
     </message>
     <message>
-        <source>Home Page:</source>
-        <translation>Domovská stránka:</translation>
+        <source>Clear History</source>
+        <translation>Vyčistit historii</translation>
     </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Používat ClickToFlash na zásuvných modulech flash</translation>
+        <source>Clear History...</source>
+        <translation>Vyčistit historii...</translation>
     </message>
     <message>
-        <source>View Images</source>
-        <translation>Zobrazovat obrázky</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Chcete vyčistit historii?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Ponechat cookies dokud:</translation>
+        <source>Title</source>
+        <translation>Titulek</translation>
     </message>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Filtrovat sledovací cookies</translation>
+        <source>Address</source>
+        <translation>Adresa</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Vyžadovat potvzrení při zavírání více karet nebo oken</translation>
+        <source>Earlier Today</source>
+        <translation>Dříve dnes</translation>
     </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Ukončit aplikaci, když je zavřena poslední karta</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n položka</numerusform>
+            <numerusform>%n položky</numerusform>
+            <numerusform>%n položek</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Opening links</source>
-        <translation>Otevírání odkazů</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Odkazy, které chtějí otevřít v novém okně:</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>V nové kartě aktuálního okna, který bude označen</translation>
+        <source>Search!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>V nové kartě aktuálního okna</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
-        <translation>V aktuálním kartě</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation>Používat proxy server</translation>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Http (Secure)</source>
-        <translation>HTTP (zabezpečené)</translation>
+        <source>Choose language</source>
+        <translation>Vyberte jazyk</translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation>HTTP (průhledné)</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Arora může používat jiný jazyk, než&lt;br&gt;je výchozí jazyk operačního systému.&lt;/p&gt;&lt;p&gt;Prosím vyberte, který jazyk má být použit&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Host name:</source>
-        <translation>Jméno hostitele:</translation>
+        <source>No translation files are installed at %1.</source>
+        <translation>Žádné překladové soubory nejsou nainstalovány v %1.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Enable network cache</source>
-        <translation>Povolit síťovou mezipaměť</translation>
+        <source>Open File</source>
+        <translation>Otevřít soubor</translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
-        <translation>Maximální velikost:</translation>
+        <source>OpenSearch</source>
+        <translation>OpenSearch</translation>
     </message>
     <message>
-        <source> MB</source>
-        <translation> MB</translation>
+        <source>Error</source>
+        <translation>Chyba</translation>
     </message>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Zobrazit pouze jedno zavírací tlačítko místo jednoho pro každou kartu</translation>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
+        <translation>%1 není validní OpenSearch 1.1 popis, nebo už je na seznamu.</translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Použít výchozí vyhledávač jako nouzový, když je adresa zadaná uživatelem neplatná</translation>
+        <source>You must have at least one search engine in here.</source>
+        <translation>Musíte mít alespoň jeden vyhledávač.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source>Choose Directory...</source>
-        <translation>Vybrat adresář...</translation>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
+        <translation>&lt;strong&gt;Popis:&lt;/strong&gt; %1</translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation>Relace cookies končí:</translation>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
+        <translation>&lt;strong&gt;Poskytuje kontextové návrhy&lt;/strong&gt;</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
-        <translation>Když ukončím aplikaci</translation>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
+        <translation>Seznam čárkou oddělených klíčových slov, která mají být vložena do vyhledávacího políčka následovány vyhledávanými slovy s tímto vyhledávačem</translation>
     </message>
     <message>
-        <source>1 day</source>
-        <translation>1 den</translation>
+        <source>Name</source>
+        <translation>Název</translation>
     </message>
     <message>
-        <source>2 days</source>
-        <translation>2 dny</translation>
+        <source>Keywords</source>
+        <translation>Klíčová slova</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>3 days</source>
-        <translation>3 dny</translation>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
+        <translation>Chcete přidat následující vyhledávač do seznamu svých vyhledávačů?&lt;br /&gt;&lt;br /&gt;Jméno: %1&lt;br /&gt;Vyhledává na: %2</translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>7 days</source>
-        <translation>7 dní</translation>
+        <source>Allow</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>30 days</source>
-        <translation>30 dní</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AutoFill</source>
-        <translation>Automatické doplňování</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation>Automaticky doplňovat webové formuláře:</translation>
+        <source>Not Found</source>
+        <translation>Nenalezeno</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>User names and passwords</source>
-        <translation>Uživatelská jména a hesla</translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Soubor není souborem XBEL verze 1.0.</translation>
     </message>
     <message>
-        <source>Edit...</source>
-        <translation>Upravit...</translation>
+        <source>Unknown title</source>
+        <translation>Neznámý titulek</translation>
     </message>
     <message>
-        <source>Browse...</source>
-        <translation>Prohlížet...</translation>
+        <source>The file is not an OpenSearch 1.1 file.</source>
+        <translation>Toto není soubor OpenSearch 1.1.</translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
-        <translation>Vyžadován restart aplikace</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>Byla změněna nastavení síťové cache. Aby se změny projevily, prohlížeč musí být restartován.</translation>
+        <source>Search</source>
+        <translation>Hledat</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>Vybrat adresář</translation>
@@ -2237,18 +1004,6 @@ Chceš ignorovat tyto chyby?</translation>
         <source>&amp;Find</source>
         <translation>Na&amp;jít</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Zobrazit</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">Za&amp;lamovat řádky</translation>
-    </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Zdrojový kód stránky</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>Zdrojový kód stránky %1</translation>
@@ -2256,10 +1011,6 @@ Chceš ignorovat tyto chyby?</translation>
 </context>
 <context>
     <name>TabBar</name>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">&amp;Nový panel</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Duplikovat kartu</translation>
@@ -2311,10 +1062,6 @@ Chceš ignorovat tyto chyby?</translation>
         <source>Loading...</source>
         <translation>Načítání...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Načítání %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Načítání dokončeno</translation>
@@ -2343,26 +1090,14 @@ Chceš ignorovat tyto chyby?</translation>
         <source>Bookmark All Tabs</source>
         <translation>Přidat všechny karty do záložek</translation>
     </message>
-    <message>
-        <source>(Untitled)</source>
-        <translation type="obsolete">(Bez titulku)</translation>
-    </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Opravdu chcete zavřít tuto stránku?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Změnili jste tuto stránku, pokud ji zavřete, změny budou ztraceny.
-Opravdu chcete zavřít tuto stránku?
-</translation>
-    </message>
     <message>
         <source>Untitled</source>
         <translation>Bez názvu</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2370,14 +1105,6 @@ Opravdu chcete zavřít tuto stránku?
         <source>Suggestions</source>
         <translation>Návrhy</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Přidat &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">Nastavit vyhledávací enginy...</translation>
-    </message>
     <message>
         <source>No Recent Searches</source>
         <translation>Žádná nedávná vyhledávání</translation>
@@ -2410,51 +1137,8 @@ Opravdu chcete zavřít tuto stránku?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Chyba při načítání stránky: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Při připojování k: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.trolltech.com instead of &lt;b&gt;www&lt;/b&gt;.trolltech.com.</source>
-        <translation type="obsolete">Zkontroluj adresu na chyby jako &lt;b&gt;ww&lt;/b&gt;.trolltech.com místo &lt;b&gt;www&lt;/b&gt;.trolltech.com.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try to check the network connection.</source>
-        <translation type="obsolete">Pokud je adresa správná, zkontroluj síťové připojení.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Pokud je váš počítač nebo vaše síť chráněna firewallem nebo proxy, ujistěte se, že je prohlížeči povolen přístup k síti.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Zkontrolujte adresu kvůli chybách jako &lt;b&gt;ww&lt;/b&gt;.arora-browser.org namísto &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Pokud je adresa správná, zkontrolujte síťové připojení.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Opětovné posílání POST požadavku</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Pro zobrazení stránky musí být požadavek spolu se všemi daty poslán znovu, což může způsobit neočekávané chování stránky, například ta samá akce může být vykonána znovu. Přesto pokračovat?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
-    <message>
-        <source>Open in New Tab</source>
-        <translation type="obsolete">Otevřít v novém panelu</translation>
-    </message>
     <message>
         <source>Open in New &amp;Window</source>
         <translation>&amp;Otevřít v novém okně</translation>
@@ -2503,38 +1187,6 @@ Opravdu chcete zavřít tuto stránku?
         <source>Loading...</source>
         <translation>Načítání...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Přidat do políčka vyhledávání</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Metoda není podporována</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>Metoda %1 není podporována.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Vyhledávač</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Vyber požadovaný vyhledávač</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Název vyhledávače</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Napište jméno pro vyhledávač</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Blokovat obrázek</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/da_DK.ts b/src/locale/da_DK.ts
index 2b93344e..b29f6f87 100644
--- a/src/locale/da_DK.ts
+++ b/src/locale/da_DK.ts
@@ -3,22 +3,6 @@
 <TS version="2.1" language="da_DK">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Letvægts WebKit-baseret internetbrowser</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ophavsret © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation type="unfinished"></translation>
@@ -31,121 +15,6 @@ p, li { white-space: pre-wrap; }
         <source>License</source>
         <translation>Licens</translation>
     </message>
-    <message>
-        <source>Close</source>
-        <translation>Luk</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Om</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished">&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -153,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Tilføj bogmærke</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Skriv et navn for bogmærket og vælg et sted at gemme det.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation type="unfinished"></translation>
@@ -170,61 +35,8 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Tilføj mappe</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Bogmærker</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Tilføj mappe</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Åbn</translation>
@@ -278,10 +90,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Åbn fil</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>%1 er importeret</translation>
@@ -310,14 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Indsæt bogmærke</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Ændre navn</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Ændre adresse</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -340,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation type="unfinished"></translation>
@@ -353,6 +149,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -374,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Bogmærke</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Åbn</translation>
@@ -398,10 +194,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Bogmærker</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -416,7 +208,7 @@ Do you want to quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -450,14 +242,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Exportér bogmærker...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>&amp;Vis udskrift...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Udskriv...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Privat &amp;browsing...</translation>
@@ -512,18 +296,6 @@ Do you want to quit anyway?</source>
         <comment>Download Manager</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Find Next</source>
-        <translation type="obsolete">&amp;Find næste</translation>
-    </message>
-    <message>
-        <source>&amp;Find Previous</source>
-        <translation type="obsolete">&amp;Find forrige</translation>
-    </message>
-    <message>
-        <source>&amp;Preferences</source>
-        <translation type="obsolete">&amp;Indstillinger</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -536,10 +308,6 @@ Do you want to quit anyway?</source>
         <source>Ctrl+|</source>
         <translation>Crtl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Crtl+/</translation>
@@ -548,22 +316,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Stop</source>
         <translation>&amp;Stop</translation>
     </message>
-    <message>
-        <source>Reload Page</source>
-        <translation type="obsolete">Genindlæs side</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Bigger</source>
-        <translation type="obsolete">&amp;Gør tekst større</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Normal</source>
-        <translation type="obsolete">&amp;Gør tekst normal</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Smaller</source>
-        <translation type="obsolete">&amp;Gør tekst mindre</translation>
-    </message>
     <message>
         <source>Find Nex&amp;t</source>
         <translation type="unfinished"></translation>
@@ -624,10 +376,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Bogmærker</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Håndtér bogmærker...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Tilføj bogmærke...</translation>
@@ -662,10 +410,6 @@ Do you want to quit anyway?</source>
         <comment>Clear Private Data</comment>
         <translation>Crtl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Aktivér Web&amp;inspektør</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hjælp</translation>
@@ -678,10 +422,6 @@ Do you want to quit anyway?</source>
         <source>About &amp;Qt</source>
         <translation>Om &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Om &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Navigation</translation>
@@ -702,23 +442,6 @@ Do you want to quit anyway?</source>
         <source>Hide Toolbar</source>
         <translation>Skjul værktøjslinje</translation>
     </message>
-    <message>
-        <source>Show Bookmarks bar</source>
-        <translation type="obsolete">Vis bogmærkelinje</translation>
-    </message>
-    <message>
-        <source>Hide Bookmarks bar</source>
-        <translation type="obsolete">Skjul bogmærkelinje</translation>
-    </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Åbn netressource</translation>
@@ -727,36 +450,10 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Netressourcer (*.html *.htm *.svg *.png *.gif *.svgz);; Alle filer (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Udskriv dokument</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Er du sikker på du vil slå privat browsing til?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Når privat browsing er slået til, vil nogle handlinger vedrørende dine hemmeligheder blive slået fra:&lt;ul&gt;&lt;li&gt;Sider bliver ikke tilføjet til historikken.&lt;/li&gt;&lt;li&gt; Filer bliver automatisk fjernet fra &quot;Downloads&quot;-vinduet.&lt;/li&gt;&lt;li&gt; Nye cookies bliver ikke gemt og eksisterende cookies kan ikke tilgås.&lt;/li&gt;&lt;li&gt; Sideikoner bliver ikke gemt, og sessioner vil ikke blive gemt.&lt;/li&gt;&lt;li&gt; Søgetermer bliver ikke tilføjet pop-op-menuen i søgefeltet.&lt;/li&gt;&lt;/ul&gt;Indtil du lukker vinduet, kan du stadig klikke på frem- og tilbage-knapperne for at komme tilbage til åbne netsider.</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to close the window?  There are %1 tab open</source>
-        <translation type="obsolete">Er du sikker på du vil lukke vinduet? Der er %1 faneblade åbne</translation>
-    </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">Kilde til %1</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Webinspektør</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Webinspektøren vil kun virke korrekt for sider der er indlæst efter webinspektøren er aktiveret
-Vil du genindlæse alle sider?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Stop indlæsning af den aktuelle side</translation>
@@ -769,11 +466,6 @@ Vil du genindlæse alle sider?</translation>
         <source>Downloads</source>
         <translation>Downloads</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Crtl+L</translation>
-    </message>
     <message>
         <source>Find P&amp;revious</source>
         <translation type="unfinished"></translation>
@@ -818,10 +510,6 @@ Vil du genindlæse alle sider?</translation>
         <source>Configure Search Engines...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -834,10 +522,6 @@ Vil du genindlæse alle sider?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -878,6 +562,19 @@ Vil du genindlæse alle sider?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -908,18 +605,6 @@ Vil du genindlæse alle sider?</translation>
         <source>&amp;Search History</source>
         <translation>&amp;Søgehistorik</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>C&amp;ache</source>
-        <translation type="obsolete">C&amp;ache</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Side&amp;Ikoner</translation>
@@ -934,1152 +619,347 @@ Vil du genindlæse alle sider?</translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
+        <source>Downloads</source>
+        <translation>Downloads</translation>
     </message>
     <message>
-        <source>Load All</source>
+        <source>Downloading %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation type="unfinished"></translation>
+        <source>Save File</source>
+        <translation>Gem fil</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation type="unfinished"></translation>
+        <source>Download canceled: %1</source>
+        <translation>Download annulleret: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished">Opsætning</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Fejl ved skrivning: %1</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation type="unfinished"></translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Netværksfejl: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation type="unfinished"></translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Hjemmeside</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rule</source>
+        <source>- %4 %5 remaining</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Tillad</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Blokér</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Tillad for session</translation>
-    </message>
-</context>
-<context>
-    <name>CookieModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Hjemmeside</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Navn</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>Sti</translation>
-    </message>
-    <message>
-        <source>Secure</source>
-        <translation>Sikker</translation>
-    </message>
-    <message>
-        <source>Expires</source>
-        <translation>Udløber</translation>
-    </message>
-    <message>
-        <source>Contents</source>
-        <translation>Indhold</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session cookie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Fjern &amp;alle cookies</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>cookie-undtagelser</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Ny undtagelse</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Domæne:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Blokér</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Tillad for session</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Tillad</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Undtagelser</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Fjern &amp;alle</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Downloads</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Ryd op</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 elementer</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Formular</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ikon</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Filnavn</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Prøv Igen</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Stop</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Åbn</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Gem fil</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Download annulleret: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening save file: %1</source>
-        <translation type="obsolete">Fejl under åbning af fil for skrivning: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Fejl ved skrivning: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Netværksfejl: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">Sekunder</translation>
-    </message>
-    <message>
-        <source>minutes</source>
-        <translation type="obsolete">Minutter</translation>
-    </message>
-    <message>
-        <source>- %4 %5 remaining</source>
-        <translation type="obsolete">- %4 %5 tilbage</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 af %2 (%3/sek) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 af %2 - Stoppet</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">Bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="unfinished">Bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="unfinished">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="unfinished">MB</translation>
-    </message>
-    <message>
-        <source>1 Download</source>
-        <translation type="obsolete">1 Download</translation>
-    </message>
-    <message>
-        <source>%1 Downloads</source>
-        <translation type="obsolete">%1 Downloads</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>History</source>
-        <translation>Historik</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Fjern &amp;alt</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Åbn</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopiér</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Slet</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Vis fuld historik</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Ryd historik</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Titel</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Tidligere i dag</translation>
-    </message>
-    <message>
-        <source>%1 items</source>
-        <translation type="obsolete">%1 elementer</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Choose language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Indtast brugernavn og kodeord for &quot;%1&quot; på %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Forbind til proxy&apos;en &quot;%1&quot; ved brug af:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">SSL-fejl:
-
-%1
-
-%2
-
-Vil du ignorere disse fejl?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Vil du acceptere alle disse certifikater?</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Navn</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Fjern</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished">Åbn fil</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Navn</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Godkendelse påkrævet</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>STANDARDIKON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRODUKTIONSSTANDARDTEKST</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Brugernavn:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Kodeord:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation type="unfinished">Ikke fundet</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Proxy-godkendelse</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">IKON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Forbind til proxy</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Brugernavn:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Kodeord:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Filen er ikke af typen XBEL version 1.0.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Ukendt titel</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Adresse</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Formular</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Færdig</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Søg</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Opsætning</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Generelt</translation>
-    </message>
-    <message>
-        <source>Home:</source>
-        <translation type="obsolete">Hjem:</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Sæt til nuværende side</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Fjern elementer fra historik:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Efter en dag</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Efter en uge</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Efter to uger</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Efter en måned</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Efter et år</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Manuelt</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Ved afslutning af program</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Åbn links fra programmer:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">I et faneblad i nuværende vindue</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>I et nyt vindue</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Downloads</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Bed om destination hver gang</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Brug denne destination:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Udseende</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Standardskrifttype:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Vælg...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Skrifttype med fast bredde:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Privatliv</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Netindhold</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Aktivér plugins</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Aktivér JavaScript</translation>
+        <source>bytes</source>
+        <translation type="obsolete">Bytes</translation>
     </message>
     <message>
-        <source>View Images</source>
-        <translation type="unfinished"></translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Keep Cookies Until:</source>
-        <translation type="unfinished"></translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
+</context>
+<context>
+    <name>DownloadManager</name>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation type="unfinished"></translation>
+        <source>bytes</source>
+        <translation type="unfinished">Bytes</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation type="unfinished"></translation>
+        <source>kB</source>
+        <translation type="unfinished">kB</translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation type="unfinished"></translation>
+        <source>MB</source>
+        <translation type="unfinished">MB</translation>
     </message>
     <message>
-        <source>Opening links</source>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>In the current tab</source>
+        <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Use proxy server</source>
-        <translation type="unfinished"></translation>
+        <source>Open</source>
+        <translation>Åbn</translation>
     </message>
     <message>
-        <source>Http (Secure)</source>
-        <translation type="unfinished"></translation>
+        <source>Copy</source>
+        <translation>Kopiér</translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation type="unfinished"></translation>
+        <source>Delete</source>
+        <translation>Slet</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Host name:</source>
-        <translation type="unfinished"></translation>
+        <source>Show All History</source>
+        <translation>Vis fuld historik</translation>
     </message>
     <message>
-        <source>Enable network cache</source>
-        <translation type="unfinished"></translation>
+        <source>Clear History</source>
+        <translation>Ryd historik</translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
+        <source>Clear History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> MB</source>
+        <source>Do you want to clear the history?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Enable Images</source>
-        <translation type="obsolete">Aktivér billeder</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Acceptér cookies:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Altid</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Aldrig</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Kun fra sider du aktivt besøger</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Undtagelser...</translation>
-    </message>
-    <message>
-        <source>Keep until:</source>
-        <translation type="obsolete">Behold indtil:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>De udløber</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Jeg afslutter programmet</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Højst 90 dage</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies...</translation>
+        <source>Title</source>
+        <translation>Titel</translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Faneblade</translation>
+        <source>Address</source>
+        <translation>Adresse</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Vælg faneblade og vinduer når de oprettes</translation>
+        <source>Earlier Today</source>
+        <translation>Tidligere i dag</translation>
     </message>
-    <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Bekræft ved afslutning af flere faneblade</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
+        <source>Welcome to Endorphin!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Enable proxy</source>
-        <translation type="obsolete">Aktivér proxy</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Type:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Host:</source>
-        <translation type="obsolete">Vært:</translation>
+        <source>Search!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User Name:</source>
-        <translation>Brugernavn:</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Kodeord:</translation>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Advanced</source>
-        <translation>Avanceret</translation>
+        <source>Choose language</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style Sheet:</source>
-        <translation>Stilark:</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>On startup:</source>
+        <source>No translation files are installed at %1.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <source>Open File</source>
+        <translation type="unfinished">Åbn fil</translation>
     </message>
     <message>
-        <source>Show my home page</source>
+        <source>OpenSearch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Show a blank page</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Restore windows and tabs from last time</source>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
+        <source>You must have at least one search engine in here.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source>Choose Directory...</source>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 day</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation type="unfinished">Navn</translation>
     </message>
     <message>
-        <source>2 days</source>
+        <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>3 days</source>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>7 days</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Tillad</translation>
     </message>
     <message>
-        <source>30 days</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AutoFill</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation type="unfinished">Ikke fundet</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>User names and passwords</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Filen er ikke af typen XBEL version 1.0.</translation>
     </message>
     <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>Ukendt titel</translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>The file is not an OpenSearch 1.1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Søg</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -2107,10 +987,6 @@ Vil du ignorere disse fejl?</translation>
         <source>&amp;Find</source>
         <translation type="unfinished">&amp;Find</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Vis</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation type="unfinished"></translation>
@@ -2126,10 +1002,6 @@ Vil du ignorere disse fejl?</translation>
         <source>Hide Tab Bar</source>
         <translation>Skjul fanebladslinje</translation>
     </message>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Nyt &amp;faneblad</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Duplikér faneblad</translation>
@@ -2173,10 +1045,6 @@ Vil du ignorere disse fejl?</translation>
         <source>Loading...</source>
         <translation type="unfinished">Indlæser...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation type="unfinished"></translation>
@@ -2210,36 +1078,16 @@ Vil du ignorere disse fejl?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>(Untitled)</source>
-        <translation type="obsolete">(Uden titel)</translation>
-    </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Vil du virkelig lukke denne side?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Du har ændret i denne side og ved at lukke den, vil du miste ændringerne
-Er du sikker på du vil lukke siden?
-</translation>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
-    <message>
-        <source>Google</source>
-        <translation type="obsolete">Google</translation>
-    </message>
     <message>
         <source>Suggestions</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>No Recent Searches</source>
         <translation>Ingen nylige søgninger</translation>
@@ -2272,37 +1120,6 @@ Er du sikker på du vil lukke siden?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Fejl ved indlæsning af side: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2353,38 +1170,6 @@ Er du sikker på du vil lukke siden?
         <source>Loading...</source>
         <translation>Indlæser...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/de_DE.ts b/src/locale/de_DE.ts
index 82ac30dc..f2d09335 100644
--- a/src/locale/de_DE.ts
+++ b/src/locale/de_DE.ts
@@ -1,23 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="de_DE">
-<context>
-    <name></name>
-    <message>
-        <source>Error</source>
-        <translation type="obsolete">Fehler</translation>
-    </message>
-    <message>
-        <source>Arora is already running. Exiting.</source>
-        <translation type="obsolete">Arora läuft bereits.</translation>
-    </message>
-</context>
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Über</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>Über %1</translation>
@@ -30,146 +15,6 @@
         <source>License</source>
         <translation>Lizenz</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>schlanker WebKit-basierter Webbrowser</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Schließen</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>WebKit Version: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Sprachen</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Sprachen: bevorzugte Reihenfolge:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Nach &amp;Oben</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Nach &amp;Unten</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Entfernen</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Hinzufügen...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>Blockiert durch AdBlockRegel: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Benutzerdefinierte Regel hinzufügen</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Weitere Informationen zum Schreiben von Regeln...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Abonnement aktualisieren</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Abonnements anzeigen...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Abonnement entfernen</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>AdBlock Konfiguration</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>AdBlock aktivieren</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Aktion</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Benutzerdefinierte Regeln</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Regel</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Abonnieren?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Wollen sie dieses AdBlock Abonnement hinzufügen?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -177,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Lesezeichen hinzufügen</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Geben Sie einen Namen und Speicherort für das Lesezeichen an.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Url</translation>
@@ -194,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Ordner hinzufügen</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Formular Passwörter</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Löschen</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Alle löschen</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Möchten Sie dieses Passwort speichern?&lt;/b&gt;&lt;br&gt;         Um die gespeicherte Passwörter anzuzeigen oder zu löschen, nutzen Sie das Autovervollständigungs-Tab im Einstellungsmenü.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Nie für diese Seite</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Nicht jetzt</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation>&lt;b&gt;Möchten Sie dieses Passwort speichern?&lt;/b&gt;&lt;br&gt;         Um die gespeicherte Passwörter anzuzeigen oder zu löschen, nutzen Sie das Autovervollständigungs-Tab im Einstellungsmenü.</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Webseite</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Benutzername</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -253,18 +49,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Neuer Ordner</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Lesezeichen</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Entfernen</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Ordner hinzufügen</translation>
-    </message>
     <message>
         <source>Open in New Tab</source>
         <translation>In einem neuen Tab öffnen</translation>
@@ -306,23 +90,10 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Datei öffnen</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>Importiert %1</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Fehler beim Laden der html Lesezeichen: %1</translation>
-    </message>
     <message>
         <source>Save File</source>
         <translation>Datei speichern</translation>
@@ -347,14 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Lesezeichen einfügen</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Namensänderung</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Adressänderung</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -377,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>htmlToXbel wird benötigt</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>htmlToXBel - welches mit Arora vertrieben wird und nötig ist um HTML Lesezeichen zu importieren - ist nicht installiert oder nicht im Suchpfad verfügbar.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Lade Lesezeichen</translation>
@@ -391,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Fehler beim Laden der HTML Lesezeichen: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation>htmlToXBel, ein Tool, das mit Endorphin ausgeliefert wird und benötigt wir, um HTML-Lesezeichen zu importieren, fehlt oder ist nicht im Suchpfad enthalten.</translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -412,10 +175,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Lesezeichen</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Öffnen</translation>
@@ -436,10 +195,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Ordner hinzufügen...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Lesezeichen</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -454,20 +209,8 @@ Arora wirklich beenden?</translation>
         <translation>Wiederherstellung fehlgeschlagen</translation>
     </message>
     <message>
-        <source>The saved session will not being restored because last time it was restored Arora crashed.</source>
-        <translation type="obsolete">Die gespeicherte Sitzung wird nicht wiederhergestellt weil bei der letzten Wiederherstellung Arora abgestürzt ist.</translation>
-    </message>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete">(Änderung: %1 %2)</translation>
-    </message>
-    <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Die gespeicherte Sitzung wird nicht wiederhergestellt, weil bei der letzten Wiederherstellung Arora abgestürzt ist.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora ist bei dem Versuch die Sitzung wiederherzustellen abgestürzt. Soll erneut versucht werden, die Sitzung wiederherzustellen?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation>Endorphin ist abgestöürzt, während die Sitzung wiederhergestellt wurde. Soll ich es nochmal versuchen?</translation>
     </message>
 </context>
 <context>
@@ -500,14 +243,6 @@ Arora wirklich beenden?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>Lesezeichen &amp;exportieren...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Druck&amp;vorschau...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Drucken...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>&amp;Private Browsing...</translation>
@@ -559,18 +294,6 @@ Arora wirklich beenden?</translation>
         <translatorcomment>Not sure if the Key is the same in german</translatorcomment>
         <translation>Strg+Y</translation>
     </message>
-    <message>
-        <source>&amp;Find Next</source>
-        <translation type="obsolete">Nächstes &amp;Ergebnis</translation>
-    </message>
-    <message>
-        <source>&amp;Find Previous</source>
-        <translation type="obsolete">Vorheriges &amp;Ergebnis</translation>
-    </message>
-    <message>
-        <source>&amp;Preferences</source>
-        <translation type="obsolete">&amp;Einstellungen</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Strg+,</translation>
@@ -579,10 +302,6 @@ Arora wirklich beenden?</translation>
         <source>&amp;View</source>
         <translation>&amp;Ansicht</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Strg+B</translation>
-    </message>
     <message>
         <source>Ctrl+|</source>
         <translation>Strg+|</translation>
@@ -595,22 +314,6 @@ Arora wirklich beenden?</translation>
         <source>&amp;Stop</source>
         <translation>&amp;Stop</translation>
     </message>
-    <message>
-        <source>Reload Page</source>
-        <translation type="obsolete">Seite aktualisieren</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Bigger</source>
-        <translation type="obsolete">&amp;Text vergrößern</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Normal</source>
-        <translation type="obsolete">Normale &amp;Textgröße</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Smaller</source>
-        <translation type="obsolete">&amp;Text verkleinern</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>&amp;Quelltext</translation>
@@ -647,10 +350,6 @@ Arora wirklich beenden?</translation>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Lesezeichen</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Lesezeichen verwalten...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Lesezeichen hinzufügen...</translation>
@@ -676,14 +375,6 @@ Arora wirklich beenden?</translation>
         <comment>Web Search</comment>
         <translation>Strg+K</translation>
     </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">&amp;Netzwerk Monitor anzeigen</translation>
-    </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Web-&amp;Inspector aktivieren</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Hilfe</translation>
@@ -692,10 +383,6 @@ Arora wirklich beenden?</translation>
         <source>About &amp;Qt</source>
         <translation>Über &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Über &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Navigation</translation>
@@ -716,23 +403,6 @@ Arora wirklich beenden?</translation>
         <source>Hide Toolbar</source>
         <translation>Werkzeugleiste verbergen</translation>
     </message>
-    <message>
-        <source>Show Bookmarks bar</source>
-        <translation type="obsolete">Lesezeichenleiste zeigen</translation>
-    </message>
-    <message>
-        <source>Hide Bookmarks bar</source>
-        <translation type="obsolete">Lesezeichenleiste verbergen</translation>
-    </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Webinhalte öffnen</translation>
@@ -741,36 +411,14 @@ Arora wirklich beenden?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Webinhalte (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Dokument drucken</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Private Browsing wirklich aktivieren?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Wenn Private Browsing aktiviert ist, werden einige Funktionen deaktiviert die Ihre Privatsphäre betreffen:&lt;ul&gt;&lt;li&gt; Aufgerufene Webseiten erscheinen nicht im Verlauf.&lt;/li&gt;&lt;li&gt; Einträge im Downloadfenster werden automatisch entfernt.&lt;/li&gt;&lt;li&gt; Neue Cookies werden nicht gespeichert, auf bestehende Cookies gibt es keinen Zugriff.&lt;/li&gt;&lt;li&gt; Seitensymbole und Sitzungen werden nicht gespeichert.&lt;/li&gt;&lt;li&gt; Suchen erscheinen nicht im Suchverlauf.&lt;/li&gt;&lt;/ul&gt;Die Zurück- und Vorwärtsbuttons funktionieren noch auf offenen Webseiten bis das Fenster geschlossen wird.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Soll das Fenster wirklich geschlossen werden? Es sind %1 Tabs geöffnet</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">Quelltext von %1</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Web Inspector</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Der Web Inspector funktioniert nur auf neu geladenen Seiten.
-Sollen alle Seiten neu geladen werden?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Ladevorgang abbrechen</translation>
@@ -783,15 +431,6 @@ Sollen alle Seiten neu geladen werden?</translation>
         <source>Downloads</source>
         <translation>Downloads</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Strg+L</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttonsto return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Wenn Private Browsing aktiviert ist, werden einige Funktionen deaktiviert die Ihre Privatsphäre betreffen:&lt;ul&gt;&lt;li&gt; Aufgerufene Webseiten erscheinen nicht im Verlauf.&lt;/li&gt;&lt;li&gt; Einträge im Downloadfenster werden automatisch entfernt.&lt;/li&gt;&lt;li&gt; Neue Cookies werden nicht gespeichert, auf bestehende Cookies gibt es keinen Zugriff.&lt;/li&gt;&lt;li&gt; Seitensymbole und Sitzungen werden nicht gespeichert.&lt;/li&gt;&lt;li&gt; Suchen erscheinen nicht im Suchverlauf.&lt;/li&gt;&lt;/ul&gt;Die Zurück- und Vorwärtsbuttons funktionieren noch auf offenen Webseiten bis das Fenster geschlossen wird.</translation>
-    </message>
     <message>
         <source>&amp;Clear Private Data</source>
         <translation>Private Daten &amp;löschen</translation>
@@ -801,38 +440,14 @@ Sollen alle Seiten neu geladen werden?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Wenn Private Browsing aktiviert ist, werden einige Funktionen deaktiviert die Ihre Privatsphäre betreffen:&lt;ul&gt;&lt;li&gt; Aufgerufene Webseiten erscheinen nicht im Verlauf.&lt;/li&gt;&lt;li&gt; Einträge im Downloadfenster werden automatisch entfernt.&lt;/li&gt;&lt;li&gt; Neue Cookies werden nicht gespeichert, auf bestehende Cookies gibt es keinen Zugriff.&lt;/li&gt;&lt;li&gt; Seitensymbole und Sitzungen werden nicht gespeichert.&lt;/li&gt;&lt;li&gt; Suchen erscheinen nicht im Suchverlauf.&lt;/li&gt;&lt;/ul&gt;Die Zurück- und Vorwärtsbuttons funktionieren noch auf offenen Webseiten bis das Fenster geschlossen wird.</translation>
-    </message>
-    <message>
-        <source>Find &amp;Next</source>
-        <translation type="obsolete">Nächstes &amp;Ergebnis</translation>
-    </message>
     <message>
         <source>Find P&amp;revious</source>
         <translation>&amp;Vorheriges Ergebnis</translation>
     </message>
-    <message>
-        <source>Prefe&amp;rences</source>
-        <translation type="obsolete">&amp;Einstellungen</translation>
-    </message>
     <message>
         <source>&amp;Reload Page</source>
         <translation>Seite &amp;aktualisieren</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">Text ver&amp;größern</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">&amp;Normale Textgröße</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">Text ver&amp;kleinern</translation>
-    </message>
     <message>
         <source>Show Bookmarks Bar</source>
         <translation>Lesezeichenleiste zeigen</translation>
@@ -845,10 +460,6 @@ Sollen alle Seiten neu geladen werden?</translation>
         <source>Find Nex&amp;t</source>
         <translation>&amp;Nächstes Ergebnis</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Einstellun&amp;gen...</translation>
-    </message>
     <message>
         <source>Show Menu Bar</source>
         <translation>Menüleiste zeigen</translation>
@@ -901,10 +512,6 @@ Sollen alle Seiten neu geladen werden?</translation>
         <source>Configure Search Engines...</source>
         <translation>Suchmaschinen verwalten...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;AdBlock...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Sobald privates Surfen aktiviert ist, sind einige Aktionen die ihre Privatsphäre betreffen deaktiviert:</translation>
@@ -917,10 +524,6 @@ Sollen alle Seiten neu geladen werden?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Objekte werden automatisch aus dem Download Fenster entfernt.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Neue Cookies werden nicht gespeichert, auf aktuelle Cookies kann nicht zugegriffen werden.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Website Symbole werden nicht gespeichert.</translation>
@@ -961,6 +564,19 @@ Sollen alle Seiten neu geladen werden?</translation>
         <source>Reload</source>
         <translation>Neu laden</translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation>%1 - Endorphin</translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation>&amp;Mit Vorschau drucken...</translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation>&amp;Drucken...</translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -991,14 +607,6 @@ Sollen alle Seiten neu geladen werden?</translation>
         <source>&amp;Search History</source>
         <translation>&amp;Suchverlauf</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
-    <message>
-        <source>C&amp;ache</source>
-        <translation type="obsolete">C&amp;ache</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>&amp;Webseiten-Symbole</translation>
@@ -1011,1274 +619,366 @@ Sollen alle Seiten neu geladen werden?</translation>
         <source>&amp;Cancel</source>
         <translation>&amp;Abbrechen</translation>
     </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>&amp;Zwischengespeicherte Webseiten</translation>
-    </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation>Laden</translation>
+        <source>Downloads</source>
+        <translation>Downloads</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>Alle Laden</translation>
+        <source>Downloading %1</source>
+        <translation>%1 wird heruntergeladen</translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>%1 zur Whitelist hinzufügen</translation>
+        <source>Save File</source>
+        <translation>Datei speichern</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>Von der Whitelist entfernen</translation>
+        <source>Download canceled: %1</source>
+        <translation>Download abgebrochen: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 von %2 (%3/Sek) - %4</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Flash laden</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Fehler beim Speichern: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Webseiten auf der Whitelist</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Netzwerk-Fehler: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Website</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Fehler beim Öffnen der Ausgabedatei: %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Erlauben</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Download Verzeichnis (%1) konnte nicht erstellt werden.</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Blocken</translation>
+        <source>%1 of %2 - Download Complete</source>
+        <translation type="vanished">%1 von %2 - Downloads abgeschlossen</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Für diese Sitzung erlauben</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Regel</translation>
-    </message>
-</context>
-<context>
-    <name>CookieModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Website</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>Pfad</translation>
-    </message>
-    <message>
-        <source>Secure</source>
-        <translation>Sicher</translation>
-    </message>
-    <message>
-        <source>Expires</source>
-        <translation>Läuft ab am</translation>
-    </message>
-    <message>
-        <source>Contents</source>
-        <translation>Inhalte</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>wahr</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falsch</translation>
-    </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>Sitzungs-Cookie</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Entfernen</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>&amp;Alle Cookies entfernen</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation>Regel &amp;hinzufügen</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Cookie Ausnahmen</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Neue Ausnahme</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Domain:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Blocken</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Für diese Sitzung erlauben</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Erlauben</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Ausnahmen</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Entfernen</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;Alle entfernen</translation>
-    </message>
-</context>
-<context>
-    <name>Dialog</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="vanished">Lesezeichen</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Downloads</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Leeren</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 Einträge</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation>%1 wird heruntergeladen</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Save File</source>
-        <translation>Datei speichern</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Download abgebrochen: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 von %2 (%3/Sek) - %4</translation>
-    </message>
-    <message>
-        <source>Error opening save file: %1</source>
-        <translation type="obsolete">Fehler beim öffnen der gespeicherten Datei: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Fehler beim Speichern: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Netzwerk-Fehler: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">Sekunden</translation>
-    </message>
-    <message>
-        <source>minutes</source>
-        <translation type="obsolete">Minuten</translation>
-    </message>
-    <message>
-        <source>- %4 %5 remaining</source>
-        <translation type="obsolete">- noch %4 %5</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 von %2 (%3/Sek) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 von %2 - Angehalten</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Dateiname</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Erneut versuchen</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Stop</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Öffnen</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- noch %n Minute(n)</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- noch %n Sekunden</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Fehler beim Öffnen der Ausgabedatei: %1</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Download Verzeichnis (%1) konnte nicht erstellt werden.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation>%1 von %2 - Downloads abgeschlossen</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Es sind noch %1 Download(s) aktiv.
-Trotzdem beenden?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>noch %n Minute verbleibend</numerusform>
-            <numerusform>noch %n Minuten verbleibend</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>noch %n sekunde verbleibend</numerusform>
-            <numerusform>noch %n sekunden verbleibend</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>1 Download</source>
-        <translation type="obsolete">1 Download</translation>
-    </message>
-    <message>
-        <source>%1 Downloads</source>
-        <translation type="obsolete">%1 Downloads</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n Download</numerusform>
-            <numerusform>%n Downloads</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Kein Fehler</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Fehler beim Öffnen von %1: Datei oder Verzeichnis nicht gefunden</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Kann %1 nicht lesen</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Inhalt von %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation>Versteckte Dateien anzeigen</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Öffnen</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopieren</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Löschen</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Verlauf</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Entfernen</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;Alle entfernen</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Kompletten Verlauf zeigen</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Verlauf leeren</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Verlauf leeren...</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Soll der Verlauf geleert werden?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Titel</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Heute</translation>
-    </message>
-    <message>
-        <source>%1 items</source>
-        <translation type="obsolete">%1 Einträge</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n Einträg</numerusform>
-            <numerusform>%n Einträge</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation>Willkommen bei Arora!</translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation>Arora Start</translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation>Suche!</translation>
-    </message>
-    <message>
-        <source>Search the web</source>
-        <translation type="vanished">Das Web durchsuchen mit</translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation>Suchergebnisse werden zur Verfügung gestellt von</translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation>Über Arora</translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>System locale (%1) %2</source>
-        <translation type="obsolete">System-Vorgabe (%1) %2</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="obsolete">Standard</translation>
-    </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Keine Sprachdateien installiert.</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Sprache wählen</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Sie können eine andere Sprache wählen,&lt;br&gt;als im Betriebssystem voreingestellt.&lt;/p&gt;&lt;p&gt;Bitte wählen Sie die Sprache,&lt;br&gt; die verwendet werden soll</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation>In %1 befinden sich keine Übersetzungsdateien.</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Benutzernamen und Password eingeben für &quot;%1&quot; bei &quot;%2&quot;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Mit Proxy &quot;%1&quot; verbinden mit:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - SSL Fehler</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL-Fehler:&lt;br/&gt;&lt;br/&gt;für:&lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Möchten Sie diese Fehler ignorieren?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Möchten Sie all diese Zertifikate akzeptieren?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Zertifikate:&lt;br/&gt;%1&lt;br/&gt;Alle Zertifikate akzeptieren?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">SSL-Fehler:
-
-%1
-
-%2
-
-Möchten Sie diese Fehler ignorieren?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Alle Zertifikate akzeptieren?</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Herausgeber: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Nicht gültig vor: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Gültig bis: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Alternative Namen:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Name</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Wert</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Netzwerk Monitor</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Netzwerkanfragen</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Anfrage Header</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Antwort Header</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Entfernen</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">&amp;Alle Entfernen</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation>Datei öffnen</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation>OpenSearch</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Fehler</translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation>%1 ist keine gültige OpenSearch 1.1 Beschreibung oder schon in Ihrer Liste.</translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation>Mindestens eine Suchmaschiene muss hier eingetragen sein.</translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>OpenSearch Verwaltung</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>Auf Standard zu&amp;rücksetzen</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Löschen</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Hinzufügen</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Schließen</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation>&lt;strong&gt;Beschreibung:&lt;/strong&gt; %1</translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation>&lt;strong&gt;Stellt Kontextvorschläge bereit&lt;/strong&gt;</translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation>Mit Kommas getrennte Liste von Schlüsselwörtern die In der Adressleiste von Suchbegriffen gefolgt eingegeben werden können um mit dieser Suchmaschine zu suchen</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation>Schlüsselwörter</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation>Möchten Sie die folgende Suchmaschiene zu Ihrer Liste hinzufügen?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Sucht mit: %2</translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Authentifikation erforderlich</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Benutzername:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Passwort:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Nicht gefunden</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Proxy Authentifikation</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Zum Proxy verbinden</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Benutzername:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Passwort:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Die Datei ist keine XBEL Version 1.0 Datei.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Unbekannter Titel</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation>Diese Datei ist keine OpenSearch 1.1 Datei.</translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Umleitung: %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Methode</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Adresse</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Antwort</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Länge</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Format</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Information</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Fertig</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Alle hervorheben</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Suche</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Einstellungen</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Allgemein</translation>
-    </message>
-    <message>
-        <source>Home:</source>
-        <translation type="obsolete">Startseite:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Aktuelle Seite</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Verlauf Einträge löschen:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Nach einem Tag</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Nach einer Woche</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Nach zwei Wochen</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Nach einem Monat</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Nach einem Jahr</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Manuell</translation>
-    </message>
-    <message>
-        <source>Save downloads to:</source>
-        <translation type="obsolete">Downloads speichern nach:</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Links von Programmen öffnen in:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">einem Tab im aktuellen Fenster</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>einem neuen Fenster</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Aussehen</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Schrift fester Breite:</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Sprachen: bevorzugte Reihenfolge für Webseiten:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Privatsphäre</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Webinhalt</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Popup Fenster blockieren</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Plugins aktivieren</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>KlickToFlash benutzen</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Javascript aktivieren</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Cookies akzeptieren:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Immer</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Nie</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Nur von besuchten Seiten</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Ausnahmen...</translation>
-    </message>
-    <message>
-        <source>Keep until:</source>
-        <translation type="obsolete">Speichern bis:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>die Cookies ablaufen</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>das Programm beende</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>maximal 90 Tage</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Enable proxy</source>
-        <translation type="obsolete">Proxy aktivieren</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Typ:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="obsolete">Host:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Benutzername:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Passwort:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Erweitert</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Style Sheet:</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Size:</source>
-        <translation type="obsolete">Größe:</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Default font:</source>
-        <translation type="obsolete">Standardschrift:</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Sans serif</source>
-        <translation type="obsolete">Sans serif</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Serif</source>
-        <translation type="obsolete">Serif</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bytes</translation>
     </message>
     <message>
-        <source>Downloads</source>
-        <translation>Downloads</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Ask for a destination each time</source>
-        <translation>Jedes Mal nach Ziel fragen</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
+</context>
+<context>
+    <name>DownloadManager</name>
     <message>
-        <source>Use this destination:</source>
-        <translation>Hier speichern:</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Es sind noch %1 Download(s) aktiv.
+Trotzdem beenden?</translation>
     </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Standard-Schriftart:</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>noch %n Minute verbleibend</numerusform>
+            <numerusform>noch %n Minuten verbleibend</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>noch %n sekunde verbleibend</numerusform>
+            <numerusform>noch %n sekunden verbleibend</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Select...</source>
-        <translation>Auswahl...</translation>
+        <source>bytes</source>
+        <translation>bytes</translation>
     </message>
     <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Tabs</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Neue erzeugte Tabs und Fenster selektieren</translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n Download</numerusform>
+            <numerusform>%n Downloads</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Nachfragen, wenn mehrere Tabs geschlossen werden</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Enable Images</source>
-        <translation type="obsolete">Bilder anzeigen</translation>
+        <source>Open</source>
+        <translation>Öffnen</translation>
     </message>
     <message>
-        <source>On startup:</source>
-        <translation>Beim Starten:</translation>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
     </message>
     <message>
-        <source>Show my home page</source>
-        <translation>Meine Homepage zeigen</translation>
+        <source>Delete</source>
+        <translation>Löschen</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Show a blank page</source>
-        <translation>Eine leere Seite zeigen</translation>
+        <source>Show All History</source>
+        <translation>Kompletten Verlauf zeigen</translation>
     </message>
     <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Letzte Sitzung wiederherstellen</translation>
+        <source>Clear History</source>
+        <translation>Verlauf leeren</translation>
     </message>
     <message>
-        <source>On application exit</source>
-        <translation>Beim Beenden</translation>
+        <source>Clear History...</source>
+        <translation>Verlauf leeren...</translation>
     </message>
     <message>
-        <source>Preferences</source>
-        <translation>Einstellungen</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Soll der Verlauf geleert werden?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Home Page:</source>
-        <translation>Startseite:</translation>
+        <source>Title</source>
+        <translation>Titel</translation>
     </message>
     <message>
-        <source>View Images</source>
-        <translation>Bilder anzeigen</translation>
+        <source>Address</source>
+        <translation>Adresse</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Cookies speichern bis:</translation>
+        <source>Earlier Today</source>
+        <translation>Heute</translation>
     </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Seitenfremde Cookies verbieten</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n Einträg</numerusform>
+            <numerusform>%n Einträge</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Das Schließen mehrerer Tabs oder Fenster bestätigen</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation>Willkommen bei Endorphin!</translation>
     </message>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Nur einen Schließen Button anzeigen, statt einen für jeden Tab</translation>
+        <source>Endorphin Start</source>
+        <translation>Endorphin-Startseite</translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Anwendung beenden wenn letztes Tab geschlossen wurde</translation>
+        <source>Search!</source>
+        <translation>Suchen!</translation>
     </message>
     <message>
-        <source>Opening links</source>
-        <translation>Öffnen von LInks</translation>
+        <source>Search the web with</source>
+        <translation>Das Web durchsuchen mit</translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Links die in einem neuen Fenster geöffnet werden sollen:</translation>
+        <source>Search results provided by</source>
+        <translation>Suchergebnisse angeboten von</translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>In einem neuen aktiven Tab im aktuellen Fenster</translation>
+        <source>About Endorphin</source>
+        <translation>Über Endorphin</translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>In einem neuen Tab im aktiven Fenster</translation>
+        <source>Choose language</source>
+        <translation>Sprache wählen</translation>
     </message>
     <message>
-        <source>In the current tab</source>
-        <translation>Im aktuellen Tab</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Sie können eine andere Sprache wählen,&lt;br&gt;als im Betriebssystem voreingestellt.&lt;/p&gt;&lt;p&gt;Bitte wählen Sie die Sprache,&lt;br&gt; die verwendet werden soll</translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation>Proxyserver verwenden</translation>
+        <source>No translation files are installed at %1.</source>
+        <translation>In %1 befinden sich keine Übersetzungsdateien.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Http (Secure)</source>
-        <translation>Http (Sicher)</translation>
+        <source>Open File</source>
+        <translation>Datei öffnen</translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (Unsicher)</translation>
+        <source>OpenSearch</source>
+        <translation>OpenSearch</translation>
     </message>
     <message>
-        <source>Host name:</source>
-        <translation>Hostname:</translation>
+        <source>Error</source>
+        <translation>Fehler</translation>
     </message>
     <message>
-        <source>Enable network cache</source>
-        <translation>Netzwerk-Cache aktivieren</translation>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
+        <translation>%1 ist keine gültige OpenSearch 1.1 Beschreibung oder schon in Ihrer Liste.</translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
-        <translation>Maximale Größe:</translation>
+        <source>You must have at least one search engine in here.</source>
+        <translation>Mindestens eine Suchmaschiene muss hier eingetragen sein.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source> MB</source>
-        <translation> MB</translation>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
+        <translation>&lt;strong&gt;Beschreibung:&lt;/strong&gt; %1</translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Standardsuchmaschine benutzen falls die vom Nutzer angegebene URL ungültig ist</translation>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
+        <translation>&lt;strong&gt;Stellt Kontextvorschläge bereit&lt;/strong&gt;</translation>
     </message>
     <message>
-        <source>Choose Directory...</source>
-        <translation>Verzeichnis auswählen...</translation>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
+        <translation>Mit Kommas getrennte Liste von Schlüsselwörtern die In der Adressleiste von Suchbegriffen gefolgt eingegeben werden können um mit dieser Suchmaschine zu suchen</translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation>Gültigkeit einer Cookie Sitzung:</translation>
+        <source>Name</source>
+        <translation>Name</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
-        <translation>Bis zum schließen des Browsers</translation>
+        <source>Keywords</source>
+        <translation>Schlüsselwörter</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>1 day</source>
-        <translation>1 Tag</translation>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
+        <translation>Möchten Sie die folgende Suchmaschiene zu Ihrer Liste hinzufügen?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Sucht mit: %2</translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>2 days</source>
-        <translation>2 Tage</translation>
+        <source>Allow</source>
+        <translation>Erlauben</translation>
     </message>
     <message>
-        <source>3 days</source>
-        <translation>3 Tage</translation>
+        <source>Deny</source>
+        <translation>Ablehnen</translation>
     </message>
     <message>
-        <source>7 days</source>
-        <translation>7 Tage</translation>
+        <source>%1 wants to %2.</source>
+        <translation>%1 möchte %2.</translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>30 days</source>
-        <translation>30 Tage</translation>
+        <source>Not Found</source>
+        <translation>Nicht gefunden</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>AutoFill</source>
-        <translation>Autovervollständigung</translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Die Datei ist keine XBEL Version 1.0 Datei.</translation>
     </message>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation>Autovervollständigungs Formulare:</translation>
+        <source>Unknown title</source>
+        <translation>Unbekannter Titel</translation>
     </message>
     <message>
-        <source>User names and passwords</source>
-        <translation>Benutzernamen und Passwörter</translation>
+        <source>The file is not an OpenSearch 1.1 file.</source>
+        <translation>Diese Datei ist keine OpenSearch 1.1 Datei.</translation>
     </message>
     <message>
-        <source>Edit...</source>
-        <translation>Editieren...</translation>
+        <source>use desktop notifications</source>
+        <translation>Desktopbenachrichtigungen anzeigen</translation>
     </message>
     <message>
-        <source>Browse...</source>
-        <translation>Anzeigen...</translation>
+        <source>use your position</source>
+        <translation>Deinen Standort verwenden</translation>
     </message>
     <message>
-        <source>Enable access keys</source>
-        <translation>Zugriffstasten aktivieren</translation>
+        <source>use your microphone</source>
+        <translation>Dein Mikrofon verwenden</translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
-        <translation>Dieses externe Downloadprogramm verwenden:</translation>
+        <source>use your camera</source>
+        <translation>Deine Kamera verwenden</translation>
     </message>
     <message>
-        <source>Choose Program...</source>
-        <translation>Programm wählen...</translation>
+        <source>use your camera and microphone</source>
+        <translation>Deine Kamera und dein Mikrofon verwenden</translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
-        <translation>Mindest-Schriftgröße:</translation>
+        <source>lock your mouse</source>
+        <translation>Deine Maus sperren</translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
-        <translation>Wenn diese Option aktiviert ist, werden Flash-Objekte standardmäßig nicht geladen. Statdessen wird jedes durch einen Knopf ersetzt, der es erlaubt, zu kontrollieren, welche Objekte geladen werden und welche nicht. </translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation>Persistent Data Storage</translation>
+        <source>Search</source>
+        <translation>Suche</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation>Neustart nötig</translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>Die Netzwerk-Cache Konfiguration wurde geändert. Damit diese Änderung Effekt hat, muss der Browser neu gestartet werden.</translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation>Verzeichnis auswählen</translation>
@@ -2306,36 +1006,13 @@ Möchten Sie diese Fehler ignorieren?</translation>
         <source>&amp;Find</source>
         <translation>&amp;Suchen</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Ansicht</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">Zeilen &amp;Umbrechen</translation>
-    </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Quelltext der Seite</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>Quelltext der Seite %1</translation>
     </message>
 </context>
-<context>
-    <name>SuggestionsTestNetworkReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="vanished">Kein Fehler</translation>
-    </message>
-</context>
 <context>
     <name>TabBar</name>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Neuer &amp;Tab</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Tab duplizieren</translation>
@@ -2356,10 +1033,6 @@ Möchten Sie diese Fehler ignorieren?</translation>
         <source>Reload All Tabs</source>
         <translation>Alle Tabs neu laden</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+T</source>
-        <translation type="obsolete">Shift+Ctrl+T</translation>
-    </message>
     <message>
         <source>Show Tab Bar</source>
         <translation>Tableiste zeigen</translation>
@@ -2391,10 +1064,6 @@ Möchten Sie diese Fehler ignorieren?</translation>
         <source>Loading...</source>
         <translation>Laden...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Laden %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Laden abgeschlossen</translation>
@@ -2425,41 +1094,21 @@ Möchten Sie diese Fehler ignorieren?</translation>
         <source>Bookmark All Tabs</source>
         <translation>Alle Tabs als Lezeichen hinzufügen</translation>
     </message>
-    <message>
-        <source>(Untitled)</source>
-        <translation type="obsolete">(Unbetitelt)</translation>
-    </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Diese Seite wirklich schließen?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Die Seite wurde modifiziert. Wenn die Seite geschlossen wird gehen die Änderungen verloren.
-Diese Seite wirklich schließen?
-</translation>
-    </message>
     <message>
         <source>Untitled</source>
         <translation>Namenlos</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation>Laden...</translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
-    <message>
-        <source>Google</source>
-        <translation type="obsolete">Google</translation>
-    </message>
     <message>
         <source>Suggestions</source>
         <translation>Vorschläge</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; hinzufügen</translation>
-    </message>
     <message>
         <source>No Recent Searches</source>
         <translation>Keine vorherigen Suchvorgänge</translation>
@@ -2492,41 +1141,6 @@ Diese Seite wirklich schließen?
         <translation>User-Agent:</translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Fehler beim Laden von: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Beim Verbinden zu: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Überprüfen Sie die Adresse auf Fehler wie &lt;b&gt;ww&lt;/b&gt;.arora-browser.org statt &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try to check the network connection.</source>
-        <translation type="obsolete">Falls die Adresse stimmt, versuchen Sie, die Netzwerkverbindung zu überprüfen.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Falls die Adresse stimmt, versuchen Sie, die Netzwerkverbindung zu überprüfen.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Wenn Ihr Computer oder Ihr Netzwerk durch eine Firewall oder einen Proxy geschützt ist, stellen Sie sicher, dass der Browser auf das Netzwerk zugreifen darf.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Erneutes Senden einer POST Anfrage</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Um diese Seite anzeigen können, muss die Anfrage mit allen Daten erneut gesendet werden, was zu unerwartetem Verhalten der Seite führen kann, so könnte z.B. die selbe Aktion erneut ausgeführt werden. Möchten Sie trotzdem fortfahren?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2577,38 +1191,6 @@ Diese Seite wirklich schließen?
         <source>Loading...</source>
         <translation>Laden...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Zur Suchleiste hinzufügen</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Methode nicht unterstützt</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>%1 Methode wird nicht unterstützt.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Suchmaschiene</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Wählen Sie die gewünschte Suchmaschiene</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Geben Sie einen Namen für die Suchmaschiene ein</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Bild unterdrücken</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/el_GR.ts b/src/locale/el_GR.ts
index e7616880..7390beb0 100644
--- a/src/locale/el_GR.ts
+++ b/src/locale/el_GR.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="el_GR">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Σχετικά με το</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation type="unfinished"></translation>
@@ -19,133 +15,6 @@
         <source>License</source>
         <translation>Άδεια</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Ένας ελαφρύς περιηγητής ιστοσελίδων βασισμένος στο WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Κλείσιμο</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Γλώσσες</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Γλώσσες: κατά σειρά προτίμησης:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Μετακίνηση &amp;Πάνω</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Μετακίνηση &amp;Κάτω</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Αφαίρεση</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Προσθήκη...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished">Κανόνας</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -153,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Προσθήκη σελιδοδείκτη</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Δώστε ένα όνομα και επιλέξτε θέση.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Url</translation>
@@ -170,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Προσθήκη Φακέλου</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished">Αφαίρεση</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -237,18 +61,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Νέος Φάκελος</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Σελιδοδείκτες</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Αφαίρεση</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Προσθήκη Φακέλου</translation>
-    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -278,10 +90,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Άνοιγμα Αρχείου</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>Εισήχθησαν %1</translation>
@@ -310,24 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Εισαγωγή Σελιδοδείκτη</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Αλλαγή Ονόματος</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Αλλαγή Διεύθυνσης</translation>
-    </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Σφάλμα κατά τη φόρτωση html σελιδοδεικτών: %1
-</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -350,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation type="unfinished"></translation>
@@ -363,6 +149,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -384,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Σελιδοδείκτης</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Άνοιγμα</translation>
@@ -408,17 +194,9 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Προσθήκη Φακέλου...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Σελιδοδείκτες</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete"> (Αλλαγή: %1 %2)</translation>
-    </message>
     <message>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
@@ -430,11 +208,7 @@ Do you want to quit anyway?</source>
         <translation>Η επαναφορά απέτυχε</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Δεν μπορεί να γίνει επαναφορά της αποθηκευμένης συνεδρίας επειδή το Arora τερμάτισε απρόσμενα κατά τη διάρκεια της επαναφοράς.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -468,14 +242,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>Εξαγωγή &amp;Σελιδοδεικτών...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Π&amp;ροεπισκόπηση Εκτύπωσης...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>Ε&amp;κτύπωση...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Ασφαλής &amp;Περιήγηση...</translation>
@@ -520,10 +286,6 @@ Do you want to quit anyway?</source>
         <source>Find P&amp;revious</source>
         <translation>Αναζήτηση Προη&amp;γούμενου</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Προ&amp;τιμήσεις...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -540,10 +302,6 @@ Do you want to quit anyway?</source>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -556,18 +314,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Reload Page</source>
         <translation>&amp;Επαναφόρτωση</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">&amp;Μεγέθυνση Γραμματοσειράς</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">Ε&amp;παναφορά Γραμματοσειράς</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">&amp;Σμίκρυνση Γραμματοσειράς</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>&amp;Κώδικας Σελίδας</translation>
@@ -604,10 +350,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Σελιδοδείκτες</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Οργάνωση Σελιδοδεικτών...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Προσθήκη Σελιδοδείκτη...</translation>
@@ -638,14 +380,6 @@ Do you want to quit anyway?</source>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">Παρακο&amp;λούθηση Δικτύου</translation>
-    </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Ενε&amp;ργοποίηση του Επόπτη Ιστοσελίδων</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Βοήθεια</translation>
@@ -658,10 +392,6 @@ Do you want to quit anyway?</source>
         <source>About &amp;Qt</source>
         <translation>Σχετικά με το &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Σχετικά με το &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Πλοήγηση</translation>
@@ -690,15 +420,6 @@ Do you want to quit anyway?</source>
         <source>Hide Bookmarks Bar</source>
         <translation>Απόκρυψη Γραμμής Σελιδοδεικτών</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Άνοιγμα Αρχείου</translation>
@@ -707,32 +428,14 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Αρχεία Web (*.html *.htm *.svg *.png *.gif *.svgz);;Όλα τα αρχεία (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Εκτύπωση</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Είσαι βέβαιος ότι θέλεις να ενεργοποιήσεις την ασφαλή περιήγηση;</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Όταν η ασφαλής περιήγηση είναι ενεργή, μερικές λειτουργίες θα απενεργοποιηθούν:&lt;ul&gt;&lt;li&gt; Οι ιστοσελίδες δεν προστίθενται στο ιστορικό.&lt;/li&gt;&lt;li&gt; Τα αντικείμενα που κατεβάζετε, αυτομάτως απομακρύνονται από το παράθυρο λήψης αρχείων.&lt;/li&gt;&lt;li&gt; Δεν αποθηκεύονται νέα cookies και τα ήδη υπάρχοντα είναι αδύνατον να προσπελαστούν.&lt;/li&gt;&lt;li&gt; Το εικονίδια των ιστοσελίδων δεν αποθηκεύονται, η συνεδρία δεν θα αποθηκευτεί.&lt;/li&gt;&lt;li&gt; Το ιστορικό των αναζητήσεων δεν αποθηκεύεται στο πλαίσιο αναζητήσεων.&lt;/li&gt;&lt;/ul&gt;Εώς ότου να κλείσετε το παράθυρο, μπορείτε να κάνετε χρήση των κουμπιών Πίσω και Μπροστά, για να πάτε σε σελίδες που έχει ήδη ανοίξει.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Είστε σίγουροι ότι θέλετε να κλείσετε το παράθυρο; Υπάρχουν %1 ανοιχτές καρτέλες</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Επόπτης Ιστοσελίδων</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Ο επόπτης ιστοσελίδων θα δουλέψει σωστά μόνο για τις σελίδες μετά την ενεργοποίηση του.
-Θέλετε να επαναφορτώσετε όλες τις σελίδες;</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Διακοπή φόρτωσης αυτής της σελίδας</translation>
@@ -745,11 +448,6 @@ Do you want to reload all pages?</source>
         <source>Downloads</source>
         <translation>Λήψεις Αρχείων</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
     <message>
         <source>Close Window</source>
         <translation>Κλείσιμο Παραθύρου</translation>
@@ -775,10 +473,6 @@ Do you want to reload all pages?</source>
         <comment>About Browser</comment>
         <translation>Σχετικά με το &amp;%1</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Όταν η ασφαλής περιήγηση είναι ενεργή, μερικές λειτουργίες θα απενεργοποιηθούν:&lt;ul&gt;&lt;li&gt; Οι ιστοσελίδες δεν προστίθενται στο ιστορικό.&lt;/li&gt;&lt;li&gt; Τα αντικείμενα που κατεβάζετε, αυτομάτως απομακρύνονται από το παράθυρο λήψης αρχείων.&lt;/li&gt;&lt;li&gt; Δεν αποθηκεύονται νέα cookies και τα ήδη υπάρχοντα είναι αδύνατον να προσπελαστούν.&lt;/li&gt;&lt;li&gt; Το εικονίδια των ιστοσελίδων δεν αποθηκεύονται, η συνεδρία δεν θα αποθηκευτεί.&lt;/li&gt;&lt;li&gt; Το ιστορικό των αναζητήσεων δεν αποθηκεύεται στο πλαίσιο αναζητήσεων.&lt;/li&gt;&lt;/ul&gt;Εώς ότου να κλείσετε το παράθυρο, μπορείτε να κάνετε χρήση των κουμπιών Πίσω και Μπροστά, για να πάτε σε σελίδες που έχει ήδη ανοίξει.</translation>
-    </message>
     <message>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
@@ -816,10 +510,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -832,10 +522,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -876,6 +562,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -906,14 +605,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>Ιστορικό &amp;Αναζήτησης</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>&amp;Λανθάνουσα Μνήμη</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Εικονίδια &amp;Ιστοσελίδων</translation>
@@ -928,1185 +619,356 @@ Do you want to reload all pages?</source>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Downloads</source>
+        <translation>Λήψεις Αρχείων</translation>
     </message>
     <message>
-        <source>Load Flash</source>
+        <source>Downloading %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlashSettings</name>
+    <name>DownloadItem</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation type="unfinished"></translation>
+        <source>Save File</source>
+        <translation>Αποθήκευση Αρχείου</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Ιστοσελίδα</translation>
+        <source>Download canceled: %1</source>
+        <translation>Η μεταφόρτωση ακυρώθηκε: %1</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Κανόνας</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Σφάλμα κατά το άνοιγμα του αρχείου εξόδου: %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Να επιτρέπεται</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Σφάλμα αποθήκευσης: %1</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Φραγή</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Σφάλμα Δικτύου: %1</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Να επιτρέπεται μόνο για τη συνεδρία</translation>
+        <source>?</source>
+        <translation>;</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Ιστοσελίδα</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 από %2 (%3/δευτ) - %4</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Όνομα</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Διαδρομή</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Ασφάλεια</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Λήξη</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Περιεχόμενα</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>αληθές</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bytes</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>ψευδές</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Απομάκρυνση</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Απομάκρυνση &amp;Όλων των Cookies</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Εξαιρέσεις Cookies</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Νέα Εξαίρεση</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Διεύθυνση:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Φραγή</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Να επιτρέπεται μόνο για τη συνεδρία</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Να επιτρέπεται</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Εξαιρέσεις</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Απομάκρυνση</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Απομάκρυνση &amp;Όλων</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Λήψεις Αρχείων</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Εκκαθάριση λίστας</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 Αντικείμενα</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Φόρμα</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Όνομα Αρχείου</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Ξανά Προσπαθήστε</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Διακοπή</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Άνοιγμα</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Αποθήκευση Αρχείου</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Η μεταφόρτωση ακυρώθηκε: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Σφάλμα κατά το άνοιγμα του αρχείου εξόδου: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Σφάλμα αποθήκευσης: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Σφάλμα Δικτύου: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">δευτερόλεπτα</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- απομένει %n λεπτό</numerusform>
-            <numerusform>- απομένουν %n λεπτά</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- απομένει %n δευτερόλεπτο</numerusform>
-            <numerusform>- απομένουν %n δευτερόλεπτα</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 από %2 (%3/δευτ) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>;</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 από %2 - Διακόπηκε</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 από %2 (%3/δευτ) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n Λήψη</numerusform>
-            <numerusform>%n Λήψεις</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Είναι %1 λήψεις σε εξέλιξη
-Είστε σίγουροι ότι θέλετε να κλείσετε;</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>απομένει %n λεπτό</numerusform>
-            <numerusform>απομένουν %n λεπτά</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>απομένει %n δευτερόλεπτο</numerusform>
-            <numerusform>απομένουν %n δευτερόλεπτα</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Άνοιγμα</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Αντιγραφή</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Διαγραφή</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Ιστορικό</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Απομάκρυνση</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Α&amp;πομάκρυνση Όλων</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Προβολή Ιστορικού</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Εκκαθάριση Ιστορικού...</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Εκκαθάριση Ιστορικού</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Θέλετε να διαγράψετε το ιστορικό;</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Τίτλος</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Διεύθυνση</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Νωρίτερα Σήμερα</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n αντικείμενο</numerusform>
-            <numerusform>%n αντικείμενα</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Default</source>
-        <translation type="obsolete">Προεπιλογή</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Επιλογή γλώσσας</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Μπορείτε να επιλέξετε μια γλώσσα διαφορετική από&lt;br&gt;την προεπιλεγμένη του λειτουργικού συστήματος.&lt;/p&gt;&lt;p&gt;Παρακαλώ επιλέξτε τη γλώσσα που επιθυμείτε&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Δεν έχουν εγκατασταθεί αρχεία μεταφράσεων.</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Εισάγετε το όνομα χρήστη και τον κωδικό για &quot;%1&quot; στο %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Σύνδεση στον διαμεσολαβητή &quot;%1&quot; χρησιμοποιώντας:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">Σφάλματα SSL:
-
-%1
-
-%2
-
-Θέλετε να αγνοήσετε αυτά τα σφάλματα;</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Θέλετε να αποδεχτείτε όλα αυτά τα πιστοποιητικά;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation>- Σφάλματα SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Σφάλματα SSL:&lt;br/&gt;&lt;br/&gt;για: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Θέλετε να αγνοήσετε αυτά τα σφάλματα;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Πιστοποιητικά:&lt;br/&gt;%1&lt;br/&gt;Θέλετε να αποδεχτείτε όλα αυτά τα πιστοποιητικά;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Όνομα</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Τιμή</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Παρακολούθηση Δικτύου</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Αιτήσεις Δικτύου</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Κεφαλίδες Αίτησης</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Κεφαλίδες Απάντησης</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Αφαίρεση</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">Αφαίρεση &amp;Όλων των Αιτημάτων</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished">Άνοιγμα Αρχείου</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Όνομα</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Χρειάζεται Αυθεντικοποίηση</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Όνομα Χρήστη:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Κωδικός:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Δεν Βρέθηκε</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Αυθεντικοποίηση Διαμεσολαβητή</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Σύνδεση σε διαμεσολαβητή</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Όνομα Χρήστη:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Κωδικός:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Το αρχείο δεν είναι XBEL έκδοσης 1.0.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Άγνωστος τίτλος</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Επαναδρομολόγηση: %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Μέθοδος</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Διεύθυνση</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Απάντηση</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Μήκος</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Τύπος Περιεχομένου</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Πληροφορίες</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Φόρμα</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">Ετικέτα</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Ολοκλήρωση</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Αναζήτηση</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Προτιμήσεις</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Γενικά</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Στην εκκίνηση του Arora:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Προβολή της αρχικής μου σελίδας</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Προβολή μιας κενής σελίδας</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Επαναφορά των  παραθύρων και καρτελών που υπήρχαν την  τελευταία φορά</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Αρχική Σελίδα:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Χρήση της τρέχουσας</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Απαλοιφή ιστορικού:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Μετά από μια μέρα</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Μετά από μια εβδομάδα</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Μετά από δύο εβδομάδες</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Μετά από ένα μήνα</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Μετά από ένα χρόνο</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Χειροκίνητα</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Κατά την έξοδο από την εφαρμογή</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Άνοιγμα συνδέσμων από εφαρμογές:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">Σε καρτέλα στο τρέχον παράθυρο</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>Σε νέο παράθυρο</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Λήψεις Αρχείων</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Πάντα ερώτηση για την τοποθεσία αποθήκευσης</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Αποθήκευση αρχείων σε:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Εμφάνιση</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Προεπιλεγμένη γραμματοσειρά:</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
+</context>
+<context>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n Λήψη</numerusform>
+            <numerusform>%n Λήψεις</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Select...</source>
-        <translation>Επιλογή...</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Είναι %1 λήψεις σε εξέλιξη
+Είστε σίγουροι ότι θέλετε να κλείσετε;</translation>
     </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Σταθερού πλάτους γραμματοσειρά:</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>απομένει %n λεπτό</numerusform>
+            <numerusform>απομένουν %n λεπτά</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>απομένει %n δευτερόλεπτο</numerusform>
+            <numerusform>απομένουν %n δευτερόλεπτα</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Privacy</source>
-        <translation>Απόρρητο</translation>
+        <source>bytes</source>
+        <translation>bytes</translation>
     </message>
     <message>
-        <source>Web Content</source>
-        <translation>Περιεχόμενο Ιστοσελίδων</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Enable Plugins</source>
-        <translation>Ενεργοποίηση Πρόσθετων</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
+        <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Enable Javascript</source>
-        <translation>Ενεργοποίηση της Javascript</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Προβολή Εικόνων</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
+        <source>Open</source>
+        <translation>Άνοιγμα</translation>
     </message>
     <message>
-        <source>Accept Cookies:</source>
-        <translation>Αποδοχή Cookies:</translation>
+        <source>Copy</source>
+        <translation>Αντιγραφή</translation>
     </message>
     <message>
-        <source>Always</source>
-        <translation>Πάντα</translation>
+        <source>Delete</source>
+        <translation>Διαγραφή</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Never</source>
-        <translation>Ποτέ</translation>
+        <source>Show All History</source>
+        <translation>Προβολή Ιστορικού</translation>
     </message>
     <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Μόνο από σελίδες που μπαίνει ο ίδιος ο χρήστης</translation>
+        <source>Clear History...</source>
+        <translation>Εκκαθάριση Ιστορικού...</translation>
     </message>
     <message>
-        <source>Exceptions...</source>
-        <translation>Εξαιρέσεις...</translation>
+        <source>Clear History</source>
+        <translation>Εκκαθάριση Ιστορικού</translation>
     </message>
     <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Διατήρηση Cookies Μέχρι:</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Θέλετε να διαγράψετε το ιστορικό;</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>They expire</source>
-        <translation>Να λήξουν</translation>
+        <source>Title</source>
+        <translation>Τίτλος</translation>
     </message>
     <message>
-        <source>I exit the application</source>
-        <translation>Να βγω από την εφαρμογή</translation>
+        <source>Address</source>
+        <translation>Διεύθυνση</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>At most 90 days</source>
-        <translation>Το πολύ 90 ημέρες</translation>
+        <source>Earlier Today</source>
+        <translation>Νωρίτερα Σήμερα</translation>
     </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies...</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n αντικείμενο</numerusform>
+            <numerusform>%n αντικείμενα</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Filter Tracking Cookies</source>
+        <source>Welcome to Endorphin!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Καρτέλες</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Επιλογή καρτελών και παραθύρων καθώς δημιουργούνται</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
+        <source>Endorphin Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
+        <source>Search!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source> MB</source>
+        <source>Search the web with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Προειδοποίηση στο κλείσιμο πολλαπλών καρτελών</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Εμφάνισε μόνο ένα κουμπί κλεισίματος αντί για ένα σε κάθε καρτέλα</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Διαμεσολαβητής</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>Χρήση διαμεσολαβητή</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Τύπος:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>Διαμεσολαβητής:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Θύρα:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Όνομα Χρήστη:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Κωδικός:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Για Προχωρημένους</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Style Sheet:</translation>
-    </message>
-    <message>
-        <source>Prefered languages for viewing webpages in:</source>
-        <translation type="obsolete">Προτιμώμενες γλώσσες για την εμφάνιση των ιστοσελίδων:</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Φραγή Αναδυόμενων Παραθύρων</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opening links</source>
-        <translation>Άνοιγμα συνδέσμων</translation>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Συνδέσμους που θέλετε να ανοίξετε σε νέο παράθυρο:</translation>
+        <source>Choose language</source>
+        <translation>Επιλογή γλώσσας</translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>Σε μια νέα επιλεγμένη καρτέλα στο τρέχον παράθυρο</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Μπορείτε να επιλέξετε μια γλώσσα διαφορετική από&lt;br&gt;την προεπιλεγμένη του λειτουργικού συστήματος.&lt;/p&gt;&lt;p&gt;Παρακαλώ επιλέξτε τη γλώσσα που επιθυμείτε&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>Σε μια νέα καρτέλα στο τρέχον παράθυρο</translation>
+        <source>No translation files are installed at %1.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>In the current tab</source>
-        <translation>Στην τρέχουσα καρτέλα</translation>
+        <source>Open File</source>
+        <translation type="unfinished">Άνοιγμα Αρχείου</translation>
     </message>
     <message>
-        <source>Http (Secure)</source>
-        <translation>Http (Ασφαλές)</translation>
+        <source>OpenSearch</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (Διαφανές)</translation>
+        <source>Error</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Προτιμώμενες γλώσσες για την εμφάνιση των ιστοσελίδων:</translation>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
+        <source>You must have at least one search engine in here.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source>Choose Directory...</source>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 day</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation type="unfinished">Όνομα</translation>
     </message>
     <message>
-        <source>2 days</source>
+        <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>3 days</source>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>7 days</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Να επιτρέπεται</translation>
     </message>
     <message>
-        <source>30 days</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AutoFill</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation>Δεν Βρέθηκε</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>User names and passwords</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Το αρχείο δεν είναι XBEL έκδοσης 1.0.</translation>
     </message>
     <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>Άγνωστος τίτλος</translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>The file is not an OpenSearch 1.1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Αναζήτηση</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -2134,18 +996,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation>&amp;Αναζήτηση</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Προβολή</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">&amp;Περιορισμός γραμμής κειμένου στο παράθυρο</translation>
-    </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Κώδικας της Σελίδας</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation type="unfinished"></translation>
@@ -2161,10 +1011,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Hide Tab Bar</source>
         <translation>Απόκρυψη Γραμμής Καρτελών</translation>
     </message>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Νέα &amp;Καρτέλα</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Αντίγραφο Καρτέλας</translation>
@@ -2220,26 +1066,10 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Untitled</source>
         <translation>Χωρίς τίτλο</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Θέλετε σίγουρα να κλείσετε αυτή τη σελίδα;</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Έχετε τροποποιήσει τη σελίδα και μόλις την κλείσετε θα χάσετε τις αλλαγές.
-Θέλετε σίγουρα να κλείσετε αυτή τη σελίδα;
-</translation>
-    </message>
     <message>
         <source>Loading...</source>
         <translation>Φορτώνει...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Φορτώνει %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Ολοκλήρωση φόρτωσης</translation>
@@ -2256,13 +1086,13 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation>Όλες οι Καρτέλες ως Σελιδοδείκτης</translation>
     </message>
-</context>
-<context>
-    <name>ToolbarSearch</name>
     <message>
-        <source>Add &apos;%1&apos;</source>
+        <source>Loading ...</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>ToolbarSearch</name>
     <message>
         <source>No Recent Searches</source>
         <translation>Δεν Υπάρχουν Πρόσφατες Αναζητήσεις</translation>
@@ -2299,41 +1129,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Σφάλμα κατά την φόρτωση της σελίδας: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Κατά τη σύνδεση στο: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Έλεγξε την διεύθυνση για λάθη όπως &lt;b&gt;ww&lt;/b&gt;.arora-browser.org αντί για &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try to check the network connection.</source>
-        <translation type="obsolete">Εάν η διεύθυνση είναι σωστή, ελέγξτε την σύνδεση σας.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Εάν ο υπολογιστής σας ή το δίκτυο σας προστατεύεται από τείχος προστασίας ή διαμεσολαβητή, βεβαιωθείται ότι ο περιηγητής σας έχει τα κατάλληλα δικαιώματα για πρόσβαση στο δίκτυο.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Εάν η διεύθυνση είναι σωστή, ελέγξτε την σύνδεση σας.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2384,38 +1179,6 @@ Do you really want to close this page?
         <source>Loading...</source>
         <translation>Φορτώνει...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/es_CR.ts b/src/locale/es_CR.ts
index 196e474e..25ab0977 100644
--- a/src/locale/es_CR.ts
+++ b/src/locale/es_CR.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="es_CR">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Acerca de</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Autores</translation>
@@ -15,137 +11,10 @@
         <source>License</source>
         <translation>Licencia</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Navegador web ligero, basado en WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Cerrar</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>Acerca %1</translation>
     </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Idiomas</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Idiomas: En orden de preferencia:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Ir &amp;Arriba</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Ir &amp;Abajo</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Agregar...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished">Regla</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -153,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Agregar marcador</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Introduzca  un nombre para el marcador y seleccione donde desea guardarlo.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>URL</translation>
@@ -170,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Agregar carpeta</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished">Remover</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -229,18 +53,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nueva carpeta</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Marcadores</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Agregar carpeta</translation>
-    </message>
     <message>
         <source>Edit Name</source>
         <translation>Editar nombre</translation>
@@ -270,10 +82,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Abrir archivo</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>Importado %1</translation>
@@ -302,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Insertar marcador</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Cambiar nombre</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Cambiar dirección</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation>Barra de marcadores</translation>
@@ -340,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>Herramienta htmlToXBel requerida</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>Herramienta htmlToXBel, la cual viene incluida con Arora y es necesaria para importar marcadores HTML, no está instalado o disponible en las rutas de búsqueda.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Cargando marcador</translation>
@@ -354,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Error durante la carga de marcadores HTML: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -375,10 +175,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Marcador</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
@@ -399,17 +195,9 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Agregar carpeta...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Marcadores</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete">(Cambiar: %1 %2)</translation>
-    </message>
     <message>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
@@ -421,11 +209,7 @@ Do you want to quit anyway?</source>
         <translation>Restauración fallida</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">La sesión guardada no pudo ser restaurada porque Arora se bloqueó mientras intentaba restaurar esta sesión.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -459,14 +243,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Exportar marcadores...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Vista p&amp;reliminar...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Imprimir...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Navegación &amp;privada...</translation>
@@ -511,10 +287,6 @@ Do you want to quit anyway?</source>
         <source>Find P&amp;revious</source>
         <translation>Encontrar A&amp;nterior</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Prefere&amp;ncias...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -531,10 +303,6 @@ Do you want to quit anyway?</source>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -547,18 +315,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Reload Page</source>
         <translation>&amp;Recargar página</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">Hacer el texto más &amp;grande</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">Hacer el texto &amp;normal</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">Hacer el texto más &amp;pequeño</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>F&amp;uente  de la página</translation>
@@ -595,10 +351,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Marcadores</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Administrar Marcadores...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Agregar Marcador...</translation>
@@ -629,10 +381,6 @@ Do you want to quit anyway?</source>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Habilitar &amp;Inspección Web</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ayuda</translation>
@@ -641,10 +389,6 @@ Do you want to quit anyway?</source>
         <source>About &amp;Qt</source>
         <translation>Acerca de &amp;QT</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Acerca de &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Navegación</translation>
@@ -673,15 +417,6 @@ Do you want to quit anyway?</source>
         <source>Hide Bookmarks Bar</source>
         <translation>Esconder  barra de marcadores</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Abrir recurso web</translation>
@@ -690,36 +425,14 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Recursos web (*.html *.htm *.svg *.png *.gif *.svgz);;Todos los  archivos (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Imprimir documento</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>¿Está seguro de activar la navegación privada?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Cuando la navegación privada se activa, algunas accciones relacionadas con su privacidad son deshabilitadas:&lt;ul&gt;&lt;li&gt; Las páginas web no son agregadas en el historial.&lt;/li&gt;&lt;li&gt; Los objetos son automáticamente removidos de la ventana de descargas.&lt;/li&gt;&lt;li&gt; Las cookies nuevas no son guardadas, las cookies actuales no podrán ser accesadas.&lt;/li&gt;&lt;li&gt; Los íconos de los sitios no serán guardados, la sesión tampoco podrá ser guardada.&lt;/li&gt;&lt;li&gt; Las búsquedas no son agregadas al menú emergente de la caja de búsqueda.&lt;/li&gt;&lt;/ul&gt; A menos que usted cierre la ventana, podrá utilizar los botones Regresar y Adelantar para regresar a páginas web que han sido abiertas.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>¿Está seguro que desea cerrar esta ventana? Hay %1 pestañana(s) abierta(s)</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">Página fuente de %1</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Inspector web</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>El Inspector web solo funcionará correctamente para páginas que fueron cargadas después de haber sido habilitado.
-¿Desea recargar las páginas?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Detener la carga de la página actual</translation>
@@ -732,11 +445,6 @@ Do you want to reload all pages?</source>
         <source>Downloads</source>
         <translation>Descargas</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
     <message>
         <source>Switch application language </source>
         <translation>Cambiar el idioma del programa</translation>
@@ -787,10 +495,6 @@ Do you want to reload all pages?</source>
         <source>Text Encoding</source>
         <translation>Codificación de caracteres</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; Network cache is disabled.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Cuando la navegación privada se activa, algunas accciones relacionadas con su privacidad son deshabilitadas:&lt;ul&gt;&lt;li&gt; Las páginas web no son agregadas en el historial.&lt;/li&gt;&lt;li&gt; Los objetos son automáticamente removidos de la ventana de descargas.&lt;/li&gt;&lt;li&gt; Las cookies nuevas no son guardadas, las cookies actuales no podrán ser accesadas.&lt;/li&gt;&lt;li&gt; Los íconos de los sitios no serán guardados, la sesión tampoco podrá ser guardada.&lt;/li&gt;&lt;li&gt; Las búsquedas no son agregadas al menú emergente de la caja de búsqueda.&lt;/li&gt;&lt;/ul&gt; A menos que usted cierre la ventana, podrá utilizar los botones Regresar y Adelantar para regresar a páginas web que han sido abiertas.</translation>
-    </message>
     <message>
         <source>Select &amp;All</source>
         <translation type="unfinished"></translation>
@@ -807,10 +511,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation type="unfinished">Configurar motores de búsqueda...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -823,10 +523,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -867,6 +563,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -897,14 +606,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>&amp;Historial de búsquedas</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>Páginas web c&amp;acheadas</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>&amp;Íconos del sitio web</translation>
@@ -919,281 +620,81 @@ Do you want to reload all pages?</source>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation>Cargar</translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation>Cargar todo</translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Agregar %1 a la lista blanca</translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation>Remover de la lista blanca</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configuraciones</translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load Flash</source>
-        <translation>Cargar Flash</translation>
+        <source>Downloads</source>
+        <translation>Descargas</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Sitios de la lista blanca</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CookieExceptionsModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Sitio web</translation>
-    </message>
-    <message>
-        <source>Rule</source>
-        <translation>Regla</translation>
-    </message>
+    <name>DownloadItem</name>
     <message>
-        <source>Allow</source>
-        <translation>Permitir</translation>
+        <source>Save File</source>
+        <translation>Guardar archivo</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Bloquear</translation>
+        <source>Download canceled: %1</source>
+        <translation>Descarga cancelada: %1</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Permitir por esta sesión</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Error abriendo el archivo de salida: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Stio web</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Error guardando: %1</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Nombre</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Error de red: %1</translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Ruta</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Seguridad</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 de %2 (%3/seg) - %4</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Expiración</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Descargando directorio (%1) no puede ser creado.</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Contenidos</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>verdadero</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>falso</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation>Cookie de la sesión</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bites</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Remove &amp;todas las cookies</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>Agregar &amp;regla</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Excepciones de Cookies</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Nueva excepción</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Dominio:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Bloquear</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Permitir por esta sesión</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Permitir</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Excepciones</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Remover &amp;Todo</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Descargas</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Borrar</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 objetos</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Foma</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ícono</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Nombre del archivo</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Intentar de nuevo</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Detener</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Guardar archivo</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Descarga cancelada: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Error abriendo el archivo de salida: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Error guardando: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Error de red: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">segundos</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n minuto restante</numerusform>
-            <numerusform>- %n minutos restantes</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n segundo restante</numerusform>
-            <numerusform>- %n segundos restantes</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 de %2 (%3/seg) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 de %2 - Detenido</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 de %2 (%3/seg) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Descargando directorio (%1) no puede ser creado.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
 </context>
 <context>
@@ -1239,33 +740,6 @@ Do you want to quit anyway?</source>
     </message>
     <message>
         <source>GB</source>
-        <translation></translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Sin Error</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Error abriendo %1: No s pudo encontrar el archivo o directorio</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>No se puede leer %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Contenidos de %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1283,18 +757,6 @@ Do you want to quit anyway?</source>
         <source>Delete</source>
         <translation>Borrar</translation>
     </message>
-    <message>
-        <source>History</source>
-        <translation>Historial</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Remover &amp;Todo</translation>
-    </message>
 </context>
 <context>
     <name>HistoryMenu</name>
@@ -1341,29 +803,29 @@ Do you want to quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translation>¡Bienvenido a Arora!</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>Iniciar Arora</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>¡Buscar!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>Resultados de la búsqueda proveídos por</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>Acerca de Arora</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1377,90 +839,11 @@ Do you want to quit anyway?</source>
         <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
         <translation>&lt;p&gt;Usted puede ejecutar un idioma distinto al del &lt;br&gt;sistema operativo predeterminado.&lt;/p&gt;&lt;p&gt;Por favor el idioma que desea utilizar&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">No se instalarán archivos de traducción</translation>
-    </message>
     <message>
         <source>No translation files are installed at %1.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Digite el usuario y clave para &quot;%1&quot; en %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Conectarse al proxy &quot;%1&quot; usando:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">Errores SSL:
-
-%1
-%2
-¿Desea ignorar esos errores?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">¿Desea aceptar todos esos certificados?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - Errores-SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Errores SSL:&lt;br/&gt;&lt;br/&gt;para: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-¿Quieres ignorar esos errores?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Certificados:&lt;br/&gt;%1&lt;br/&gt;¿Quieres aceptar todos esos certificados?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Emitido por: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>No válido antes: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Válidao hasta: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Nombres alternativos:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nombre</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Remover</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1483,26 +866,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>You must have at least one search engine in here.</source>
         <translation>Debes tener al menos un motor de búsqueda acá.</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Administrador de BuscadorLibre</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Restaurar Predeterminado</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Borrar</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Agregar</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Cerrar</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1535,26 +898,18 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Autenticación requerida</translation>
-    </message>
+    <name>PermissionBar</name>
     <message>
-        <source>DUMMY ICON</source>
-        <translation>ÍCONO VIRTUAL</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>DIGITAR TEXTO VIRTUAL</translation>
+        <source>Allow</source>
+        <translation type="unfinished">Permitir</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>Nombre de usuario:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Contraseña:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1564,29 +919,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <translation>No encontrado</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Autenticación de Proxy</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ÍCONO</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Conactar al proxsy</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Usuario:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Clave:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1601,441 +933,47 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>Este no es un archivo BuscadorLibre 1.1</translation>
     </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Dirección</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Forma</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">Etiqueta de texto</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Finalizado</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Marcar todo</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Buscar</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Preferencias</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Al iniciar:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Mostrar mi página de Inicio</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Mostrar una página en blanco</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Restaurar ventanas y pestañas de la última sesión</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Página de Inicio:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Fijar la página actual</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Remover objetos del historial:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Después de un día</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Después de una semana</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Después de dos semanas</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Después de un mes</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Después de un año</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Manualmente</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Al salir de la aplicación</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Abrir enlaces desde aplicaciones:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">En una pestaña en la ventana actual</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>En una nueva ventana</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Descargas</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Preguntar en cada caso por el destino</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Usar este destino:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Apariencia</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Fuente estándar:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Seleccionar...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Fuente de anchura-fija:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Privacidad</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Contenido web</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Habilitar agregados</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Habilitar Javascript</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Vier Imagenes</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Aceptar Cookies:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Siempre</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Nunca</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Solo de las páginas visitadas</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Excepciones...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Mantener Cookies hasta:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Que expiren (caduquen)</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Al salir de la aplicación</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Durante 90 días</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies...</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Pestañas</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Seleccionar pestañas y ventanas cuando se crean</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Confirmar cuando se cierran múltiples pestañas</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>Usar servidor proxsy  </translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Tipo:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>Nombre del Host:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Puerto:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Usuario:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Clave:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avanzado</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Estilo de hoja:</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Filter Tracking Cookies</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable network cache</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use this external download program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose Program...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum Font size:</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Buscar</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation>Reinicio requerido</translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>La configuración del cache de red ha cambiado. Con el fin de que sea tomado en su cuenta, el navegador debe ser reiniciado.</translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -2063,14 +1001,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation>&amp;Buscar</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Ver</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">&amp;Ajustar líneas </translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>Fuente de la página %1</translation>
@@ -2086,10 +1016,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Hide Tab Bar</source>
         <translation>Esconder la barra de pestañas</translation>
     </message>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Nueva &amp;pestaña</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Duplicar pestaña</translation>
@@ -2137,18 +1063,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Untitled</source>
         <translation>Sin título</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>¿Desea relamente cerrar esta página?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Usted ha modificado esta página y una vez que la haya cerrado los cambios se perderán
-¿Desea realmente cerrrar esta página?
-</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation>Ctrl-]</translation>
@@ -2165,10 +1079,6 @@ Do you really want to close this page?
         <source>Loading...</source>
         <translation>Cargando...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Cargando %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Carga finalizada</translation>
@@ -2181,6 +1091,10 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation>Guardar en los marcadores todas las pestañas</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2200,14 +1114,6 @@ Do you really want to close this page?
         <source>Suggestions</source>
         <translation>Sugerencies</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Agregar &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">Configurar motores de búsqueda...</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2228,37 +1134,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Error cargando página: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Cuando se conecta a: %1</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Verifica errores en la dirección como &lt;b&gt;ww&lt;/b&gt;.arora-browser.org en lugar de &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>si su computadora o red está protegida por un corta fuegos o proxy, asegúrese de que el navegador web tiene acceso permitido a la red.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>si la dirección es correcta, intente verificar la conexión de red.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Reenviando petición POST</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Con el fin de mostrar el sitio, la solicitud con toda la información debe ser enviada una vez más, lo cual puede generar un comportamiento inesperado en el sitio p.e. la misma acción debe ser desempeñada una vez más. ¿Quieres continuar de todos modos?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2309,38 +1184,6 @@ Do you really want to close this page?
         <source>Search with...</source>
         <translation>Buscar con...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Agregar a la barra de búsqueda</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Método no soportado</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>%1 método no es soportado.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Motor de búsqueda</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Elija el nombre deseado para el motor de búsqueda</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Nombre de motor</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/et_EE.ts b/src/locale/et_EE.ts
index abd3206e..402621e7 100644
--- a/src/locale/et_EE.ts
+++ b/src/locale/et_EE.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="et_EE">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Info</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Autorid</translation>
@@ -15,141 +11,10 @@
         <source>License</source>
         <translation>Litsents</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Lihtne WebKit-põhine veebilehitseja</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Sulge</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished">&amp;Eemalda</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -157,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Lisa järjehoidja</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Sisestage järjehoidjale nimi ja valige, kus seda hoida.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation type="unfinished"></translation>
@@ -174,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Lisa kaust</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -229,18 +49,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Uus kaust</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Järjehoidjad</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Eemalda</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Lisa kaust</translation>
-    </message>
     <message>
         <source>Open in New Tab</source>
         <translation>Ava uues &amp;sakis</translation>
@@ -273,10 +81,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Ava fail</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>%1 imporditud</translation>
@@ -305,14 +109,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Sisesta järjehoidja</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Nime muutus</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Aadressi muutus</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation type="unfinished"></translation>
@@ -343,10 +139,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation type="unfinished"></translation>
@@ -356,6 +148,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -377,13 +173,9 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Järjehoidja</translation>
-    </message>
     <message>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">&amp;Ava</translation>
     </message>
     <message>
         <source>Open in New &amp;Tab</source>
@@ -401,10 +193,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Järjehoidjad</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -418,11 +206,7 @@ Do you want to quit anyway?</source>
         <translation>Taastamine ebaõnnestus</translation>
     </message>
     <message>
-        <source>The saved session will not being restored because last time it was restored Arora crashed.</source>
-        <translation type="obsolete">Salvestatud sessiooni ei taastata, sest viimane kord kui Arora seda üritas, jooksis ta kokku.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -456,14 +240,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Ekspordi järjehoidjad...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>P&amp;rintimise eelvaade...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Prindi...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Privaatne veebi&amp;lehitsemine...</translation>
@@ -500,18 +276,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Find</source>
         <translation>&amp;Otsi</translation>
     </message>
-    <message>
-        <source>&amp;Find Next</source>
-        <translation type="obsolete">Otsi &amp;järgmist</translation>
-    </message>
-    <message>
-        <source>&amp;Find Previous</source>
-        <translation type="obsolete">Otsi eel&amp;mist</translation>
-    </message>
-    <message>
-        <source>&amp;Preferences</source>
-        <translation type="obsolete">&amp;Eelistused</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation type="unfinished"></translation>
@@ -532,22 +296,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Stop</source>
         <translation>&amp;Katkesta lehekülje laadimine</translation>
     </message>
-    <message>
-        <source>Reload Page</source>
-        <translation type="obsolete">Lae lehekülg &amp;uuesti</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Bigger</source>
-        <translation type="obsolete">Tee tekst &amp;suuremaks</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Normal</source>
-        <translation type="obsolete">T&amp;aasta teksti suurus</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Smaller</source>
-        <translation type="obsolete">Tee tekst &amp;väiksemaks</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>Veebilehe &amp;lähtekood</translation>
@@ -584,10 +332,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Järjehoidjad</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">&amp;Halda järjehoidjaid...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>&amp;Lisa järjehoidja...</translation>
@@ -609,10 +353,6 @@ Do you want to quit anyway?</source>
         <comment>Web Search</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Aktiveeri &amp;Veebiinspektor</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Abi</translation>
@@ -621,10 +361,6 @@ Do you want to quit anyway?</source>
         <source>About &amp;Qt</source>
         <translation>Lähemalt &amp;Qt kohta</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Lähemalt &amp;Arora kohta</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Navigeerimine</translation>
@@ -645,15 +381,6 @@ Do you want to quit anyway?</source>
         <source>Hide Toolbar</source>
         <translation>Peida tööriistariba</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Ava veebiressurss</translation>
@@ -662,10 +389,6 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Veebiressursid (*.html *.htm *.svg *.png *.gif *.svgz);;Kõik failid (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Prindi dokument</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Kas Te olete kindel, et soovite sisse lülitada privaatse lehitsemise?</translation>
@@ -674,20 +397,6 @@ Do you want to quit anyway?</source>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Kas Te olete kindel, et soovite akent sulgeda? Avatud on %1 sakki</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">Lehekülje %1 lähtekood</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Veebiinspektor</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Veebiinspektor töötab korrektselt ainult lehekülgede puhul, mis laetakse pärast Veebiinspektori aktiveerimist.
-Kas Te soovite kõik leheküljed uuesti laadida?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Peata käesoleva lehekülje laadimine</translation>
@@ -717,38 +426,14 @@ Kas Te soovite kõik leheküljed uuesti laadida?</translation>
         <source>Hide Bookmarks Bar</source>
         <translation>Peida järjehoidjate riba</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kui privaatne lehitsemine on sisse lülitatud, ei viida läbi teatud Teie privaatsust puudutavaid toiminguid:&lt;ul&gt;&lt;li&gt; Veebilehti ei sisestata ajalukku.&lt;/li&gt;&lt;li&gt; Allalaadimisakent puhastatakse automaatselt.&lt;/li&gt;&lt;li&gt; Uusi küpsiseid ei salvestata, olemasolevatele küpsistele keelatakse veebilehtedel ligipääs.&lt;/li&gt;&lt;li&gt; Veebilehtede ikoone ei salvestata.&lt;/li&gt;&lt;li&gt; Sessioone ei salvestata.&lt;/li&gt;&lt;li&gt; Tehtud otsinguid ei lisata otsingukasti rippmenüüsse.&lt;/li&gt;&lt;/ul&gt;Akna sulgemiseni võite siiski kasutada Edasi- ja Tagasi-nuppe avatud veebilehtedele tagasi pöördumiseks.</translation>
-    </message>
-    <message>
-        <source>Find &amp;Next</source>
-        <translation type="obsolete">Otsi &amp;järgmist</translation>
-    </message>
     <message>
         <source>Find P&amp;revious</source>
         <translation>Otsi eel&amp;mist</translation>
     </message>
-    <message>
-        <source>Prefe&amp;rences</source>
-        <translation type="obsolete">&amp;Eelistused</translation>
-    </message>
     <message>
         <source>&amp;Reload Page</source>
         <translation>Lae lehekülg &amp;uuesti</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">Tee tekst &amp;suuremaks</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">T&amp;aasta teksti suurus</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">Tee tekst &amp;väiksemaks</translation>
-    </message>
     <message>
         <source>Find Nex&amp;t</source>
         <translation type="unfinished"></translation>
@@ -823,10 +508,6 @@ Kas Te soovite kõik leheküljed uuesti laadida?</translation>
         <source>Configure Search Engines...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -839,10 +520,6 @@ Kas Te soovite kõik leheküljed uuesti laadida?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -883,6 +560,19 @@ Kas Te soovite kõik leheküljed uuesti laadida?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -913,14 +603,6 @@ Kas Te soovite kõik leheküljed uuesti laadida?</translation>
         <source>&amp;Search History</source>
         <translation>&amp;Otsingute ajalugu</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Küpsised</translation>
-    </message>
-    <message>
-        <source>C&amp;ache</source>
-        <translation type="obsolete">&amp;Puhverdatud veebileheküljed</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Veebilehekülgede &amp;ikoonid</translation>
@@ -933,1136 +615,349 @@ Kas Te soovite kõik leheküljed uuesti laadida?</translation>
         <source>&amp;Cancel</source>
         <translation>&amp;Loobu</translation>
     </message>
+</context>
+<context>
+    <name>DownloadDialog</name>
+    <message>
+        <source>Downloads</source>
+        <translation>Allalaadimised</translation>
+    </message>
     <message>
-        <source>C&amp;ached Web Pages</source>
+        <source>Downloading %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadItem</name>
     <message>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
+        <source>Save File</source>
+        <translation>Salvesta fail</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation type="unfinished"></translation>
+        <source>Download canceled: %1</source>
+        <translation>Allalaadimine katkestatud: %1</translation>
     </message>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation type="unfinished"></translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Viga salvestamisel: %1</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation type="unfinished"></translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Võrgu viga: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished">Eelistused</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Load Flash</source>
+        <source>seconds</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
+        <source>minutes</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Veebileht</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation type="obsolete">Reegel</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Luba</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Keela</translation>
+        <source>bytes</source>
+        <translation type="obsolete">baiti</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Luba sessiooniks</translation>
+        <source>kB</source>
+        <translation type="obsolete">kiB</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookieModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Veebileht</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>Asukoht</translation>
-    </message>
-    <message>
-        <source>Secure</source>
-        <translation>Turvaline</translation>
-    </message>
-    <message>
-        <source>Expires</source>
-        <translation>Aegub</translation>
-    </message>
-    <message>
-        <source>Contents</source>
-        <translation>Sisu</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session cookie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Küpsised</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Eemalda</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Eemalda &amp;kõik küpsised</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Küpsiste erandid</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Uus erand</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Domeen:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Keela</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Luba sessiooniks</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Luba</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Erandid</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Eemalda</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Eemalda &amp;kõik</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Allalaadimised</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Puhasta</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 elementi</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Save File</source>
-        <translation>Salvesta fail</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Allalaadimine katkestatud: %1</translation>
-    </message>
-    <message>
-        <source>Error opening save file: %1</source>
-        <translation type="obsolete">Viga väljundfaili avamisel: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Viga salvestamisel: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Võrgu viga: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">sekundit</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 / %2 (%3/s) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 / %2 - Katkestatud</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">baiti</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kiB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MiB</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Faili nimi</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Proovi uuesti</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Katkesta</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Ava</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n minut jäänud</numerusform>
-            <numerusform>- %n minutit jäänud</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n sekund jäänud</numerusform>
-            <numerusform>- %n sekundit jäänud</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n Download</numerusform>
-            <numerusform>%n Downloads</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="unfinished">baiti</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="unfinished">kiB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="unfinished">MiB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>&amp;Ava</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>&amp;Kopeeri</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>K&amp;ustuta</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Ajalugu</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Eemalda</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Eemalda &amp;kõik</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>&amp;Näita tervet ajalugu</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>&amp;Unusta ajalugu</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Pealkiri</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Aadress</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Varem täna</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n item</numerusform>
-            <numerusform>%n items</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Choose language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Palun sisestage kasutajanimi ja salasõna &quot;%1&quot; jaoks aadressilt %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Ühendu puhverserveriga &quot;%1&quot; kasutades:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">SSL vead:
-
-%1
-
-%2
-
-Kas Te soovite neid vigu ignoreerida?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Kas Te soovite kõik need sertifikaadid aksepteerida?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nimi</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Eemalda</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished">Ava fail</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Nimi</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Nõutud audentimine</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Kasutajanimi:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Salasõna:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation type="unfinished">Ei leitud</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Audentimine puhverserveriga</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Ühendu puhverserveriga</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Kasutajanimi:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Salasõna:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>See fail ei ole XBEL versioon 1.0 vormingus.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Tundmatu pealkiri</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Aadress</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Valmis</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Otsi</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Eelistused</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Üldine</translation>
-    </message>
-    <message>
-        <source>Home:</source>
-        <translation type="obsolete">Koduleht:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Muuda hetkel avatud leheks</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Eemalda ajaloo elemendid:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Pärast ühte päeva</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Pärast ühte nädalat</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Pärast kahte nädalat</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Pärast ühte kuud</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Pärast ühte aastat</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Käsitsi</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Ava viitasid teistest rakendustest:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">Aktiivse akna uues sakis</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>Uues aknas</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Välimus</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Fikseeritud laiusega kirjatüüp:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Privaatsus</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Veebilehtede sisu</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Luba pistikprogrammid</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Luba Javascript</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Küpsised</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Luba küpsiseid:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Alati</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Mitte kunagi</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Ainult veebilehtedelt, mida külastan</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Erandid...</translation>
-    </message>
-    <message>
-        <source>Keep until:</source>
-        <translation type="obsolete">Hoia küpsiseid kuni:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Nad aeguvad</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Rakendus suletakse</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Ülimalt 90 päeva</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Küpsised...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Puhverserver</translation>
-    </message>
-    <message>
-        <source>Enable proxy</source>
-        <translation type="obsolete">Kasuta puhverserverit</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Tüüp:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">HTTP</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="obsolete">Hostinimi:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Kasutajanimi:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Salasõna:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Muud</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Stiilileht:</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Allalaadimised</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Küsi sihtkataloogi iga allalaadimise puhul</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Kasuta seda kataloogi:</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Vaikimisi kirjatüüp:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
+        <source>MB</source>
+        <translation type="obsolete">MiB</translation>
     </message>
-    <message>
-        <source>Select...</source>
-        <translation>Vali...</translation>
+</context>
+<context>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n Download</numerusform>
+            <numerusform>%n Downloads</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
+        <source>bytes</source>
+        <translation type="unfinished">baiti</translation>
     </message>
     <message>
-        <source>On application exit</source>
-        <translation>Rakenduse sulgemisel</translation>
+        <source>kB</source>
+        <translation type="unfinished">kiB</translation>
     </message>
     <message>
-        <source>Enable Images</source>
-        <translation type="obsolete">Näita pilte</translation>
+        <source>MB</source>
+        <translation type="unfinished">MiB</translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Sakid</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Vali sakid ja aknad kui nad luuakse</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Küsi kinnitust mitme saki sulgemisel</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>On startup:</source>
-        <translation>Programmi käivitamisel:</translation>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Show my home page</source>
-        <translation>Näita kodulehte</translation>
+        <source>Open</source>
+        <translation>&amp;Ava</translation>
     </message>
     <message>
-        <source>Show a blank page</source>
-        <translation>Näita tühja lehte</translation>
+        <source>Copy</source>
+        <translation>&amp;Kopeeri</translation>
     </message>
     <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Taasta aknad ja sakid eelmisest korrast</translation>
+        <source>Delete</source>
+        <translation>K&amp;ustuta</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <source>Show All History</source>
+        <translation>&amp;Näita tervet ajalugu</translation>
     </message>
     <message>
-        <source>Home Page:</source>
-        <translation type="unfinished"></translation>
+        <source>Clear History</source>
+        <translation>&amp;Unusta ajalugu</translation>
     </message>
     <message>
-        <source>View Images</source>
+        <source>Clear History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keep Cookies Until:</source>
+        <source>Do you want to clear the history?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation type="unfinished"></translation>
+        <source>Title</source>
+        <translation>Pealkiri</translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation type="unfinished"></translation>
+        <source>Address</source>
+        <translation>Aadress</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Host name:</source>
-        <translation type="unfinished"></translation>
+        <source>Earlier Today</source>
+        <translation>Varem täna</translation>
     </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n item</numerusform>
+            <numerusform>%n items</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Block Popup Windows</source>
+        <source>Welcome to Endorphin!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opening links</source>
+        <source>Endorphin Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
+        <source>Search!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
+        <source>Search the web with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
+        <source>Search results provided by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Http (Secure)</source>
+        <source>Choose language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
+        <source>No translation files are installed at %1.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation type="unfinished"></translation>
+        <source>Open File</source>
+        <translation type="unfinished">Ava fail</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
+        <source>OpenSearch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable network cache</source>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
+        <source>You must have at least one search engine in here.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source> MB</source>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Directory...</source>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation type="unfinished">Nimi</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>1 day</source>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>2 days</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Luba</translation>
     </message>
     <message>
-        <source>3 days</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7 days</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>30 days</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation type="unfinished">Ei leitud</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>AutoFill</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>See fail ei ole XBEL versioon 1.0 vormingus.</translation>
     </message>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>Tundmatu pealkiri</translation>
     </message>
     <message>
-        <source>User names and passwords</source>
+        <source>The file is not an OpenSearch 1.1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit...</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Otsi</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -2090,10 +985,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation type="unfinished">&amp;Otsi</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Vaade</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation type="unfinished"></translation>
@@ -2101,10 +992,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
 </context>
 <context>
     <name>TabBar</name>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Uus &amp;sakk</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>&amp;Duplikeeri sakk</translation>
@@ -2156,20 +1043,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Recently Closed Tabs</source>
         <translation>&amp;Viimati suletud sakid</translation>
     </message>
-    <message>
-        <source>(Untitled)</source>
-        <translation type="obsolete">(nimetu)</translation>
-    </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Kas Te tõesti soovite selle lehekülje sulgeda?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Te olete seda lehekülge muutnud. Lehekülje sulgemisel muutused kaotatakse.Kas Te tõesti soovite selle lehekülje sulgeda?</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation type="unfinished"></translation>
@@ -2190,10 +1063,6 @@ Do you really want to close this page?
         <source>Loading...</source>
         <translation type="unfinished">Laadimine...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation type="unfinished"></translation>
@@ -2206,6 +1075,10 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2225,10 +1098,6 @@ Do you really want to close this page?
         <source>Suggestions</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2249,37 +1118,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Viga lehekülje laadimisel: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2330,38 +1168,6 @@ Do you really want to close this page?
         <source>Search with...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/fi_FI.ts b/src/locale/fi_FI.ts
index 18958b7f..dd8caae7 100644
--- a/src/locale/fi_FI.ts
+++ b/src/locale/fi_FI.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="fi_FI">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Tietoja</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Tekijät</translation>
@@ -15,129 +11,10 @@
         <source>License</source>
         <translation>Lisenssi</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Kevyt WebKit-pohjainen verkkoselain</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Sulje</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Kielet</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Kielet mielekkyysjärjestyksessä:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Siirrä &amp;ylös</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Siirrä &amp;alas</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Poista</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Lisää...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished">Sääntö</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -145,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Lisää kirjanmerkki</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Kirjoita nimi kirjanmerkille ja valitse minne se lisätään.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Url</translation>
@@ -162,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Lisää kansio</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished">Poista</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -229,18 +61,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Uusi kansio</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Kirjanmerkit</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Poista</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Lisää kansio</translation>
-    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -298,20 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Lisää kirjanmerkki</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Nimen muutos</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Osoitteen muutos</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Virhe ladattaessa html kirjanmerkkejä: %1
-</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -334,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation type="unfinished"></translation>
@@ -347,6 +149,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -368,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Kirjanmerkkipalkki</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Avaa</translation>
@@ -392,17 +194,9 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Lisää kansio...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Kirjanmerkit</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete"> (Muuta: %1 %2)</translation>
-    </message>
     <message>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
@@ -414,11 +208,7 @@ Haluatko lopettaa siitä huolimatta?</translation>
         <translation>Palautus epäonnistui</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Tallennettua istuntoa ei palautettu koska Arora kaatui yrittäessään palauttaa tätä istuntoa.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -452,14 +242,6 @@ Haluatko lopettaa siitä huolimatta?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Vie kirjanmerkkejä...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>T&amp;ulostuksen esikatselu...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Tulosta...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Yksityinen &amp;selailu...</translation>
@@ -508,10 +290,6 @@ Haluatko lopettaa siitä huolimatta?</translation>
         <source>Find P&amp;revious</source>
         <translation>Etsi e&amp;dellinen</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Asetu&amp;kset...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation></translation>
@@ -630,14 +408,6 @@ Haluatko lopettaa siitä huolimatta?</translation>
         <comment>Clear Private Data</comment>
         <translation></translation>
     </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">Näytä &amp;verkkomonitori</translation>
-    </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Käytä Web &amp;Inspectoria</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ohje</translation>
@@ -683,11 +453,6 @@ Haluatko lopettaa siitä huolimatta?</translation>
         <source>Hide Bookmarks Bar</source>
         <translation>Piilota kirjanmerkkipalkki</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation></translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Avaa web-tiedostoja</translation>
@@ -696,32 +461,14 @@ Haluatko lopettaa siitä huolimatta?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Web-tiedostot (*.html *.htm *.svg *.png *.gif *.svgz);;Kaikki tiedostot (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Tulosta dokumentti</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Oletko varma että haluat sulkea yksityisen selailun?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Kun yksityinen selailu on päällä, jotkut toiminnot liittyen yksityisyyteesi ovat pois päältä:&lt;ul&gt;&lt;li&gt; Verkkosivuja ei lisätä sivuhistoriaan.&lt;/li&gt;&lt;li&gt;Tiedostot poistetaan automaattisesti Lataukset ikkunasta&lt;/li&gt;&lt;li&gt;Uusia evästeitä ei lisätä, eikä nykyisiin evästeisiin pääse käsiksi.&lt;/li&gt;&lt;li&gt;Sivujen kuvakkeita ei tallenneta, istuntoja ei tallenneta.&lt;/li&gt;&lt;li&gt;Hakuja ei lisätä ponnahdusikkuna-valikkoon hakulaatikossa.&lt;/li&gt;&lt;/ul&gt;Kunnes suljet ikkunan, vois yhä napsauttaa Edellinen ja Seuraava painikkeita palataksesi verkkosivulle minkä olet avannut.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Oletko varma että haluat sulkea ikkunan? Siinä on %1 välilehteä avoinna</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Web Inspector toimii oikein vain sivuilla jotka on päivitetty sen käyttöön ottamisen jälkeen.
-Haluatko päivittää kaikki sivut?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Lopeta nykyisen sivun lataaminen</translation>
@@ -763,10 +510,6 @@ Haluatko päivittää kaikki sivut?</translation>
         <source>Configure Search Engines...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -779,10 +522,6 @@ Haluatko päivittää kaikki sivut?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -823,6 +562,19 @@ Haluatko päivittää kaikki sivut?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -853,14 +605,6 @@ Haluatko päivittää kaikki sivut?</translation>
         <source>&amp;Search History</source>
         <translation>&amp;Haut</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Evästeet</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>&amp;Välimuisti</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Verkkosivujen &amp;kuvakkeet</translation>
@@ -875,1121 +619,356 @@ Haluatko päivittää kaikki sivut?</translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Downloads</source>
+        <translation>Lataukset</translation>
     </message>
     <message>
-        <source>Load Flash</source>
+        <source>Downloading %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlashSettings</name>
+    <name>DownloadItem</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation type="unfinished"></translation>
+        <source>Save File</source>
+        <translation>Tallenna tiedosto</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Verkkosivu</translation>
+        <source>Download canceled: %1</source>
+        <translation>Lataus keskeytetty: %1</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Sääntö</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Virhe avattaessa tiedostoa: %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Salli</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Virhe tallennettaessa: %1</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Estä</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Verkon virhe: %1</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Salli istunnon ajaksi</translation>
+        <source>?</source>
+        <translation></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Verkkosivu</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1/%2 (%3/sek) %4</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Nimi</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Polku</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Turvallinen</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Vanhenee</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Sisältö</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>tosi</translation>
+        <source>bytes</source>
+        <translation type="obsolete">tavua</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>epätosi</translation>
+        <source>kB</source>
+        <translation type="obsolete">kt</translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation type="unfinished"></translation>
+        <source>MB</source>
+        <translation type="obsolete">Mt</translation>
     </message>
 </context>
 <context>
-    <name>CookiesDialog</name>
+    <name>DownloadManager</name>
     <message>
-        <source>Cookies</source>
-        <translation>Evästeet</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Käynnissä on %1 latausta
+Haluatko lopettaa siitä huolimatta?</translation>
     </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Poista</translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n Lataus</numerusform>
+            <numerusform>%n Latausta</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Poista &amp;kaikki evästeet</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n minuutti jäljellä</numerusform>
+            <numerusform>%n minuuttia jäljellä</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Evästeiden poikkeukset</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Uusi poikkeus</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Estä</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Salli istunnon ajaksi</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Salli</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Poikkeukset</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Poista</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Poista &amp;kaikki</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Lataukset</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Tyhjennä</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 tiedostoa</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Lomake</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Kuvake</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Tiedostonimi</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Yritä uudestaan</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Pysäytä</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Avaa</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Tallenna tiedosto</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Lataus keskeytetty: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Virhe avattaessa tiedostoa: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Virhe tallennettaessa: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Verkon virhe: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">sekunnit</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n minuutti jäljellä</numerusform>
-            <numerusform>- %n minuuttia jäljellä</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n sekunti jäljellä</numerusform>
-            <numerusform>- %n sekuntia jäljellä</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1/%2 (%3/sek) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1/%2 - Pysäytetty</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">tavua</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kt</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">Mt</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1/%2 (%3/sek) %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Käynnissä on %1 latausta
-Haluatko lopettaa siitä huolimatta?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n Lataus</numerusform>
-            <numerusform>%n Latausta</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minuutti jäljellä</numerusform>
-            <numerusform>%n minuuttia jäljellä</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n sekunti jäljellä</numerusform>
-            <numerusform>%n sekuntia jäljellä</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>tavua</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kt</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>Mt</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Avaa</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopio</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Poista</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Historia</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Poista</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Poista &amp;kaikki</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Näytä koko historia</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Tyhjennä historia...</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Poista historia</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Haluatko poistaa historian?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Otsikko</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Osoite</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Aiemmin tänään</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n kohde</numerusform>
-            <numerusform>%n kohdetta</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Yhtään käännöstä ei ole asennettu.</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Valitse kieli</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Voit käyttää eri kieltä&lt;br&gt;kuin käyttöjärjestelmän oletus.&lt;/p&gt;&lt;p&gt;Ole hyvä ja valitse kieli mitä käytetään&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Anna käyttäjätunnus ja salasana palvelimelle %2, sivuston viesti &quot;%1&quot;&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Yhdistä välityspalvelimeen &quot;%1&quot; käyttäen:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - SSL Virheet</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL virheet:&lt;br/&gt;&lt;br/&gt;&lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Haluatko sivuuttaa nämä virheet?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Varmenteet:&lt;br/&gt;%1&lt;br/&gt;Hyväksytkö kaikki nämä varmenteet?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nimi</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Arvo</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Verkkomonitori</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Verkon pyynnöt</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Pyynnön otsakkeet</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Vastauksen otsakkeet</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Poista</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">Poista &amp;kaikki pyynnöt</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished">Avaa tiedosto</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Nimi</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Tunnistautuminen vaaditaan</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Käyttäjätunnus:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Salasana:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Ei löytynyt</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Välityspalvelimen varmennus</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Yhdistä välityspalvelimeen</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Käyttäjätunnus:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Salasana:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Tiedosto ei ole XBEL versio 1.0 tiedosto.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Tuntematon otsikko</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Uudelleenohjaus: %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Menetelmä</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Osoite</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Vastaus</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Pituus</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Sisältötyyppi</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Tietoja</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Lomake</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Valmis</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Haku</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Yleiset</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Käynnistettäessä:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Näytä kotisivuni</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Näytä tyhjä sivu</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Palauta ikkunat ja välilehdet viime kerralta</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Kotisivu:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Käytä avointa sivua</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Poista historia:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Päivän jälkeen</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Viikon jälkeen</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Kahden viikon jälkeen</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Kuukauden jälkeen</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Vuoden jälkeen</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Käsin</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Lopetettaessa</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Lataukset</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Kysy kansiota joka kerta</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Käytä kansiota:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Ulkoasu</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Oletuskirjasinlaji:</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Valitse...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Tasalevyinen kirjasin:</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Kieli, jolla sivut näytetään:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Yksityisyys</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Sisältö</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Estä ponnahdusikkunat</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Käytä liitännäisiä</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Käytä Javascriptiä</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Näytä kuvat</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Evästeet</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Hyväksy evästeet:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Aina</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Ei ikinä</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Ainoastaan sivuilta joille menet</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Poikkeukset...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Säilytä evästeet:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>kunnes ne vanhenevat</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>kunnes selain suljetaan</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Korkeintaan 90 päivää</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Evästeet...</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n sekunti jäljellä</numerusform>
+            <numerusform>%n sekuntia jäljellä</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Välilehdet</translation>
+        <source>bytes</source>
+        <translation>tavua</translation>
     </message>
     <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Valitse välilehdet ja ikkunat silloin kun ne luodaan</translation>
+        <source>kB</source>
+        <translation>kt</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Varoita, kun yritän sulkea useita välilehtiä samanaikaisesti</translation>
+        <source>MB</source>
+        <translation>Mt</translation>
     </message>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Näytä ainoastaan yksi sulkupainike sen sijaan, että jokaisella välilehdella olisi oma sulkupainike</translation>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Opening links</source>
-        <translation>Avautuvat linkit</translation>
+        <source>Open</source>
+        <translation>Avaa</translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Avaa linkit jotka haluavat avautua uuteen ikkunaan:</translation>
+        <source>Copy</source>
+        <translation>Kopio</translation>
     </message>
     <message>
-        <source>In a new window</source>
-        <translation>Uuteen ikkunaan</translation>
+        <source>Delete</source>
+        <translation>Poista</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>Uuteen valittuun välilehteen nykyisessä ikkunassa</translation>
+        <source>Show All History</source>
+        <translation>Näytä koko historia</translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>Uuteen välilehteen nykyisessä ikkunassa</translation>
+        <source>Clear History...</source>
+        <translation>Tyhjennä historia...</translation>
     </message>
     <message>
-        <source>In the current tab</source>
-        <translation>Nykyiseen välilehteen</translation>
+        <source>Clear History</source>
+        <translation>Poista historia</translation>
     </message>
     <message>
-        <source>Open links from applications:</source>
-        <translation>Avaa linkit:</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Haluatko poistaa historian?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Proxy</source>
-        <translation>Välityspalvelin</translation>
+        <source>Title</source>
+        <translation>Otsikko</translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation>Käytä välityspalvelinta</translation>
+        <source>Address</source>
+        <translation>Osoite</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Type:</source>
-        <translation>Tyyppi:</translation>
+        <source>Earlier Today</source>
+        <translation>Aiemmin tänään</translation>
     </message>
-    <message>
-        <source>Socks5</source>
-        <translation></translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n kohde</numerusform>
+            <numerusform>%n kohdetta</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Http (Secure)</source>
-        <translation>Http (turvallinen)</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (läpinäkyvä)</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Host name:</source>
-        <translation>Verkko-osoite:</translation>
+        <source>Search!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Port:</source>
-        <translation>Portti:</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User Name:</source>
-        <translation>Käyttäjätunnus:</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Salasana:</translation>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Advanced</source>
-        <translation>Kehittyneet</translation>
+        <source>Choose language</source>
+        <translation>Valitse kieli</translation>
     </message>
     <message>
-        <source>Style Sheet:</source>
-        <translation>Tyylitiedosto:</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Voit käyttää eri kieltä&lt;br&gt;kuin käyttöjärjestelmän oletus.&lt;/p&gt;&lt;p&gt;Ole hyvä ja valitse kieli mitä käytetään&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
+        <source>No translation files are installed at %1.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation type="unfinished"></translation>
+        <source>Open File</source>
+        <translation type="unfinished">Avaa tiedosto</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
+        <source>OpenSearch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable network cache</source>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
+        <source>You must have at least one search engine in here.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source> MB</source>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Directory...</source>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation type="unfinished">Nimi</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>1 day</source>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>2 days</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Salli</translation>
     </message>
     <message>
-        <source>3 days</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7 days</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>30 days</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation>Ei löytynyt</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>AutoFill</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Tiedosto ei ole XBEL versio 1.0 tiedosto.</translation>
     </message>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>Tuntematon otsikko</translation>
     </message>
     <message>
-        <source>User names and passwords</source>
+        <source>The file is not an OpenSearch 1.1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit...</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Haku</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -2017,18 +996,6 @@ Haluatko sivuuttaa nämä virheet?&lt;/qt&gt;</translation>
         <source>&amp;Find</source>
         <translation>&amp;Etsi</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Katso</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">&amp;Rivitys</translation>
-    </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Sivun lähdekoodi</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation type="unfinished"></translation>
@@ -2075,26 +1042,10 @@ Haluatko sivuuttaa nämä virheet?&lt;/qt&gt;</translation>
         <source>Saved Tabs</source>
         <translation>Tallennetut välilehdet</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Oletko varma että haluat sulkea tämän sivun?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Olet muokannut tätä sivua ja jos se suljetaan menetät muokkaukset.
-Haluatko varmasti sulkea tämän sivun?
-</translation>
-    </message>
     <message>
         <source>Loading...</source>
         <translation>Ladataan...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Ladataan %1 % (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Ladattu</translation>
@@ -2135,6 +1086,10 @@ Haluatko varmasti sulkea tämän sivun?
         <source>Bookmark All Tabs</source>
         <translation>Lisää kaikki välilehdet kirjanmerkkeihin</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2154,10 +1109,6 @@ Haluatko varmasti sulkea tämän sivun?
         <source>Suggestions</source>
         <translation>Ehdotukset</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2178,37 +1129,6 @@ Haluatko varmasti sulkea tämän sivun?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Virhe ladattaessa sivua: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Yhdistettäessä: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Tarkista osoite virheiden varalta, esim. &quot;&lt;b&gt;ww&lt;/b&gt;.arora-browser.org&quot; oikean muodon sijaan &quot;&lt;b&gt;www&lt;/b&gt;.arora-browser.org&quot;</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Jos osoite on oikea, tarkista yhteytesi.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Jos tietokoneesi tai verkkosi on suojattu palomuurilla tai välityspalvelimella, tarkista että selaimella on pääsy verkkoon.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2259,38 +1179,6 @@ Haluatko varmasti sulkea tämän sivun?
         <source>Search with...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/fr_CA.ts b/src/locale/fr_CA.ts
index 4a65caab..c474432f 100644
--- a/src/locale/fr_CA.ts
+++ b/src/locale/fr_CA.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="fr_CA">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">À propos</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation type="unfinished"></translation>
@@ -15,129 +11,10 @@
         <source>License</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -145,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Ajouter un marque-page</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Entrer un nom pour le marque-page et choisissez où le conserver.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation type="unfinished"></translation>
@@ -162,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Ajouter un dossier</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -217,18 +49,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nouveau dossier</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Marque-pages</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Retirer</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Ajouter un dossier</translation>
-    </message>
     <message>
         <source>Open in New Tab</source>
         <translation>Ouvrir dans un nouvel onglet</translation>
@@ -290,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Insérer un marque-page</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Changement de nom</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Changement d&apos;adresse</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation type="unfinished"></translation>
@@ -328,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation type="unfinished"></translation>
@@ -341,6 +149,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -362,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Marque-page</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Ouvrir</translation>
@@ -386,10 +194,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Marque-pages</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -404,7 +208,7 @@ Voulez-vous tout de même quitter?</translation>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -438,14 +242,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Exporter les marque-pages...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Ape&amp;rçu avant impression...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>Im&amp;pression</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Navigation en mode privé</translation>
@@ -482,18 +278,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>&amp;Find</source>
         <translation>&amp;Rechercher</translation>
     </message>
-    <message>
-        <source>&amp;Find Next</source>
-        <translation type="obsolete">Rechercher le &amp;suivant</translation>
-    </message>
-    <message>
-        <source>&amp;Find Previous</source>
-        <translation type="obsolete">Rechercher le p&amp;récédent</translation>
-    </message>
-    <message>
-        <source>&amp;Preferences</source>
-        <translation type="obsolete">&amp;Préférences</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation type="unfinished"></translation>
@@ -514,34 +298,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>&amp;Stop</source>
         <translation>A&amp;rrêter</translation>
     </message>
-    <message>
-        <source>Reload Page</source>
-        <translation type="obsolete">&amp;Recharger la page</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Bigger</source>
-        <translation type="obsolete">Agrandir le texte</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Smaller</source>
-        <translation type="obsolete">Réduire le texte</translation>
-    </message>
-    <message>
-        <source>&amp;Make Content Bigger</source>
-        <translation type="obsolete">Agrandir la page</translation>
-    </message>
-    <message>
-        <source>&amp;Make Content Smaller</source>
-        <translation type="obsolete">Réduire la page</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Normal</source>
-        <translation type="obsolete">Réinitialiser la taile du texte</translation>
-    </message>
-    <message>
-        <source>&amp;Make Content Normal</source>
-        <translation type="obsolete">Réinitialiser la taile de la page</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>Code s&amp;ource de la page</translation>
@@ -578,10 +334,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Marque-pages</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Gérer les marque-pages</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Ajouter un marque-page...</translation>
@@ -603,10 +355,6 @@ Voulez-vous tout de même quitter?</translation>
         <comment>Web Search</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Activer l&apos;&amp;inspecteur Web</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
@@ -615,10 +363,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>About &amp;Qt</source>
         <translation>À propos de &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">À propos d&apos;&amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation type="unfinished"></translation>
@@ -639,19 +383,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>Hide Toolbar</source>
         <translation>Masquer la barre d&apos;outils</translation>
     </message>
-    <message>
-        <source>Show Bookmarks bar</source>
-        <translation type="obsolete">Afficher la barre de marque-pages</translation>
-    </message>
-    <message>
-        <source>Hide Bookmarks bar</source>
-        <translation type="obsolete">Masquer la barre de marque-pages</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Ouvrir un fichier Web</translation>
@@ -660,35 +391,14 @@ Voulez-vous tout de même quitter?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Fichier Web (*.html *.htm *.svg *.png *.gif *.svgz);;Tous les fichiers (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Imprimer le document</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Êtes-vous sûr de vouloir activer la navigation en mode privé?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttonsto return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Lorsque la navigation en mode privé est activée, certaines actions concernant votre vie privée seront désactivées:&lt;ul&gt;&lt;li&gt; Les pages Web ne sont pas ajoutées à l&apos;historique.&lt;/li&gt;&lt;li&gt; Les téléchargements sont automatiquement retiré de la fenêtre des téléchargements.&lt;/li&gt;&lt;li&gt; Les nouveaux fichiers témoins ne sont pas conservés et les fichiers témoins déjà existant ne sont pas accessibles.&lt;/li&gt;&lt;li&gt; Les icônes de sites Web et la session ne sont pas enregistrés.&lt;/li&gt;&lt;li&gt; Les recherches ne sont pas ajoutées dans la liste des recherches récentes.&lt;/li&gt;&lt;/ul&gt;Jusqu&apos;à la fermeture de l&apos;écran, vous pouvez encore utiliser les boutons Page précédente et Page suivante.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Êtes-vous sûr de vouloir fermer cette fenêtre? Il y a %1 onglets ouverts.</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">Code source de %1</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Inspecteur Web</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>L&apos;inspecteur Web ne fonctionne que pour les pages qui ont été chargées après son activation.  Voulez-vous recharcher toutes les pages?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Arrêter le chargement de la page en cours</translation>
@@ -800,10 +510,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -816,10 +522,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -860,6 +562,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -890,14 +605,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>Historique de recherche</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>Fichiers témoins</translation>
-    </message>
-    <message>
-        <source>C&amp;ache</source>
-        <translation type="obsolete">Mémoire cache</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Icônes de sites Web</translation>
@@ -910,1112 +617,349 @@ Do you want to reload all pages?</source>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
+</context>
+<context>
+    <name>DownloadDialog</name>
+    <message>
+        <source>Downloads</source>
+        <translation>Téléchargements</translation>
+    </message>
     <message>
-        <source>C&amp;ached Web Pages</source>
+        <source>Downloading %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadItem</name>
     <message>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
+        <source>Save File</source>
+        <translation>Enregistrer le fichier</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation type="unfinished"></translation>
+        <source>Download canceled: %1</source>
+        <translation>Téléchargement annulé: %1</translation>
     </message>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation type="unfinished"></translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Erreur à l&apos;enregistrement: %1</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation type="unfinished"></translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Erreur réseau: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished">Paramètres</translation>
+        <source>?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Load Flash</source>
+        <source>seconds</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
+        <source>minutes</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Site Web</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation type="obsolete">Statut</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Permettre</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Bloquer</translation>
+        <source>bytes</source>
+        <translation type="obsolete">octets</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Permettre pour la session</translation>
+        <source>kB</source>
+        <translation type="obsolete">kO</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation type="unfinished"></translation>
+        <source>MB</source>
+        <translation type="obsolete">MO</translation>
     </message>
 </context>
 <context>
-    <name>CookieModel</name>
+    <name>DownloadManager</name>
     <message>
-        <source>Website</source>
-        <translation>Site Web</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>Chemin d&apos;accès</translation>
-    </message>
-    <message>
-        <source>Secure</source>
-        <translation>Sécure</translation>
-    </message>
-    <message>
-        <source>Expires</source>
-        <translation>Expire</translation>
-    </message>
-    <message>
-        <source>Contents</source>
-        <translation>Contenu</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Session cookie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Fichiers témoins</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Retirer</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Retirer tous les fichiers témoins</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Exceptions pour les fichiers témoins</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Nouvelle exception</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Domaine:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Bloquer</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Permettre pour la session</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Permettre</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Exceptions</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>Retirer</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Tout retirer</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Téléchargements</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Vider la liste</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 items</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Formulaire</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Nom de fichier</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Essayer à nouveau</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Interrompre</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Ouvrir</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Enregistrer le fichier</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Téléchargement annulé: %1</translation>
-    </message>
-    <message>
-        <source>Error opening save file: %1</source>
-        <translation type="obsolete">Erreur à l&apos;ouverture du fichier destination: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Erreur à l&apos;enregistrement: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Erreur réseau: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">secondes</translation>
-    </message>
-    <message>
-        <source>minutes</source>
-        <translation type="obsolete">minutes</translation>
-    </message>
-    <message>
-        <source>- %4 %5 remaining</source>
-        <translation type="obsolete">- %4 %5 restant</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 de %2 (%3/sec) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 de %2 - Interrompu</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">octets</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kO</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MO</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>1 Download</source>
-        <translation type="obsolete">1 téléchargement</translation>
-    </message>
-    <message>
-        <source>%1 Downloads</source>
-        <translation type="obsolete">%1 téléchargements</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="unfinished">octets</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="unfinished">kO</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="unfinished">MO</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Ouvrir</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copier</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Supprimer</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Historique</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Retirer</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Tout retirer</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Montrer tout l&apos;historique</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Effacer l&apos;historique</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Titre</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Plutôt aujourd&apos;hui</translation>
-    </message>
-    <message>
-        <source>%1 items</source>
-        <translation type="obsolete">%1 items</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Choose language</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Entrer le nombre d&apos;utilisateur et le mot de passe pour &quot;%1&quot; sur %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Se brancher au serveur mandataire &quot;%1&quot; en utilisant:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">Erreurs SSL:
-%1
-%2
-Voulez-vous ignorer ses erreurs?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Voulez-vous accepter tous ces certificats?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nom</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished">Ouvrir un fichier</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Nom</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Authentification requise</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nom d&apos;utilisateur:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Mot de passe:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation type="unfinished">Non trouvé</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Authentification au serveur mandataire</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Se brancher au serveur mandataire</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nom d&apos;utilisateur:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Mot de passe:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Ce fichier n&apos;est pas un fichier XBEL version 1.0.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Titre inconnu</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Adresse</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Fromulaire</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Fermer</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Rechercher</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Paramètres</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <source>Home:</source>
-        <translation type="obsolete">Page d&apos;accueil:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Utiliser la page en cours</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation type="unfinished">Retirer les éléments de l&apos;historique:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Après une journée</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Après une semaine</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Après 2 semaines</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Après un mois</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Après un an</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Manuellement</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Ouvrir les liens provenant d&apos;applications:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">Dans un onglet dans la fenêtre en cours</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>Dans une nouvelle fenêtre</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Apparence</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Police par défaut:</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Sélectionner...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Police à espacement constant:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Vie privée</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Contenu Web</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Activer les plugiciels</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Activer le Javascript</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Fichier témoins</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Accepter les fichiers témoins:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Toujours</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Jamais</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Seulement des sites que vous visitez</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Exceptions...</translation>
-    </message>
-    <message>
-        <source>Keep until:</source>
-        <translation type="obsolete">Expiration:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Lorsqu&apos;ils expirent</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Lorsque je quitte l&apos;application</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Au plus tard dans 90 jours</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Fichiers témoins...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Serveur mandataire</translation>
+        <source>bytes</source>
+        <translation type="unfinished">octets</translation>
     </message>
     <message>
-        <source>Enable proxy</source>
-        <translation type="obsolete">Activer le serveur mandataire</translation>
+        <source>kB</source>
+        <translation type="unfinished">kO</translation>
     </message>
     <message>
-        <source>Type:</source>
-        <translation>Type:</translation>
+        <source>MB</source>
+        <translation type="unfinished">MO</translation>
     </message>
     <message>
-        <source>Socks5</source>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Host:</source>
-        <translation type="obsolete">Hôte:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Nom d&apos;utilisateur:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Mot de passe:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avancé</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Feuille de style:</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Téléchargements</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Demander le dossier de destination à chaque fois</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Utiliser ce dossier</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Show my home page</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>Restore windows and tabs from last time</source>
+        <source>GB</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>On application exit</source>
-        <translation type="unfinished"></translation>
+        <source>Open</source>
+        <translation>Ouvrir</translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation type="unfinished"></translation>
+        <source>Copy</source>
+        <translation>Copier</translation>
     </message>
     <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation type="unfinished"></translation>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Preferences</source>
-        <translation type="unfinished"></translation>
+        <source>Show All History</source>
+        <translation>Montrer tout l&apos;historique</translation>
     </message>
     <message>
-        <source>Home Page:</source>
-        <translation type="unfinished"></translation>
+        <source>Clear History</source>
+        <translation>Effacer l&apos;historique</translation>
     </message>
     <message>
-        <source>View Images</source>
+        <source>Clear History...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Keep Cookies Until:</source>
+        <source>Do you want to clear the history?</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation type="unfinished"></translation>
+        <source>Title</source>
+        <translation>Titre</translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation type="unfinished"></translation>
+        <source>Address</source>
+        <translation>Adresse</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Host name:</source>
-        <translation type="unfinished"></translation>
+        <source>Earlier Today</source>
+        <translation>Plutôt aujourd&apos;hui</translation>
     </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Block Popup Windows</source>
+        <source>Welcome to Endorphin!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opening links</source>
+        <source>Endorphin Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
+        <source>Search!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
+        <source>Search the web with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
+        <source>Search results provided by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Http (Secure)</source>
+        <source>Choose language</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
+        <source>No translation files are installed at %1.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation type="unfinished"></translation>
+        <source>Open File</source>
+        <translation type="unfinished">Ouvrir un fichier</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
+        <source>OpenSearch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable network cache</source>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
+        <source>You must have at least one search engine in here.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source> MB</source>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Directory...</source>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation type="unfinished">Nom</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>1 day</source>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>2 days</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Permettre</translation>
     </message>
     <message>
-        <source>3 days</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7 days</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>30 days</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation type="unfinished">Non trouvé</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>AutoFill</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Ce fichier n&apos;est pas un fichier XBEL version 1.0.</translation>
     </message>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>Titre inconnu</translation>
     </message>
     <message>
-        <source>User names and passwords</source>
+        <source>The file is not an OpenSearch 1.1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit...</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Rechercher</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -2043,10 +987,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation type="unfinished">&amp;Rechercher</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Affichage</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation type="unfinished"></translation>
@@ -2054,10 +994,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
 </context>
 <context>
     <name>TabBar</name>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Nouvel onglet</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Dupliquer l&apos;onglet</translation>
@@ -2109,22 +1045,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Recently Closed Tabs</source>
         <translation>Onglet récement fermés</translation>
     </message>
-    <message>
-        <source>(Untitled)</source>
-        <translation type="obsolete">(Sans titre)</translation>
-    </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Voulez-vous vraiment fermer cette page?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Vous avez modifié cette page et en fermant l&apos;onglet, vous allez perdre les modifications.
-Voulez-vous vraiment fermer cette page?
-</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation type="unfinished"></translation>
@@ -2145,10 +1065,6 @@ Voulez-vous vraiment fermer cette page?
         <source>Loading...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation type="unfinished"></translation>
@@ -2161,6 +1077,10 @@ Voulez-vous vraiment fermer cette page?
         <source>Bookmark All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2180,10 +1100,6 @@ Voulez-vous vraiment fermer cette page?
         <source>Suggestions</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2204,37 +1120,6 @@ Voulez-vous vraiment fermer cette page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Erreur au chargement de la page: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2285,38 +1170,6 @@ Voulez-vous vraiment fermer cette page?
         <source>Search with...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/fr_FR.ts b/src/locale/fr_FR.ts
index 4a322ab6..02797a23 100644
--- a/src/locale/fr_FR.ts
+++ b/src/locale/fr_FR.ts
@@ -11,146 +11,10 @@
         <source>License</source>
         <translation>Licence</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Navigateur web léger basé sur WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Fermer</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>À propos de %1</translation>
     </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>WebKit version %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Langues</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Langues dans l&apos;ordre de préférence :</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Mo&amp;nter</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Des&amp;cendre</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>Sup&amp;primer</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Ajouter...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>Bloqué par la règle AdBlock: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Ajouter une règle personnalisée</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>En savoir plus sur l&apos;écriture de règles...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Mettre à jour l&apos;abonnement</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Parcourir les abonnements...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Supprimer un abonnement</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>Configuration d&apos;AdBlock</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>Activer AdBlock</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Action</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Règles personnalisées</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Règle</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>S&apos;abonner ?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Souscrire à cet abonnement AdBlock ?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -158,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Ajouter un marque-page</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Entrez un nom pour le marque-page et choisissez où le conserver.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>URL</translation>
@@ -175,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Ajouter un dossier</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Mots de passe</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Supprimer</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Supprimer tout</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Voulez-vous sauvegarder ce mot de passe ?&lt;/b&gt;&lt;br&gt;         Pour voir les mots de passe que vous avez sauvegardé et en supprimer, ouvrez le panneau Complétion automatique dans les préférences.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Jamais pour ce site</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Pas maintenant</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Site web</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Nom d&apos;utilisateur</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -234,18 +49,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nouveau dossier</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Marque-pages</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>Supp&amp;rimer</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Ajouter un dossier</translation>
-    </message>
     <message>
         <source>Open in New Tab</source>
         <translation>Ouvrir dans un nouvel onglet</translation>
@@ -337,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>L&apos;outil htmlToXBel est requis</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>L&apos;outil htmlToXBel, fourni avec Arora et nécessaire à l&apos;importation de marque-pages HTML, n&apos;est pas installé ou non disponible dans les chemins de recherche.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Charger des marque-pages</translation>
@@ -351,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Erreur lors du chargement des marque-pages HTML:%1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -392,10 +195,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Ajouter un dossier...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Marque-pages</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -410,12 +209,8 @@ Voulez-vous tout de même quitter?</translation>
         <translation>Échec de la restauration</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">La session enregistrée ne sera pas restaurée car Arora s&apos;est anormalement arrêté lors de la précedente tentative de restauration.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora s&apos;est planté lors de la restauration de la session.  Voulez-vous réessayer ?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -448,14 +243,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Exporter les marque-pages...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Ape&amp;rçu avant impression...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>Im&amp;pression...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Navi&amp;gation privée...</translation>
@@ -569,10 +356,6 @@ Voulez-vous tout de même quitter?</translation>
         <comment>Web Search</comment>
         <translation>Ctrl+K</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Activer l&apos;&amp;inspecteur Web</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aide</translation>
@@ -601,11 +384,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>Hide Toolbar</source>
         <translation>Masquer la barre d&apos;outils</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Ouvrir un fichier Web</translation>
@@ -614,10 +392,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Fichier Web (*.html *.htm *.svg *.png *.gif *.svgz);;Tous les fichiers (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Imprimer le document</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Êtes-vous sûr de vouloir activer la navigation privée?</translation>
@@ -626,15 +400,6 @@ Voulez-vous tout de même quitter?</translation>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Êtes-vous sûr de vouloir fermer cette fenêtre ? Il y a %1 onglets ouverts</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Inspecteur Web</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>L&apos;inspecteur Web ne fonctionne que pour les pages qui ont été chargées après son activation.  Voulez-vous recharcher toutes les pages ?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Arrêter le chargement de la page en cours</translation>
@@ -676,10 +441,6 @@ Do you want to reload all pages?</source>
         <source>Find Nex&amp;t</source>
         <translation>&amp;Poursuivre la recherche</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Préféren&amp;ces...</translation>
-    </message>
     <message>
         <source>Show Menu Bar</source>
         <translation>Afficher la barre de menus</translation>
@@ -742,10 +503,6 @@ Do you want to reload all pages?</source>
         <source>Alt+Ctrl+B</source>
         <translation>Alt+Ctrl+B</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; No new network cache is written to disk.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Lorsque la navigation privée est activé, certaines actions qui concernent votre vie privée seront désactivés:&lt;ul&gt;&lt;li&gt; Les sites consultés ne seront pas ajoutés à l&apos;historique.&lt;/li&gt;&lt;li&gt; Les téléchargements seront automatiquement supprimés de la fenêtre des téléchargements.&lt;/li&gt;&lt;li&gt; Les nouveaux cookies ne seront pas stockés, les cookies actuels ne peuvent pas être accédés.&lt;/li&gt;&lt;li&gt; Les icônes des sites web ne seront pas stockés, la session ne sera pas sauvegardé.&lt;/li&gt;&lt;li&gt; Les recherches effectuées ne seront pas ajoutés aux recherches récentes.&lt;/li&gt;&lt;li&gt;Le cache sera désactivé.&lt;/li&gt;&lt;/ul&gt;Vous pourrez toujours utiliser les boutons Précédent et Suivant pour naviguer dans les pages que vous avez ouvert, jusqu&apos;à ce que vous fermiez la fenêtre.</translation>
-    </message>
     <message>
         <source>Options...</source>
         <translation>Options...</translation>
@@ -754,10 +511,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation>Configurer les moteurs de recherche...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;AdBlock...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Lorsque la navigation privée est activée, certaines actions concernant votre vie privée seront désactivées:</translation>
@@ -770,10 +523,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Les téléchargements sont automatiquement supprimés du gestionnaire de téléchargement.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Aucun nouveau cookie n&apos;est stocké, les cookies actuels ne sont pas accessibles.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Les icônes des sites web ne sont pas stockées.</translation>
@@ -814,6 +563,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -844,10 +606,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>Historique de &amp;Recherche</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>&amp;Icônes de sites web</translation>
@@ -860,379 +618,178 @@ Do you want to reload all pages?</source>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuler</translation>
     </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>C&amp;ache Web</translation>
-    </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation>Charger</translation>
+        <source>Downloads</source>
+        <translation>Téléchargements</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>Tout charger</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Ajouter %1 à la liste blanche</translation>
+        <source>Save File</source>
+        <translation>Enregistrer le fichier</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>Supprimer de la liste blanche</translation>
+        <source>Download canceled: %1</source>
+        <translation>Téléchargement annulé: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Paramètres</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Erreur à l&apos;enregistrement: %1</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Charger Flash</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Erreur réseau: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Sites en liste blanche</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Site Web</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Erreur à l&apos;ouverture du fichier:&#x202f;&#x202f; %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Permettre</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 de %2 (%3/sec) - %4</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Bloquer</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Le dossier de téléchargement (%1) n&apos;a pas pu être créé.</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Permettre pour la session</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Règle</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Site Web</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Nom</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Chemin d&apos;accès</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Sécurisé</translation>
+        <source>bytes</source>
+        <translation type="obsolete">octets</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Expire</translation>
+        <source>kB</source>
+        <translation type="obsolete">ko</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Contenu</translation>
+        <source>MB</source>
+        <translation type="obsolete">Mo</translation>
     </message>
-    <message>
-        <source>true</source>
-        <translation>vrai</translation>
+</context>
+<context>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n téléchargement</numerusform>
+            <numerusform>%n téléchargements</numerusform>
+        </translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>faux</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Il y a %1 téléchargements en cours
+Voulez-vous tout de même quitter?</translation>
     </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>Cookie de session</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n minute restante</numerusform>
+            <numerusform>%n minutes restantes</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n seconde restante</numerusform>
+            <numerusform>%n secondes restantes</numerusform>
+        </translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
+        <source>bytes</source>
+        <translation>octets</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Effacer</translation>
+        <source>kB</source>
+        <translation>ko</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Effacer &amp;Tous les Cookies</translation>
+        <source>MB</source>
+        <translation>Mo</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>Ajouter une &amp;règle</translation>
+        <source>GB</source>
+        <translation>Go</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
+    <name>HistoryDialog</name>
     <message>
-        <source>Cookie Exceptions</source>
-        <translation>Exceptions pour les cookies</translation>
+        <source>Open</source>
+        <translation>Ouvrir</translation>
     </message>
     <message>
-        <source>New Exception</source>
-        <translation>Nouvelle exception</translation>
+        <source>Copy</source>
+        <translation>Copier</translation>
     </message>
     <message>
-        <source>Domain:</source>
-        <translation>Domaine:</translation>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Block</source>
-        <translation>Bloquer</translation>
+        <source>Show All History</source>
+        <translation>Montrer tout l&apos;historique</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Permettre pour la session</translation>
+        <source>Clear History</source>
+        <translation>Effacer l&apos;historique</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Permettre</translation>
+        <source>Clear History...</source>
+        <translation>Effacer l&apos;historique...</translation>
     </message>
     <message>
-        <source>Exceptions</source>
-        <translation>Exceptions</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Voulez vous effacer l&apos;historique?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Supp&amp;rimer</translation>
+        <source>Title</source>
+        <translation>Titre</translation>
     </message>
     <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;Tout supprimer</translation>
+        <source>Address</source>
+        <translation>Adresse</translation>
     </message>
 </context>
 <context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Téléchargements</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Vider la liste</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 téléchargements</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Nom de fichier</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Essayer à nouveau</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Interrompre</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Ouvrir</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Enregistrer le fichier</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Téléchargement annulé: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Erreur à l&apos;enregistrement: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Erreur réseau: %1</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 de %2 - Interrompu</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Erreur à l&apos;ouverture du fichier:&#x202f;&#x202f; %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 de %2 (%3/sec) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Le dossier de téléchargement (%1) n&apos;a pas pu être créé.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n téléchargement</numerusform>
-            <numerusform>%n téléchargements</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Il y a %1 téléchargements en cours
-Voulez-vous tout de même quitter?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minute restante</numerusform>
-            <numerusform>%n minutes restantes</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n seconde restante</numerusform>
-            <numerusform>%n secondes restantes</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>octets</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>ko</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>Mo</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>Go</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Pas d&apos;erreurs</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Erreur lors de l&apos;ouverture de %1: le fichier ou répertoire n&apos;existe pas</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Impossible de lire %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Contenu de %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 ko</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Ouvrir</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copier</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Supprimer</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Historique</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>Supp&amp;rimer</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;Tout supprimer</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Montrer tout l&apos;historique</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Effacer l&apos;historique</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Effacer l&apos;historique...</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Voulez vous effacer l&apos;historique?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Titre</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
+    <name>HistoryTreeModel</name>
     <message>
         <source>Earlier Today</source>
         <translation>Plus tôt aujourd&apos;hui</translation>
@@ -1246,29 +803,29 @@ Voulez-vous tout de même quitter?</translation>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translation>Bienvenue sur Arora!</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>Démarrage de Arora</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>Recherche!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>Résultats de recherche fournis par</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>A propos d&apos;Arora</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1282,58 +839,11 @@ Voulez-vous tout de même quitter?</translation>
         <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
         <translation>&lt;p&gt;Vous pouvez utiliser une langue différente de&lt;br&gt;celle du système d&apos;exploitation par défaut.&lt;/p&gt;&lt;p&gt;Veuillez choisir la langue à utiliser.&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Aucun fichier de traduction n&apos;est installé.</translation>
-    </message>
     <message>
         <source>No translation files are installed at %1.</source>
         <translation>Aucun fichier de traduction n&apos;est installé à %1.</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Entrez le nom d&apos;utilisateur et le mot de passe pour &quot;%1&quot; sur %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Se connecter au serveur mandataire &quot;%1&quot; en utilisant:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - Erreurs SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Erreurs SSL:&lt;br/&gt;&lt;br/&gt;pour: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Voulez-vous ignorer ces erreurs?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Certificats: &lt;br/&gt;%1&lt;br/&gt;Voulez-vous accepter ces certificats?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Émetteur: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Invalide avant: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Valide jusqu&apos;à: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Noms alternatifs:</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1356,26 +866,6 @@ Voulez-vous ignorer ces erreurs?&lt;/qt&gt;</translation>
         <source>You must have at least one search engine in here.</source>
         <translation>Vous devez avoir au moins un moteur de recherche ici.</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Gestionnaire OpenSearch</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Réglages par défaut</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>Supp&amp;rimer</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Ajouter</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Fermer</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1408,26 +898,18 @@ Voulez-vous ignorer ces erreurs?&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Authentification requise</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation></translation>
-    </message>
+    <name>PermissionBar</name>
     <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Permettre</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>Nom d&apos;utilisateur:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Mot de passe:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1437,25 +919,6 @@ Voulez-vous ignorer ces erreurs?&lt;/qt&gt;</translation>
         <translation>Aucun résultat</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Authentification du serveur mandataire</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Connexion au serveur mandataire</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nom d&apos;utilisateur:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Mot de passe:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1470,398 +933,47 @@ Voulez-vous ignorer ces erreurs?&lt;/qt&gt;</translation>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>Ce fichier n&apos;est pas un fichier OpenSearch 1.1.</translation>
     </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Done</source>
-        <translation>Fermer</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Surligner tous</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
     <message>
-        <source>Search</source>
-        <translation>Rechercher</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Utiliser la page en cours</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Retirer les éléments de l&apos;historique:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Après une journée</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Après une semaine</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Après deux semaines</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Après un mois</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Après un an</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Manuellement</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Ouvrir les liens provenant d&apos;applications:</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>Dans une nouvelle fenêtre</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Apparence</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Police par défaut:</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Sélectionner...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Police à espacement constant:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Vie privée</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Contenu Web</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Activer les Plugins</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Activer le Javascript</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Accepter les cookies:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Toujours</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Jamais</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Seulement des sites que vous visitez</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Exceptions...</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Lorsqu&apos;ils expirent</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Lorsque je quitte l&apos;application</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Au plus tard dans 90 jours</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Type:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Nom d&apos;utilisateur:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Mot de passe:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avancé</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Feuille de style:</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Téléchargements</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Demander le dossier de destination à chaque fois</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Utiliser ce dossier:</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Au démarrage:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Afficher ma page d&apos;accueil</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Afficher une page blanche</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Restaurer les fenêtres et les onglets de la session précédente</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>A la sortie de l&apos;application</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Onglets</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Sélectionner les onglets et les fenêtres comme ils ont été créés</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation>Préférences</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Page d&apos;accueil:</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Afficher les images</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Garder les cookies jusqu&apos;à :</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Afficher uniquement un bouton de fermeture à la place d&apos;un sur chaque onglet</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>Utiliser le serveur proxy</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>Nom de l&apos;hôte:</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Langues préférées pour visualiser les pages web:</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Bloquer les fenêtres popup</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>Ouvrir les liens</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Liens voulant s&apos;ouvrir dans une nouvelle fenêtre:</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>Dans un nouvel onglet au premier plan dans la fenêtre courante</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>Dans un nouvel onglet en arrière-plan dans la fenêtre courante</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>Dans l&apos;onglet courant</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>Http (Sécurisé)</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (Transparent)</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Utiliser ClickToFlash pour les plugins flash</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Filtrer les cookies traceurs</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Demander confirmation lors de la fermeture de plusieurs onglets ou fenêtres</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Quitter l&apos;application quand le dernier onglet est fermé</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>Activer le cache réseau</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>Taille maximum :</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation> Mo</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Utiliser le moteur de recherche par défaut en secours quand l&apos;URL donnée par l&apos;utilisateur est invalide</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation>Choisir le répertoire...</translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation>Un cookie de session se termine:</translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation>Quand je ferme l&apos;application</translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation>Après 1 jour</translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation>Après 2 jours</translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation>Après 3 jours</translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation>Après 7 jours</translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation>Après 30 jours</translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation>Complétion automatique</translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation>Formulaires complétés automatiquement:</translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation>Noms d&apos;utilisateur et mots de passe</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation>Édition...</translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Parcourir...</translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
-        <translation>Redémarrage requis</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>La configuration du cache réseau a changée. Pour que ces changements soient pris en compte, le navigateur doit être redémarrer.</translation>
+        <source>Search</source>
+        <translation>Rechercher</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>Choisir le répertoire</translation>
@@ -1889,14 +1001,6 @@ Voulez-vous ignorer ces erreurs?&lt;/qt&gt;</translation>
         <source>&amp;Find</source>
         <translation>&amp;Rechercher</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Affichage</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">Retours à la ligne &amp;statiques</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>Source de la page %1</translation>
@@ -1955,18 +1059,6 @@ Voulez-vous ignorer ces erreurs?&lt;/qt&gt;</translation>
         <source>Recently Closed Tabs</source>
         <translation>Onglets récemment fermés</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Voulez-vous vraiment fermer cette page?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Vous avez modifié cette page et en fermant l&apos;onglet, vous allez perdre les modifications.
-Voulez-vous vraiment fermer cette page?
-</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation>Ctrl-]</translation>
@@ -1987,10 +1079,6 @@ Voulez-vous vraiment fermer cette page?
         <source>Loading...</source>
         <translation>Chargement...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Chargement à %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Terminé</translation>
@@ -2003,6 +1091,10 @@ Voulez-vous vraiment fermer cette page?
         <source>Bookmark All Tabs</source>
         <translation>Ajouter tous les onglets aux marque-pages</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2018,14 +1110,6 @@ Voulez-vous vraiment fermer cette page?
         <source>Suggestions</source>
         <translation>Suggestions</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Ajouter &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">Configurer les moteurs de recherche...</translation>
-    </message>
     <message>
         <source>Clear Recent Searches</source>
         <translation>Effacer les recherches récentes</translation>
@@ -2050,37 +1134,6 @@ Voulez-vous vraiment fermer cette page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Erreur au chargement de la page: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Durant la connection à: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Vérifiez que vous n&apos;avez pas commis d&apos;erreurs dans l&apos;adresse tel que &lt;b&gt;ww&lt;/b&gt;.arora-browser.org à la place de &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Si votre ordinateur ou votre réseau est protégé par un pare-feu ou un proxy, vérifiez que votre navigateur à le droit d&apos;accéder au réseau.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Si l&apos;adresse est correcte, vérifiez votre connexion au réseau.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Renvoi d&apos;une requête POST</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Afin d&apos;afficher le site, la requête ainsi que toutes les données doivent être réenvoyés, ce qui peut conduire à un comportement innatendu du site, par exemple la même action peut être exécuté une nouvelle fois. Continuer quand même ?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2131,38 +1184,6 @@ Voulez-vous vraiment fermer cette page?
         <source>Search with...</source>
         <translation>Chercher avec...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Ajouter à la barre de recherche</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Méthode non supportée</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>La méthode %1 n&apos;est pas supporté.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Moteur de recherche</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Choisir le moteur de recherche voulu</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Nom du moteur</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Insérer un nom pour le moteur</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Bloquer l&apos;image</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/he_IL.ts b/src/locale/he_IL.ts
index 1b2f4e92..af706121 100644
--- a/src/locale/he_IL.ts
+++ b/src/locale/he_IL.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="he_IL">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">אודות</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>כותבים</translation>
@@ -15,158 +11,10 @@
         <source>License</source>
         <translation>רישיון</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>דפדפן רשת קליל מבוסס WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body dir=&quot;RTL&quot; style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;כל הזכויות שמורות © 2007-2008 Aaron Dewes &amp;lt;‏&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>סגור</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>אודות %1</translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;כל הזכויות שמורות © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>גרסת WebKit: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;כל הזכויות שמורות © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>שפות</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>שפות: בסדר המועדף:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>&amp;מעלה</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>מ&amp;טה</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;הסר</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>הוסף...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>נחסם על ידי חוק: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>הוסף חוק מותאם אישית</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>מידע נודף אודות כתיבת חוקים...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>עדכן רישום</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>עדיין ברישומים...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>הסר רישום</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>תצורת AdBlock</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>אפשר AdBlock</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>פעולה</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>חוקים מותאמים אישית</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>חוק</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>רישום?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>האים להירשם לחוק AdBlock?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -174,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>הוסף סימנית</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>כתוב שם עבור הסימנית ובחר היכן לשמור אותה.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>כתובת</translation>
@@ -191,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>הוסף תיקייה</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>ססמאות של טפסים</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>הסר</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>הסר הכל</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;האם ברצונך לשמור את הססמה הזאת?&lt;b&gt;&lt;br&gt; לעיון בססמאות השמורות, ובכדי למחוק אותן, אנא פתח את חלון ההגדרות בלשונית המילוי האוטומטי.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>לעולם לא עבור אתר זה</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>לא כעת</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>אתר</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>שם משתמש</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -254,18 +53,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>תיקייה חדשה</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>סימניות</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>ה&amp;סר</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>הוסף תיקייה</translation>
-    </message>
     <message>
         <source>Edit Name</source>
         <translation>ערוך שם</translation>
@@ -295,10 +82,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>פתח קובץ</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>הייבוא של %1 הסתיים</translation>
@@ -327,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>ייבוא של סימניות</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">שנה שם</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">שנה כתובת</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation>סרגל סימניות</translation>
@@ -365,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>נדרש הכלי htmlToXBell </translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>הכלי htmlToXBel המופץ עם הדפדפן Arora נדרש בכדי לייבא סימניות HTML, ונראה כי הוא לא מותקן או לא זמין בנתיב החיפוש PATH.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>טוען סימנייה</translation>
@@ -378,6 +149,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation>שגיאה בעת טעינת סימניות: %1</translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -399,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">סימניות</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>פתח</translation>
@@ -423,17 +194,9 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>הוסף תיקייה...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">סימניות</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete">(שינוי %1 %2)</translation>
-    </message>
     <message>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
@@ -445,12 +208,8 @@ Do you want to quit anyway?</source>
         <translation>השחזרור נכשל</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">אין אפשרות לשחזר את ההפעלה השמורה כיוון ש־Arora קרס בזמן השיחזור של ההפעלה.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>היישום קרס בעת ניסיון השחזור של ההפעלה. האם לנסות שוב?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -483,14 +242,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>יי&amp;צא סימניות...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>ת&amp;צוגת הדפסה...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;הדפס...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>&amp;גלישה מאובטחת...</translation>
@@ -535,10 +286,6 @@ Do you want to quit anyway?</source>
         <source>Find P&amp;revious</source>
         <translation>חפש &amp;קודם</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">&amp;הגדרות...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+, ‎</translation>
@@ -555,10 +302,6 @@ Do you want to quit anyway?</source>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -571,18 +314,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Reload Page</source>
         <translation>&amp;רענן עמוד</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">&amp;הגדל גופן</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">גופן &amp;רגיל</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">ה&amp;קטן גופן</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>&amp;הצג מקור המסמך</translation>
@@ -619,10 +350,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Bookmarks</source>
         <translation>&amp;סימניות</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">ניהול סימניות...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>הוסף סימנייה...</translation>
@@ -653,10 +380,6 @@ Do you want to quit anyway?</source>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>&amp;אפשר סורק רשת</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;עזרה</translation>
@@ -665,10 +388,6 @@ Do you want to quit anyway?</source>
         <source>About &amp;Qt</source>
         <translation>&amp;אודות Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">א&amp;ודות Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>ניווט</translation>
@@ -697,15 +416,6 @@ Do you want to quit anyway?</source>
         <source>Hide Bookmarks Bar</source>
         <translation>הסתר סרגל סימניות</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>‏Arora‏ - %1</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>פתח משאב רשת</translation>
@@ -714,37 +424,14 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>משאב רשת (*.html *.htm *.svg *.png *.gif *.svgz);; כל הקבצים (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>הדפס מסמך</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>האם באמת ברצונך להפעיל גלישה מאובטחת?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;span dir=&quot;rtl&quot;&gt;&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;כאשר מופעלת גלישה מאובטחת כמה פעולות הקשורות לפרטיות שלך לא יופעלו:&lt;ul dir=&quot;rtl&quot;&gt;&lt;li&gt; דפים לא נוספים להסטוריית הגלישה.&lt;/li&gt;&lt;li&gt; פריטים נמחקים באופן אוטומטי מרשימת ההורדות.&lt;/li&gt;&lt;li&gt; עוגיות חדשות לא נשמרות ואין אפשרות לגשת לעוגיות ישנות.&lt;/li&gt;&lt;li&gt; סמלים של אתרים לא נשמרים וההפעלה לא תישמר.&lt;/li&gt;&lt;li&gt; חיפושים לא מתווספים לתפריט המוקפץ של היסטוריית החיפוש.&lt;/li&gt;&lt;/ul&gt;עד שתסגור את החלון, באפשרותך ללחוץ על כפתורי הניווט &quot;קדימה&quot; ו־&quot;אחורה&quot; לחזרה לעמודים שביקרת בהם.
-&lt;/span&gt;</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>האם אתה באמת ברצונך לסגור את החלון? ישנן %1 כרטיסיות פתוחות</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">קוד המקור של %1</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>סורק רשת</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>סורק הרשת יעבוד נכון רק עבור דפים שנטענו אחרי ההפעלה שלו.
-האם ברצונך לרענן את כל הדפים?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>עצור את טעינת הדף הנוכחי</translation>
@@ -757,11 +444,6 @@ Do you want to reload all pages?</source>
         <source>Downloads</source>
         <translation>הורדות</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
     <message>
         <source>Switch application language </source>
         <translation>שנה את שפת היישום</translation>
@@ -832,10 +514,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>פריטים מוסרים באופן אוטומטי מחלון ההורדות.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>עוגיות חדשות לא נשמרות, אין אפשרות לגשת אל עוגיות נוכחיות.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>סמלים של אתרים לא נשמרים.</translation>
@@ -868,10 +546,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation>הגדרת מנועי חיפוש...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;חסימת פרסומות - AdBlock</translation>
-    </message>
     <message>
         <source>User Agent</source>
         <translation type="unfinished"></translation>
@@ -888,6 +562,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -918,14 +605,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>הסיטוריית &amp;חיפוש</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;עוגיות</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>דפי אינטרנט ב&amp;מטמון</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>סמלים של &amp;אתרים</translation>
@@ -940,297 +619,97 @@ Do you want to reload all pages?</source>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation>טען</translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation>טען הכל</translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>הוסף %1 לרשימה הלבנה</translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation>הסר מהרשימה הלבנה</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>הגדרות</translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load Flash</source>
-        <translation>טען פלאש</translation>
+        <source>Downloads</source>
+        <translation>הורדות</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>אתרים ברשימה לבנה</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CookieExceptionsModel</name>
-    <message>
-        <source>Website</source>
-        <translation>אתר אינטרנט</translation>
-    </message>
-    <message>
-        <source>Rule</source>
-        <translation>חוק</translation>
-    </message>
+    <name>DownloadItem</name>
     <message>
-        <source>Allow</source>
-        <translation>אפשר</translation>
+        <source>Save File</source>
+        <translation>שמור קובץ</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>חסום</translation>
+        <source>Download canceled: %1</source>
+        <translation>ההורדה הופסקה: %1</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>אפשר להפעלה נוכחית</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">ארעה שגיאה בעת פתיחת קובץ הפלט: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>כתובת</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">ארעה שגיאה בעת השמירה: %1</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>שם</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">ארעה שגיאות רשת: %1</translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>נתיב</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>מאובטח</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 מתוך %2 (%3/שנייה) - %4</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>תאריך תפוגה</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">אין אפשרות ליצור את תיקיית ההורדה (%1).</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>תוכן</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>true</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>false</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation>עוגיית ההפעלה</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>עוגיות</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;מחק</translation>
+        <source>bytes</source>
+        <translation type="obsolete">בתים</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>מחק את &amp;כל העוגיות</translation>
+        <source>kB</source>
+        <translation type="obsolete">ק&quot;ב</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>הוסף &amp;חוק</translation>
+        <source>MB</source>
+        <translation type="obsolete">מ&quot;ב</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>עוגיות יוצאות מן הכלל</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>יוצא מן הכלל חדש</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>מתחם:</translation>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>הורדה אחת</numerusform>
+            <numerusform>%n הורדות</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>בלוק</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>אפשר להפעלה הנוכחית</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>אפשר</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>יוצרים מן הכלל</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>ה&amp;סר</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;הסר הכל</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>הורדות</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>נקה</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 פריטים</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;אישור</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">ממקום</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>שם קובץ</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>נסה שוב</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>עצור</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>פתח</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>שמור קובץ</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>ההורדה הופסקה: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>ארעה שגיאה בעת פתיחת קובץ הפלט: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>ארעה שגיאה בעת השמירה: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>ארעה שגיאות רשת: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">שניות</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>נשארו עוד %n שניות</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>נשארו עוד %n דקות</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 מתוך %2 (%3 קס&quot;ש) %2</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 מתוך %2 - נעצר</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">בתים</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">ק&quot;ב</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">מ&quot;ב</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 מתוך %2 (%3/שנייה) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>אין אפשרות ליצור את תיקיית ההורדה (%1).</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>הורדה אחת</numerusform>
-            <numerusform>%n הורדות</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>ישנן %1 הודרות פעילות.
-האם לצאת בכל זאת?</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>ישנן %1 הודרות פעילות.
+האם לצאת בכל זאת?</translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
@@ -1263,33 +742,6 @@ Do you want to quit anyway?</source>
         <translation>ג&quot;ב</translation>
     </message>
 </context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>אין שגיאה</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>ארעה שגיאה בעת הפתיחה: %1 : אין קובץ או ספרייה</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>אין אפשרות לקרוא את %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>התוכן של %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 ק&quot;ב</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>HistoryDialog</name>
     <message>
@@ -1304,18 +756,6 @@ Do you want to quit anyway?</source>
         <source>Delete</source>
         <translation>מחק</translation>
     </message>
-    <message>
-        <source>History</source>
-        <translation>היסטוריה</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>ה&amp;סר</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;הסר הכל</translation>
-    </message>
 </context>
 <context>
     <name>HistoryMenu</name>
@@ -1362,32 +802,29 @@ Do you want to quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translatorcomment>Please put RLE in the beginning of the translation and RLM+PDF at the end. The PushDirectionFlag is needed because of the Right(to)LftEmbeding at the beginning, and the Right(to)Leftmark is needed, to put the ! and the right of the arora name.
-
-Don&apos;t ask why next time, ok? :)</translatorcomment>
-        <translation>‫ברוך בואך אל Arora!‏‬</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>דף ההפעלה של Arora</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>חפש!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>תוצאות החיפוש מסופקות על ידי</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>אודות Arora</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1406,73 +843,6 @@ Don&apos;t ask why next time, ok? :)</translatorcomment>
         <translation>לא מותקנים קבצי תרגום בתיקיות %1.</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;הכנס את שם המשתמש והססמה עבור &quot;%1&quot; באתר %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;מתחבר לשרת מתווך &quot;%1&quot; באמצעות:&lt;qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">שגיאות SSL:&lt;div dir=&quot;ltr&quot;&gt;%1
-%2
-&lt;/div&gt;
-האם ברצונך להתעלם מהשגיאות הללו?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">האם ברצונך לקבל את האישורים הללו?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - שגיאות SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;שגיאות SSL:&lt;br/&gt;&lt;br/&gt; עבור: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-האם ברצונך להתעלם מהשגיאות הללו?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;תעודות:&lt;br/&gt;%1&lt;br/&gt;האם ברצונך לקבל את כל התעודות הללו?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>מנפיק: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>לא תקין לפני: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>תקין עד: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>שמות נוספים:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">שם</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1495,26 +865,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>You must have at least one search engine in here.</source>
         <translation>חייב להכיל לפחות מנוע חיפוש אחד.</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>מנהל OpenSearch</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;שחזר ברירות מחדל</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;מחק</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;הוסף</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;סגור</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1547,26 +897,18 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
+    <name>PermissionBar</name>
     <message>
-        <source>Authentication Required</source>
-        <translation>נדרש אימות</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
+        <source>Allow</source>
+        <translation type="unfinished">אפשר</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>שם משתמש:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>ססמה:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1576,29 +918,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <translation>לא נמצא</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>אימות שאת מתווך</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>התחבר לשרת מתווך</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>שם משתמש:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>ססמה:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1613,441 +932,47 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>הקובץ הוא לא קובץ של OpenSearch 1.1.</translation>
     </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">כתובת</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">מאת</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>סיים</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>סמן הכל</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
     <message>
-        <source>Search</source>
-        <translation>חפש</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>הגדרות</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>כללי</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>בהפעלה:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>הצג את דף הבית שלי</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>הצג דף ריק</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>שחזר חלונות וכרטיסיות מהפעם הקודמת</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>דף הבית:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>קבע לעמוד הנוכחי</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>הסר פריטי היסטוריה:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>אחרי יום אחד</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>אחרי שבוע אחד</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>אחרי שבועיים</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>אחרי חודש</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>אחרי שנה</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>ידנית</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>בעת היציאה מהיישום</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>פתח קישורים מהיישומים:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">בכרטיסייה בחלון הנוכחי</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>בחלון הנוכחי</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>הורדות</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>שאל היכן לשמור בכל פעם</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>השתמש במקום הבא:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>מראה</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>גופן ברירת־מחדל:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>בחר...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>גופן רוחב קבוע:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>פרטיות</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>תוכן</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>אפשר תוספים</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>אפשר JavaScript</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>הצג תמונות</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>עוגיות</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>אפשר עוגיות:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>תמיד</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>אך פעם</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>רק מאתרים שאתה גולש בהם</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>יוצאים מן הכלל...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>שמור עוגיות עד:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>שהן פגות</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>אני יוצא מהיישום</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>עד 90 יום</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>עוגיות...</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>כרטיסיות</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>בחר כרטיסיות כשהן נוצרות</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">וודא יציאה כאשר מספר כרטיסיות פתוחות</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>שרת מתווך</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>השתמש בשרת מתווך</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>סוג:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>שם משתמש:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>יציאה:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>שם משתמש:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>ססמה:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>מתקדם</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>גיליון סגנון:</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>הצג רק כפתור סגירה אחד, במקום בכל כרטיסייה</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>שפות מועדפות לתצוגת דפים:</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>חסום חלונות קופצים</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>פתיחת קישורים</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>קישורים שרוצים להיפתח בחלון חדש:</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>בכרטיסייה חדשה בעלת פוקוס</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>בכרטיסייה חדשה בחלון הנוכחי</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>בכרטיסייה הנוכחית</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>Http (מאובטח)</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (שקוף)</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>השתמש בתוסף ClickToFlash עבור תוספי פלאש</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>מסנן עוגיות מעקב</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>אשר בעת סגירה כאשר יש מספר כרטיסיות או חלונות</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>סגור את היישום כאשר הלשונית האחרונה נסגרת</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>אפשר מטמון רשת</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>גודל מירבי:</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation>מ&quot;ב</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>השתמש במנוע החיפוש כאשר הכתובת המתקבלת על ידי המשתמש אינה תקינה</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation>בחר ספרייה...</translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation>עוגייה ההפעלה מסתיימת:</translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation>כאשר אני יוצא מהיישום</translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation>יום אחד</translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation>שני ימים</translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation>שלושה ימים</translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation>שבעה ימים</translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation>30 יום</translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation>מילוי אוטומטי</translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation>מילוי אוטומטי של טפסים:</translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation>שמות משתמשים וססמאות</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation>עריכה...</translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation>עיון...</translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
-        <translation>נדרשת הפעלה מחדש</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>הגדרות מטמון הרשת שונו. בכדי שיכנסו לתוקף יש להפעיל מחדש את הדפדפן.</translation>
+        <source>Search</source>
+        <translation>חפש</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>בחר ספרייה</translation>
@@ -2076,10 +1001,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation>&amp;חפש</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;תצוגה</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>קוד מקור של דף %1</translation>
@@ -2095,10 +1016,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Hide Tab Bar</source>
         <translation>הסתר כותרת כרטיסיות</translation>
     </message>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">כרטיסייה &amp;חדשה</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>שכפל כרטיסייה</translation>
@@ -2146,17 +1063,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Untitled</source>
         <translation>ללא שם</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>האם באמת ברצונך לסגור את העמוד הזה?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>אתה שינית את העמוד הזה וכאשר תסגור אותו אתה עללו לאבד מידע.
-האם לסגור את העמוד בכל זאת?</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation>Ctrl-]</translation>
@@ -2173,10 +1079,6 @@ Do you really want to close this page?
         <source>Loading...</source>
         <translation>טוען...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>טוען %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>הטעינה הסתיימה</translation>
@@ -2189,6 +1091,10 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation>שמור את כל הכרטיסיות בסימניות</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2208,14 +1114,6 @@ Do you really want to close this page?
         <source>Suggestions</source>
         <translation>המלצות</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>הוסף &quot;%1&quot;</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">הגדרת מנועי חיפוש...</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2236,37 +1134,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>ארעה שגיאה באת הטעינה של העמוד: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>בעת החיבור אל %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>בדוק האם הכתובת מכילה שגיאות בנוסחח &lt;b&gt;ww&lt;/b&gt;.arora-browse.org במקום &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>אם המחשב שלך או הרשת שלך מוגנת על ידי חומת או או שרת proxy, אנא וודא שהדפדפן מורה לגשת לרשת.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>אם הכתובת היא נכונה, אנא בדוק את חיבור הרשת.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>שולחת מחדש בקשת POST</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>בכדי להציג את האתר, הבקשה וכל המידע שאיתה חייב להישלח מחדש, דבר אשר יכול לגרום להתנהגויות לא צפויות באתר. למשל ייתכן והפעולה שניסית לעשות תתבצע שוב. האם ברצונך להמשיך בכל זאת?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2317,38 +1184,6 @@ Do you really want to close this page?
         <source>Search with...</source>
         <translation>חפש בעזרת...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>הוסף תסרגל החיפוש</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>לא סופקה שיטה</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>השיטה %1 לא נתמכת.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>מנוע חיפוש</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>בחר את מנוע החיפוש</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>שם המנוע</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>אנא הקלד את שם המנוע</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>חסום תמונה</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/hu_HU.ts b/src/locale/hu_HU.ts
index b2d52627..feee59e0 100644
--- a/src/locale/hu_HU.ts
+++ b/src/locale/hu_HU.ts
@@ -15,141 +15,6 @@
         <source>License</source>
         <translation>Licenc</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>WebKit-alapú böngésző</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Minden jog fenntartva © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Bezárás</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Minden jog fenntartva © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Nyelvek</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Nyelvek: prferencia szerint rendezve:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>&amp;Fel</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>&amp;Le</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Eltávolítás</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Hozzáadás...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished">Szabály</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -157,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Hozzáadás a könyvjelzőkhöz</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Adja meg a könyvjelző nevét és jelölje ki a helyét.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Hivatkozás</translation>
@@ -174,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Új könyvjelzőmappa</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished">Eltávolítás</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -241,18 +61,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Új könyvjelzőmappa</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Könyvjelzők</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Eltávolítás</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Új könyvjelzőmappa</translation>
-    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -282,16 +90,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Fájl megnyitása</translation>
     </message>
-    <message>
-        <source>XBEL</source>
-        <translation type="obsolete">XBEL</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Hiba a html könyvjelzők betöltése közben: %1
-</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>%1 importálva</translation>
@@ -304,10 +102,6 @@ p, li { white-space: pre-wrap; }
         <source>%1 Bookmarks.xbel</source>
         <translation>%1 Konyvjelzok.xbel</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">lupdate ../src/src.pro</translation>
-    </message>
     <message>
         <source>Export error</source>
         <translation>Hiba az exportálás közben</translation>
@@ -346,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>htmlToXBel eszköz szükséges</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>A HTML könyvjelzők importálására szolgáló, az Arora részeként szállított htmlToXBel eszköz nincs telepítve, vagy nem érhető el a keresési útvonalon.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Könyvjelző betöltése</translation>
@@ -360,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Hiba a HTML könyvjelzők betöltése közben: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -381,10 +175,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Könyvjelző</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Megnyitás</translation>
@@ -405,17 +195,9 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Könyvjelzőmappa hozzáadása...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Könyvjelzők</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete"> (Verzió: %1 %2)</translation>
-    </message>
     <message>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
@@ -427,11 +209,7 @@ Biztosan ki akar lépni?</translation>
         <translation>A visszaállítás sikertelen</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Az elmentett munkamenet nem kerül visszaállításra, mert az Arora összeomlott a művelet közben.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -465,14 +243,6 @@ Biztosan ki akar lépni?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>Könyvjelzők &amp;exportálása...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Ny&amp;omtatás előnézete...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Nyomtatás...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>&amp;Privát böngészés...</translation>
@@ -521,10 +291,6 @@ Biztosan ki akar lépni?</translation>
         <source>Find P&amp;revious</source>
         <translation>E&amp;lőző keresése</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">&amp;Beállítások...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -537,10 +303,6 @@ Biztosan ki akar lépni?</translation>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -647,14 +409,6 @@ Biztosan ki akar lépni?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">&amp;Hálózatfigyelő megjelenítése</translation>
-    </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Webfelügyelő &amp;engedélyezése</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Súgó</translation>
@@ -700,11 +454,6 @@ Biztosan ki akar lépni?</translation>
         <source>Hide Bookmarks Bar</source>
         <translation>Könyvjelző eszköztár elrejtése</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Webes tartalom megnyitása</translation>
@@ -713,32 +462,14 @@ Biztosan ki akar lépni?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Webes tartalom (*.html *.htm *.svg *.png *.gif *.svgz);;Minden fájl (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Dokumentum nyomtatása</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Biztosan be akarja kapcsolni a privát böngészést?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ha a privát böngészés be van kapcsolva, akkor néhány személyes adatokat érintő művelet tiltásra kerül:&lt;ul&gt;&lt;li&gt; A meglátogatott oldalak nem kerülnek hozzáadásra az előzményekhez.&lt;/li&gt;&lt;li&gt; Az új elemek automatikusan eltávolításra kerülnek a letöltések listájáról.&lt;/li&gt;&lt;li&gt; Az új sütik nem kerülnek eltárolásra, a korábban tárolt sütik pedig nem érhetőek el.&lt;/li&gt;&lt;li&gt; Az oldalak ikonjai és a munkamenetek nem kerülnek mentésre.&lt;/li&gt;&lt;li&gt; A keresések nem kerülnek hozzáadásra a keresőmező listájához.&lt;/li&gt;&lt;/ul&gt;A böngészőablak bezárásáig a Vissza és Előre gombokkal navigálhatunk a megnyitott oldalak között.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Biztosan be akarja zárni az ablakot?  Jelenleg %1 lap van megnyitva</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Webfelügyelő</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>A webfelügyelő csak azokkal az oldalakkal fog rendeltetésszerűen működni, amelyek az aktiválása előtt kerültek megnyitásra.
-Újra akar tölteni minden oldalt?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Oldal letöltésének megszakítása</translation>
@@ -780,10 +511,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation type="unfinished">Keresőmotorok beállítása...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -796,10 +523,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -840,6 +563,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -870,14 +606,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>&amp;Keresési előzmények</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Sütik</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>Kapcs&amp;olat nélküli webhelyadatok</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Oldalak &amp;ikonjai</translation>
@@ -892,1079 +620,352 @@ Do you want to reload all pages?</source>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation>Betöltés</translation>
+        <source>Downloads</source>
+        <translation>Letöltések</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>Összes betöltése</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>%1 hozzáadása az engedélyezési listához</translation>
+        <source>Save File</source>
+        <translation>Fájl mentése</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>Eltávolítás az engedélyezési listáról</translation>
+        <source>Download canceled: %1</source>
+        <translation>Letöltés megszakítva: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Beállítások</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Hiba a kimeneti fájl megnyitásánál: %1</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Flash betöltése</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Hiba a mentésnél: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Engedélyezett oldalak</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Hálózati hiba: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Oldal</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 / %2 (%3/mp) - %4</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Szabály</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Engedélyezés</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Tiltás</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Engedélyezés a munkamenetre</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Oldal</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Név</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Útvonal</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bájt</translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Biztonságos</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Lejárat</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
+</context>
+<context>
+    <name>DownloadManager</name>
     <message>
-        <source>Contents</source>
-        <translation>Tartalmak</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Jelenleg %1 letöltés van folyamatban.
+Biztosan ki akar lépni?</translation>
     </message>
-    <message>
-        <source>true</source>
-        <translation>igen</translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n letöltés</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>false</source>
-        <translation>nem</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n perc van hátra</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>Ideiglenes süti</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n másodperc van hátra</numerusform>
+        </translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Sütik</translation>
+        <source>bytes</source>
+        <translation>bájt</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Eltávolítás</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>&amp;Összes süti eltávolítása</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>&amp;Szabály hozzáadása</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
+    <name>HistoryDialog</name>
     <message>
-        <source>Cookie Exceptions</source>
-        <translation>Süti kivételek</translation>
+        <source>Open</source>
+        <translation>Megnyitás</translation>
     </message>
     <message>
-        <source>New Exception</source>
-        <translation>Új kivétel</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Domain:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Tiltás</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Engedélyezés a munkamenetre</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Engedélyezés</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Kivételek</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Eltávolítás</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;Összes eltávolítása</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Letöltések</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Lista törlése</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 elem</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Letöltés</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Fájlnév</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Újra</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Állj</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Megnyitás</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Fájl mentése</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Letöltés megszakítva: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Hiba a kimeneti fájl megnyitásánál: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Hiba a mentésnél: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Hálózati hiba: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 / %2 (%3/mp) - %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 / %2 - Megállítva</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Jelenleg %1 letöltés van folyamatban.
-Biztosan ki akar lépni?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n letöltés</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n perc van hátra</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n másodperc van hátra</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bájt</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Megnyitás</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Másolás</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Törlése</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Előzmények</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Eltávolítás</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;Összes eltávolítása</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Összes előzmény megjelenítése</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Előzmények törlése...</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Előzmények törlése</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Törölni akarja az előzményeket?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Cím</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Hivatkozás</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Korábban a mai napon</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n elem</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Nincs telepített fordítási fájl.</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Nyelv kiválasztása</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;b&gt;Az operációs rendszer alapértelmezett nyelvén kívül választható további nyelv is.&lt;/p&gt;&lt;p&gt;Válassza ki a használni kívánt nyelvet!&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Adja meg &quot;%1&quot; felhasználónevét és jelszavát itt: %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Csatlakozás a(z) &quot;%1&quot; proxyhoz:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - SSL hibák</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL hibák:&lt;br/&gt;&lt;br/&gt; &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Figyelmen kívül akarja hagyni ezeket a hibákat?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Tanúsítványok:&lt;br/&gt;%1&lt;br/&gt;El akarja fogadni ezeket a tanúsítványokat?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Kibocsátó: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Nem érvényes ezelőtt: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Érvényes eddig: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Alternatív nevek:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Név</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Érték</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Hálózatfigyelő</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Hálózati kérések</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Kérés fejlécek</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Válasz fejlécek</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Eltávolítás</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">&amp;Összes kérés eltávolítása</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation>Fájl megnyitása</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation>Keresőmotorok</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Hiba</translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation>%1 nem érvényes OpenSearch 1.1 leírás, vagy már szerepel a listán.</translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation>Legalább egy keresőmotor szükséges.</translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Keresőmotorok kezelése</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Hozzáadás</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Törlés</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Alapértelmezések visszaállítása</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Bezárás</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation>&lt;strong&gt;Leírás:&lt;/strong&gt; %1</translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation>&lt;strong&gt;Javaslatokat szolgáltat&lt;/strong&gt;</translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Név</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation>Hozzá akarja adni ezt a keresőmotort a listához?&lt;br /&gt;&lt;br /&gt;Név: %1&lt;br /&gt;Keresés itt: %2</translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Azonosítás szükséges</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Felhasználónév:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Jelszó:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Nincs találat</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Proxy azonosítás</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Kapcsolódás a proxyhoz</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Felhasználónév:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Jelszó:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation>A fájl nem egy OpenSearch 1.1 fájl.</translation>
-    </message>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>A fájl nem egy XBEL 1.0 fájl.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Ismeretlen cím</translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Átirányítás: %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Típus</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Cím</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Válasz</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Hossz</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Tartalom típusa</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Információ</translation>
-    </message>
-    <message>
-        <source>Unknown</source>
-        <translation type="obsolete">Ismeretlen</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Keresés</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Bezárás</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Keresés</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Beállítások</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Általános</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Induláskor:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Kezdőlap megjelenítése</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Üres oldal megjelenítése</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Legutóbbi ablakok és lapok visszaállítása</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Kezdőlap:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Beállítás az aktuális oldalra</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Előzmények eltávolítása:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Egy nap után</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Egy hét után</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Két hét után</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Egy hónap után</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Egy év után</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Manuálisan</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Kilépéskor</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Letöltések</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Rákérdezés a letöltés helyére minden alkalommal</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Letöltések helyének megadása:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Megjelenés</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Általános betűtípus:</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Kiválasztás...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Rögzített szélességű betűtípus:</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Oldalak megtekintésekor előnyben részesített nyelvek:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Adatvédelem</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Webes tartalom</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Felugró ablakok blokkolása</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Bővítmények engedélyezése</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Flash tartalmak megjelenítése kattintásra</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Javascript engedélyezése</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Képek megjelenítése</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Sütik</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Sütik elfogadása:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Mindig</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Soha</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Csak a meglátogatott oldalakon</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Kivételek...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Sütik megtartása:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Lejáratig</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Kilépésig</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Legfeljebb 90 napig</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Sütik...</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Nyomkövető sütik szűrése</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Lapok</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Lapok és ablakok kiválasztása megnyitáskor</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Megerősítés kérése több lap vagy ablak bezárásakor</translation>
+        <source>Copy</source>
+        <translation>Másolás</translation>
     </message>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Csak egy bezárás gomb megjelenítése</translation>
+        <source>Delete</source>
+        <translation>Törlése</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Kilépés az alkalmazásból az utolsó lap bezárásakor</translation>
+        <source>Show All History</source>
+        <translation>Összes előzmény megjelenítése</translation>
     </message>
     <message>
-        <source>Opening links</source>
-        <translation>Hivatkozások megnyitása</translation>
+        <source>Clear History...</source>
+        <translation>Előzmények törlése...</translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Az új ablakban megnyitandó hivatkozások:</translation>
+        <source>Clear History</source>
+        <translation>Előzmények törlése</translation>
     </message>
     <message>
-        <source>In a new window</source>
-        <translation>Új ablakban</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Törölni akarja az előzményeket?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>Az aktuális ablakban, új aktív lapon</translation>
+        <source>Title</source>
+        <translation>Cím</translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>Az aktuális ablakban, új lapon</translation>
+        <source>Address</source>
+        <translation>Hivatkozás</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>In the current tab</source>
-        <translation>Az aktuális lapon</translation>
+        <source>Earlier Today</source>
+        <translation>Korábban a mai napon</translation>
     </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Külső hivatkozások megnyitása:</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n elem</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation>Proxy kiszolgáló használata</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Type:</source>
-        <translation>Típus:</translation>
+        <source>Search!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Secure)</source>
-        <translation>Http (biztonságos)</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (nem biztonságos)</translation>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Host name:</source>
-        <translation>Kiszolgáló:</translation>
+        <source>Choose language</source>
+        <translation>Nyelv kiválasztása</translation>
     </message>
     <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;b&gt;Az operációs rendszer alapértelmezett nyelvén kívül választható további nyelv is.&lt;/p&gt;&lt;p&gt;Válassza ki a használni kívánt nyelvet!&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>User Name:</source>
-        <translation>Felhasználónév:</translation>
+        <source>No translation files are installed at %1.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Password:</source>
-        <translation>Jelszó:</translation>
+        <source>Open File</source>
+        <translation>Fájl megnyitása</translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Haladó</translation>
+        <source>OpenSearch</source>
+        <translation>Keresőmotorok</translation>
     </message>
     <message>
-        <source>Style Sheet:</source>
-        <translation>Stíluslap:</translation>
+        <source>Error</source>
+        <translation>Hiba</translation>
     </message>
     <message>
-        <source>Enable network cache</source>
-        <translation>Hálózati gyorstár engedélyezése</translation>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
+        <translation>%1 nem érvényes OpenSearch 1.1 leírás, vagy már szerepel a listán.</translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
-        <translation>Maximális méret:</translation>
+        <source>You must have at least one search engine in here.</source>
+        <translation>Legalább egy keresőmotor szükséges.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source> MB</source>
-        <translation> MB</translation>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
+        <translation>&lt;strong&gt;Leírás:&lt;/strong&gt; %1</translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
+        <translation>&lt;strong&gt;Javaslatokat szolgáltat&lt;/strong&gt;</translation>
     </message>
     <message>
-        <source>Choose Directory...</source>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation type="unfinished">Név</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>1 day</source>
-        <translation type="unfinished"></translation>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
+        <translation>Hozzá akarja adni ezt a keresőmotort a listához?&lt;br /&gt;&lt;br /&gt;Név: %1&lt;br /&gt;Keresés itt: %2</translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>2 days</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Engedélyezés</translation>
     </message>
     <message>
-        <source>3 days</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7 days</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>30 days</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation>Nincs találat</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>AutoFill</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an OpenSearch 1.1 file.</source>
+        <translation>A fájl nem egy OpenSearch 1.1 fájl.</translation>
     </message>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>A fájl nem egy XBEL 1.0 fájl.</translation>
     </message>
     <message>
-        <source>User names and passwords</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>Ismeretlen cím</translation>
     </message>
     <message>
-        <source>Edit...</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Keresés</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation>Újraindítás szükséges</translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>A hálózati gyorstárazás beállításai megváltoztak. A módosítások használatához a böngésző újraindítása szükséges.</translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -1992,18 +993,6 @@ Figyelmen kívül akarja hagyni ezeket a hibákat?&lt;/qt&gt;</translation>
         <source>&amp;Find</source>
         <translation>&amp;Keresés</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Nézet</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">&amp;Sorok tördelése</translation>
-    </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Oldal forrása</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>%1 oldal forrása</translation>
@@ -2050,26 +1039,10 @@ Figyelmen kívül akarja hagyni ezeket a hibákat?&lt;/qt&gt;</translation>
         <source>Saved Tabs</source>
         <translation>Mentett lapok</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Biztosan be akarja zárni ezt az oldalt?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Az oldalon elvégzett módosítások bezáráskor elveszhetnek.
-Biztosan be akarja zárni ezt az oldalt?
-</translation>
-    </message>
     <message>
         <source>Loading...</source>
         <translation>Töltés...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Töltés %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>A letöltés befejeződött</translation>
@@ -2110,6 +1083,10 @@ Biztosan be akarja zárni ezt az oldalt?
         <source>Bookmark All Tabs</source>
         <translation>Összes lap felvétele a könyvjelzők közé</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2117,14 +1094,6 @@ Biztosan be akarja zárni ezt az oldalt?
         <source>Suggestions</source>
         <translation>Javaslatok</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; hozzáadása</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">Keresőmotorok beállítása...</translation>
-    </message>
     <message>
         <source>Clear Recent Searches</source>
         <translation>Keresési előzmények törlése</translation>
@@ -2157,37 +1126,6 @@ Biztosan be akarja zárni ezt az oldalt?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Hiba a következő oldal betöltésekor: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Kapcsolódás: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Nem vétett hibát a hivatkozás beírásakor? (pl. &quot;&lt;b&gt;ww&lt;/b&gt;.arora-browser.org&quot; a &quot;&lt;b&gt;www&lt;/b&gt;.arora-browser.org&quot; helyett)</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Amennyiben a hivatkozás helyes, próbálja ellenőrizni a hálózati kapcsolatot.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Ha a számítógép vagy a hálózat tűzfal, illetve proxy mögött van, a hálózat eléréséhez megfelelő hozzáférési jogosultság szükséges.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>POST kérés újraküldése</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Az oldal megjelenítéséhez az űrlapot minden adattal együtt újra el kell küldeni. A kétszer végrehajtott megegyező művelet az oldalon nem várt komplikációkkal járhat. Biztosan folytatni szeretné?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2238,38 +1176,6 @@ Biztosan be akarja zárni ezt az oldalt?
         <source>Loading...</source>
         <translation>Töltés...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Hozzáadás az eszköztár keresőmezőjéhez</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Az eljárás nem támogatott</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>%1 eljárás nem támogatott.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Keresőmotor</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Válassza ki a kívánt keresőmotort</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Motor neve</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Adjon meg egy nevet a motornak</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/it_IT.ts b/src/locale/it_IT.ts
index 2751bdf6..c6d5ec79 100644
--- a/src/locale/it_IT.ts
+++ b/src/locale/it_IT.ts
@@ -3,26 +3,6 @@
 <TS version="2.1" language="it_IT">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Informazioni</translation>
-    </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Browser web leggero basato su WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Autori</translation>
@@ -31,145 +11,10 @@ p, li { white-space: pre-wrap; }
         <source>License</source>
         <translation>Licenza</translation>
     </message>
-    <message>
-        <source>Close</source>
-        <translation>Chiudi</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>Informazioni su %1</translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>Versione di WebKit: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Lingue</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Lingue: in ordine di preferenza:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>&amp;Sposta in alto</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Sposta in &amp;basso</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Rimuovi</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Aggiungi...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished">Regola</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -177,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Aggiungi un segnalibro</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Scrivi il nome del segnalibro, e scegli dove metterlo.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation></translation>
@@ -194,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Aggiungi cartella</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished">Rimuovi</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -249,18 +49,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nuova cartella</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Segnalibri</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Rimuovi</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Aggiungi cartella</translation>
-    </message>
     <message>
         <source>Open in New Tab</source>
         <translation>Apri in una nuova scheda</translation>
@@ -294,10 +82,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Apri file</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>Importati %1</translation>
@@ -326,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Inserisci segnalibro</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Cambia il nome</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Cambia l&apos;indirizzo</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation>Barra dei segnalibri</translation>
@@ -342,16 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Bookmarks Menu</source>
         <translation>Menu Segnalibri</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Errore durante il caricamento di segnalibri html: %1
-</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -374,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>Strumento htmlToXBel richiesto</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>Lo strumento htmlToXBel, fornito con Arora e necessario a importare segnalibri HTML, non è installato o non è disponibile nei percorsi di ricerca.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Caricamento segnalibro</translation>
@@ -388,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Errore durante il caricamento dei segnalibri HTML: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -409,10 +175,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Segnalibro</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Apri</translation>
@@ -433,10 +195,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Aggiungi cartella...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="vanished">Segnalibri</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -451,19 +209,7 @@ Sei sicuro di voler uscire?</translation>
         <translation>Ripristino non riuscito</translation>
     </message>
     <message>
-        <source>The saved session will not being restored because last time it was restored Arora crashed.</source>
-        <translation type="obsolete">La sessione salvata non sarà ripristinata perché l&apos;ultima volta che è stata ripristinata Arora è andato in crash.</translation>
-    </message>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete">(Cambia: %1 %2)</translation>
-    </message>
-    <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="vanished">La sessione salvata non sarà ripristinata perché Arora si è chiuso in modo inatteso nel tentativo di ripristinarla.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -497,14 +243,6 @@ Sei sicuro di voler uscire?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Esporta i segnalibri...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>An&amp;teprima di stampa...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>Stam&amp;pa...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>&amp;Navigazione anonima...</translation>
@@ -541,18 +279,6 @@ Sei sicuro di voler uscire?</translation>
         <source>&amp;Find</source>
         <translation>Tro&amp;va</translation>
     </message>
-    <message>
-        <source>&amp;Find Next</source>
-        <translation type="obsolete">Tro&amp;va successivo</translation>
-    </message>
-    <message>
-        <source>&amp;Find Previous</source>
-        <translation type="obsolete">Tro&amp;va precedente</translation>
-    </message>
-    <message>
-        <source>&amp;Preferences</source>
-        <translation type="obsolete">&amp;Preferenze</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -561,10 +287,6 @@ Sei sicuro di voler uscire?</translation>
         <source>&amp;View</source>
         <translation>&amp;Visualizza</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
@@ -577,22 +299,6 @@ Sei sicuro di voler uscire?</translation>
         <source>&amp;Stop</source>
         <translation>&amp;Ferma</translation>
     </message>
-    <message>
-        <source>Reload Page</source>
-        <translation type="obsolete">Ricarica la pagina</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Bigger</source>
-        <translation type="obsolete">&amp;Ingrandisci il testo</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Normal</source>
-        <translation type="obsolete">&amp;Dimensione normale</translation>
-    </message>
-    <message>
-        <source>&amp;Make Text Smaller</source>
-        <translation type="obsolete">&amp;Rimpicciolisci il testo</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>&amp;Sorgente della pagina</translation>
@@ -629,10 +335,6 @@ Sei sicuro di voler uscire?</translation>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Segnalibri</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Gestione dei segnalibri...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Aggiungi segnalibro...</translation>
@@ -654,10 +356,6 @@ Sei sicuro di voler uscire?</translation>
         <comment>Web Search</comment>
         <translation>Ctrl+K</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Abilita l&apos;anal&amp;izzatore web</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Aiuto</translation>
@@ -666,10 +364,6 @@ Sei sicuro di voler uscire?</translation>
         <source>About &amp;Qt</source>
         <translation>Informazioni su &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Informazioni su &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Navigazione</translation>
@@ -690,23 +384,6 @@ Sei sicuro di voler uscire?</translation>
         <source>Hide Toolbar</source>
         <translation>Nascondi la barra degli strumenti</translation>
     </message>
-    <message>
-        <source>Show Bookmarks bar</source>
-        <translation type="obsolete">Mostra la Barra Dei Segnalibri</translation>
-    </message>
-    <message>
-        <source>Hide Bookmarks bar</source>
-        <translation type="obsolete">Nascondi la Barra Dei Segnalibri</translation>
-    </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Apri risorsa web</translation>
@@ -715,10 +392,6 @@ Sei sicuro di voler uscire?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Risorse web (*.html *.htm *.svg *.png *.gif *.svgz);;Tutti i file (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Stampa documento</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Sei sicuro di voler passare alla navigazione anonima?</translation>
@@ -727,20 +400,6 @@ Sei sicuro di voler uscire?</translation>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Sei sicuro di voler chiudere la finestra? Ci sono %1 schede aperte</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">Sorgente di %1</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Analizzatore web</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>L&apos;analizzatore web funziona correttamente solo con le pagine che sono caricate dopo averlo abilitato.
-Vuoi ricaricare tutte le pagine?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Ferma il caricamento della pagina attuale</translation>
@@ -753,11 +412,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>Downloads</source>
         <translation>Scaricamenti</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
     <message>
         <source>&amp;Clear Private Data</source>
         <translation>&amp;Cancella i dati privati</translation>
@@ -767,10 +421,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Canc</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Quando la navigazione anonima è attivata, alcune azioni sono disabilitate nel rispetto della tua privacy:&lt;ul&gt;&lt;li&gt; Le pagine non sono aggiunte alla cronologia.&lt;/li&gt;&lt;li&gt; Gli elementi sono rimossi automaticamente dalla finestra degli scaricamenti.&lt;/li&gt;&lt;li&gt; Non vengono salvati i nuovi cookie e non è possibile accedere a quelli attuali.&lt;/li&gt;&lt;li&gt; Le chiavi di ricerca non sono aggiunte al menu che appare sulla riquadro di ricerca.&lt;/li&gt;&lt;/ul&gt;Fino a che la finestra è aperta, puoi comunque usare i pulsanti Avanti e Indietro per tornare alle pagine che hai già visitato.</translation>
-    </message>
     <message>
         <source>Show Bookmarks Bar</source>
         <translation>Mostra la barra dei segnalibri</translation>
@@ -787,10 +437,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>Find P&amp;revious</source>
         <translation>Trova p&amp;recedente</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="vanished">Prefere&amp;nze...</translation>
-    </message>
     <message>
         <source>Show Menu Bar</source>
         <translation>Mostra barra dei menu</translation>
@@ -799,22 +445,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>&amp;Reload Page</source>
         <translation>&amp;Ricarica pagina</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">&amp;Ingrandisci testo</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">Ripristi&amp;na dimensione testo</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">Riduci te&amp;sto</translation>
-    </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">Mostra mo&amp;nitor di rete</translation>
-    </message>
     <message>
         <source>Switch application language </source>
         <translation>Cambia lingua applicazione</translation>
@@ -852,10 +482,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <comment>About Browser</comment>
         <translation>Informazioni su &amp;%1</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Quando la navigazione anonima è attiva, alcune azioni riguardanti la riservatezza saranno disabilitate:&lt;ul&gt;&lt;li&gt; Le pagine web non sono aggiunte alla cronologia.&lt;/li&gt;&lt;li&gt; Gli elementi sono rimossi automaticamente dalla finestra Scaricamenti.&lt;/li&gt;&lt;li&gt; I nuovi cookie non sono conservati, non è possibile accedere ai cookie correnti.&lt;/li&gt;&lt;li&gt; Le icone dei siti non saranno memorizzate, le sessioni non saranno salvate.&lt;/li&gt;&lt;li&gt; Le ricerche non sono aggiunte al menu a comparsa nel riquadro di ricerca.&lt;/li&gt;&lt;/ul&gt;Fino alla chiusura della finestra, è ancora possibile fare clic sui pulsanti Indietro e Avanti per tornare alle pagine web aperte in precedenza.</translation>
-    </message>
     <message>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
@@ -869,10 +495,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>Text Encoding</source>
         <translation>Codifica del testo</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; Network cache is disabled.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Quando la navigazione anonima è attivata, alcune azioni relative alla riservatezza saranno disabilitate:&lt;ul&gt;&lt;li&gt; Le pagine web non saranno aggiunte alla cronologia.&lt;/li&gt;&lt;li&gt; Gli elementi presenti nella finestra Scaricamenti saranno rimossi automaticamente.&lt;/li&gt;&lt;li&gt; I nuovi cookie non sono conservati, i cookie correnti non sono accessibili.&lt;/li&gt;&lt;li&gt; Le icone dei siti non saranno conservate, le sessioni non saranno salvate.&lt;/li&gt;&lt;li&gt; Le ricerche non sono aggiunte al menu a comparsa nel riquadro di ricerca.&lt;/li&gt;&lt;li&gt; La cache di rete è disabilitata.&lt;/li&gt;&lt;/ul&gt;Fino alla chiusura della finestra, potrai fare clic sui pulsanti Indietro e Avanti per tornare alle pagine precedentemente aperte.</translation>
-    </message>
     <message>
         <source>Select &amp;All</source>
         <translation>Selezion&amp;a tutto</translation>
@@ -881,10 +503,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>Alt+Ctrl+B</source>
         <translation>Alt+Ctrl+B</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; No new network cache is written to disk.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="vanished">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Quando la navigazione anonima è abilitata, alcune azioni relative alla riservatezza saranno disabilitate:&lt;ul&gt;&lt;li&gt; Le pagine web non sono aggiunte alla cronologia.&lt;/li&gt;&lt;li&gt; Gli elementi sono automaticamente rimossi dalla finestra Scaricamenti.&lt;/li&gt;&lt;li&gt; I nuovi cookie non sono salvati, i cookie attuali non sono accessibili.&lt;/li&gt;&lt;li&gt; Le icone dei siti non saranno salvate, come le sessioni.&lt;/li&gt;&lt;li&gt; Le ricerche non sono aggiunte al menu a comparsa nel riquadro di ricerca.&lt;/li&gt;&lt;li&gt; Nessuna cache di rete sarà scritta su disco.&lt;/li&gt;&lt;/ul&gt;Fino alla chiusura della finestra, sarà possibile fare clic sui pulsanti Indietro e Avanti per tornare alle pagine web aperte.</translation>
-    </message>
     <message>
         <source>Options...</source>
         <translation type="unfinished"></translation>
@@ -897,10 +515,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>User Agent</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Reload / Stop</source>
         <translation type="unfinished"></translation>
@@ -917,10 +531,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -953,6 +563,19 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -983,14 +606,6 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>&amp;Search History</source>
         <translation>Cronologia delle &amp;ricerche</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookie</translation>
-    </message>
-    <message>
-        <source>C&amp;ache</source>
-        <translation type="obsolete">C&amp;ache</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>&amp;Icone dei siti</translation>
@@ -1003,1239 +618,362 @@ Vuoi ricaricare tutte le pagine?</translation>
         <source>&amp;Cancel</source>
         <translation>&amp;Annulla</translation>
     </message>
+</context>
+<context>
+    <name>DownloadDialog</name>
+    <message>
+        <source>Downloads</source>
+        <translation>Scaricamenti</translation>
+    </message>
     <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>Pagine web in c&amp;ache</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadItem</name>
     <message>
-        <source>Load</source>
-        <translation>Carica</translation>
+        <source>Save File</source>
+        <translation>Salva il file</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>Carica tutto</translation>
+        <source>Download canceled: %1</source>
+        <translation>Scaricamento annullato: %1</translation>
     </message>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Aggiungi %1 ai siti autorizzati</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Errore durante il salvataggio: %1</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>Rimuovi dai siti autorizzati</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Errore di rete: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Carica Flash</translation>
-    </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
-    <message>
-        <source>Whitelist sites</source>
-        <translation>Siti autorizzati</translation>
-    </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Sito web</translation>
-    </message>
-    <message>
-        <source>Status</source>
-        <translation type="obsolete">Stato</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Consenti</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Rifiuta</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Consenti nella sessione</translation>
-    </message>
-    <message>
-        <source>Rule</source>
-        <translation>Regola</translation>
-    </message>
-</context>
-<context>
-    <name>CookieModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Sito web</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <source>Path</source>
-        <translation>Percorso</translation>
-    </message>
-    <message>
-        <source>Secure</source>
-        <translation>Sicuro</translation>
-    </message>
-    <message>
-        <source>Expires</source>
-        <translation>Scade</translation>
-    </message>
-    <message>
-        <source>Contents</source>
-        <translation>Contenuti</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>vero</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>falso</translation>
-    </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>Cookie di sessione</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookie</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Rimuovi</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Rimuovi &amp;tutti i cookie</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation>Aggiungi &amp;regola</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Eccezioni</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Nuova eccezione</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Dominio:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Rifiuta</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Consenti nella sessione</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Consenti</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Eccezioni</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Rimuovi</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Rimuovi &amp;tutti</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Scaricamenti</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Pulisci</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 elementi</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Save File</source>
-        <translation>Salva il file</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Scaricamento annullato: %1</translation>
-    </message>
-    <message>
-        <source>Error opening save file: %1</source>
-        <translation type="obsolete">Errore durante l&apos;apertura del file: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Errore durante il salvataggio: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Errore di rete: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">secondi</translation>
-    </message>
-    <message>
-        <source>minutes</source>
-        <translation type="obsolete">minuti</translation>
-    </message>
-    <message>
-        <source>- %4 %5 remaining</source>
-        <translation type="obsolete">- %4 %5 rimanenti</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 di %2 (%3/sec) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 di %2 - Fermato</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">byte</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Modulo</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Nome del file</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Riprova</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Ferma</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Apri</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n minuto rimanente</numerusform>
-            <numerusform>- %n minuti rimanenti</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n secondo rimanente</numerusform>
-            <numerusform>- %n secondi rimanenti</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Errore nel file di output: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 di %2 (%3/sec) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>La cartella degli scaricamenti (%1) non può essere creata.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>1 Download</source>
-        <translation type="obsolete">1 Scaricamento</translation>
-    </message>
-    <message>
-        <source>%1 Downloads</source>
-        <translation type="obsolete">%2 Scaricamenti</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n scaricamento</numerusform>
-            <numerusform>%n scaricamenti</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Ci sono %1 scaricamenti in corso
-Vuoi uscire comunque?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>Un minuto rimanente</numerusform>
-            <numerusform>%n minuti rimanenti</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>Un secondo rimanente</numerusform>
-            <numerusform>%n secondi rimanenti</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>byte</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Nessun errore</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Errore di apertura: %1: Nessun file o cartella</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Impossibile leggere %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Contenuto di %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Apri</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copia</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Elimina</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Cronologia</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Rimuovi</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Rimuovi &amp;tutti</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Mostra tutta la cronologia</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Cancella la cronologia</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Cancella la cronologia...</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Sei sicuro di voler cancellare la cronologia?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Titolo</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Prima di oggi</translation>
-    </message>
-    <message>
-        <source>%1 items</source>
-        <translation type="obsolete">%1 elementi</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n elemento</numerusform>
-            <numerusform>%n elementi</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation>Benvenuti in Arora!</translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation>Avvio di Arora</translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation>Cerca!</translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation>Risultati di ricerca forniti da</translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation>Informazioni su Arora</translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Default</source>
-        <translation type="obsolete">Predefinita</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Scegli la lingua</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Puoi utilizzare una lingua differente da&lt;br&gt;quella predefinita del sistema operativo.&lt;/p&gt;&lt;p&gt;Scegli la lingua da utilizzare&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="vanished">Nessun file di traduzione installato.</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Inserisci nome utente e password per &quot;%1&quot; su %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Connettiti al proxy &quot;%1&quot; usando:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">Errori SSL:
-
-%1
-
-%2
-
-Vuoi ignorare questi errori?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Vuoi accettare tutti questi certificati?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - Errori SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Errori SSL:&lt;br/&gt;&lt;br/&gt;per: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Vuoi ignorare questi errori?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Certificati:&lt;br/&gt;%1&lt;br/&gt;Vuoi accettare tutti questi certificati?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Certificati:&lt;br/&gt;%1&lt;br/&gt;Vuoi accettare tutti questi certificati?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Emittente: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Non valido prima di: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Valido fino a: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Nomi alternativi:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Valore</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Monitor di rete</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Richieste di rete</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Intestazioni di richiesta</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Intestazioni di risposta</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Rimuovi</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">Rimuovi &amp;tutte le richieste</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation>Apri file</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Errore</translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation>%1 non è una descrizione OpenSearch 1.1 valida o è già nell&apos;elenco.</translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation>Devi avere almeno un motore di ricerca.</translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Gestore OpenSearch</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Ripristina valori predefiniti</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Elimina</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Aggiungi</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Chiudi</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation>&lt;strong&gt;Descrizione:&lt;/strong&gt; %1</translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation>&lt;strong&gt;Fornisce suggerimenti di contesto&lt;/strong&gt;</translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation>Elenco di parole chiave, separate da virgole, seguito da termini di ricerca che può essere inserito nella barra degli indirizzi per cercare con questo motore</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation>Parole chiave</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation>Vuoi aggiungere il seguente motore all&apos;elenco dei motori di ricerca?&lt;br /&gt;&lt;br /&gt;Nome: %1&lt;br /&gt;Ricerca in: %2</translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Autenticazione richiesta</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>ICONA FANTASMA</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>TESTO INTRODUTTIVO FANTASMA</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nome utente:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Password:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Non trovato</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Autenticazione al proxy</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICONA</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Connettiti al proxy</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nome utente:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Password:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Questo file non è un XBEL versione 1.0.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Titolo sconosciuto</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation>Non è un file OpenSearch 1.1.</translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Redirezione: %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Metodo</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Indirizzo</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Risposta</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Lunghezza</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Tipo contenuto</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Info</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Modulo</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Finito</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Seleziona tutto</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Cerca</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Impostazioni</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Generale</translation>
-    </message>
-    <message>
-        <source>Home:</source>
-        <translation type="obsolete">Pagina iniziale:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Usa la pagina corrente</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Rimuovi gli elementi dalla cronologia:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Dopo un giorno</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Dopo una settimana</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Dopo due settimane</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Dopo un mese</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Dopo un anno</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Manualmente</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Apri i collegamenti dalle applicazioni:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">In una scheda nella finestra corrente</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>In una nuova finestra</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Aspetto</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Carattere a larghezza fissa:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Riservatezza</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Contenuto web</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Abilita i plugin</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Abilita Javascript</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookie</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Accetta cookie:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Sempre</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Mai</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Solo dai siti che stai navigando</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Eccezioni...</translation>
-    </message>
-    <message>
-        <source>Keep until:</source>
-        <translation type="obsolete">Mantienili fino a che:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Scadono</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Esci dall&apos;applicazione</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Al massimo 90 giorni</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookie...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Enable proxy</source>
-        <translation type="obsolete">Abilita il proxy</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Tipo:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="obsolete">Host:</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Errore nel file di output: %1</translation>
     </message>
     <message>
-        <source>Port:</source>
-        <translation>Porta:</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 di %2 (%3/sec) - %4</translation>
     </message>
     <message>
-        <source>User Name:</source>
-        <translation>Nome utente:</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">La cartella degli scaricamenti (%1) non può essere creata.</translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Password:</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Avanzate</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Style Sheet:</source>
-        <translation>Foglio di stile:</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Downloads</source>
-        <translation>Scaricamenti</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Ask for a destination each time</source>
-        <translation>Chiedi la cartella di destinazione ogni volta</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this destination:</source>
-        <translation>Usa questa cartella di destinazione:</translation>
+        <source>bytes</source>
+        <translation type="obsolete">byte</translation>
     </message>
     <message>
-        <source>Standard font:</source>
-        <translation>Carattere standard:</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
-    <message>
-        <source>Select...</source>
-        <translation>Seleziona...</translation>
+</context>
+<context>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n scaricamento</numerusform>
+            <numerusform>%n scaricamenti</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Ci sono %1 scaricamenti in corso
+Vuoi uscire comunque?</translation>
     </message>
-    <message>
-        <source>On startup:</source>
-        <translation>All&apos;avvio:</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>Un minuto rimanente</numerusform>
+            <numerusform>%n minuti rimanenti</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Mostra la pagina iniziale</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>Un secondo rimanente</numerusform>
+            <numerusform>%n secondi rimanenti</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Show a blank page</source>
-        <translation>Mostra una pagina vuota</translation>
+        <source>bytes</source>
+        <translation>byte</translation>
     </message>
     <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Ripristina le finestre e le schede dell&apos;ultima sessione</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>On application exit</source>
-        <translation>All&apos;uscita</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Enable Images</source>
-        <translation type="obsolete">Abilita immagini</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Tabs</source>
-        <translation>Schede</translation>
+        <source>Open</source>
+        <translation>Apri</translation>
     </message>
     <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Seleziona schede e finestre a seconda di come sono state create</translation>
+        <source>Copy</source>
+        <translation>Copia</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Chiedi conferma durante la chiusura di schede multiple</translation>
+        <source>Delete</source>
+        <translation>Elimina</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Preferences</source>
-        <translation>Preferenze</translation>
+        <source>Show All History</source>
+        <translation>Mostra tutta la cronologia</translation>
     </message>
     <message>
-        <source>Home Page:</source>
-        <translation>Pagina iniziale:</translation>
+        <source>Clear History</source>
+        <translation>Cancella la cronologia</translation>
     </message>
     <message>
-        <source>View Images</source>
-        <translation>Visualizza immagini</translation>
+        <source>Clear History...</source>
+        <translation>Cancella la cronologia...</translation>
     </message>
     <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Mantieni i cookie fino a che:</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Sei sicuro di voler cancellare la cronologia?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Use proxy server</source>
-        <translation>Utilizza server proxy</translation>
+        <source>Title</source>
+        <translation>Titolo</translation>
     </message>
     <message>
-        <source>Host name:</source>
-        <translation>Nome server:</translation>
+        <source>Address</source>
+        <translation>Indirizzo</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Mostra solo un pulsante di chiusura al posto di uno per ogni scheda</translation>
+        <source>Earlier Today</source>
+        <translation>Prima di oggi</translation>
     </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Lingue preferite per visualizzare le pagine web:</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n elemento</numerusform>
+            <numerusform>%n elementi</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Block Popup Windows</source>
-        <translation>Blocca finestre a comparsa</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opening links</source>
-        <translation>Apertura collegamenti</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Collegamenti da aprire in una nuova finestra:</translation>
+        <source>Search!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>In una nuova scheda selezionata nella finestra corrente</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>In una nuova scheda della finestra corrente</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
-        <translation>Nella scheda corrente</translation>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Http (Secure)</source>
-        <translation>Http (Sicuro)</translation>
+        <source>Choose language</source>
+        <translation>Scegli la lingua</translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (Trasparente)</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Puoi utilizzare una lingua differente da&lt;br&gt;quella predefinita del sistema operativo.&lt;/p&gt;&lt;p&gt;Scegli la lingua da utilizzare&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Utilizza ClickToFlash sui plugin flash</translation>
+        <source>No translation files are installed at %1.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Filtra i cookie traccianti</translation>
+        <source>Open File</source>
+        <translation>Apri file</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Conferma in caso di chiusura di più schede o finestre</translation>
+        <source>OpenSearch</source>
+        <translation></translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Esci dall&apos;applicazione alla chiusura dell&apos;ultima scheda</translation>
+        <source>Error</source>
+        <translation>Errore</translation>
     </message>
     <message>
-        <source>Enable network cache</source>
-        <translation>Abilita cache di rete</translation>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
+        <translation>%1 non è una descrizione OpenSearch 1.1 valida o è già nell&apos;elenco.</translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
-        <translation>Dimensione massima:</translation>
+        <source>You must have at least one search engine in here.</source>
+        <translation>Devi avere almeno un motore di ricerca.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source> MB</source>
-        <translation></translation>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
+        <translation>&lt;strong&gt;Descrizione:&lt;/strong&gt; %1</translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Utilizza il motore di ricerca predefinito come ripiego quando l&apos;URL specificato dall&apos;utente non è valido</translation>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
+        <translation>&lt;strong&gt;Fornisce suggerimenti di contesto&lt;/strong&gt;</translation>
     </message>
     <message>
-        <source>Choose Directory...</source>
-        <translation>Scegli cartella...</translation>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
+        <translation>Elenco di parole chiave, separate da virgole, seguito da termini di ricerca che può essere inserito nella barra degli indirizzi per cercare con questo motore</translation>
     </message>
     <message>
-        <source>Enable access keys</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation>Nome</translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
-        <translation type="unfinished"></translation>
+        <source>Keywords</source>
+        <translation>Parole chiave</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>Choose Program...</source>
-        <translation type="unfinished"></translation>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
+        <translation>Vuoi aggiungere il seguente motore all&apos;elenco dei motori di ricerca?&lt;br /&gt;&lt;br /&gt;Nome: %1&lt;br /&gt;Ricerca in: %2</translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>Minimum Font size:</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Consenti</translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>A cookie session ends:</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation>Non trovato</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>When I exit the application</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Questo file non è un XBEL versione 1.0.</translation>
     </message>
     <message>
-        <source>1 day</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>Titolo sconosciuto</translation>
     </message>
     <message>
-        <source>2 days</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an OpenSearch 1.1 file.</source>
+        <translation>Non è un file OpenSearch 1.1.</translation>
     </message>
     <message>
-        <source>3 days</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7 days</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>30 days</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AutoFill</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AutoFill web forms:</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>User names and passwords</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>Edit...</source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Cerca</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation>Riavvio necessario</translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>La configurazione della cache di rete è cambiata. Affiché le modifiche abbiano effetto, è necessario riavviare il browser.</translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation>Scegli cartella</translation>
@@ -2263,18 +1001,6 @@ Vuoi ignorare questi errori?&lt;/qt&gt;</translation>
         <source>&amp;Find</source>
         <translation>Tro&amp;va</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="vanished">&amp;Visualizza</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="vanished">Test&amp;o a capo</translation>
-    </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Sorgente della pagina</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>Sorgente della pagina %1</translation>
@@ -2282,10 +1008,6 @@ Vuoi ignorare questi errori?&lt;/qt&gt;</translation>
 </context>
 <context>
     <name>TabBar</name>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">&amp;Nuova scheda</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Duplica scheda</translation>
@@ -2337,22 +1059,6 @@ Vuoi ignorare questi errori?&lt;/qt&gt;</translation>
         <source>Recently Closed Tabs</source>
         <translation>Schede chiuse di recente</translation>
     </message>
-    <message>
-        <source>(Untitled)</source>
-        <translation type="obsolete">(Senza titolo)</translation>
-    </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Sei sicuro di voler chiudere questa pagina?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Hai modificato questa pagina e chiudendola perderai le modifiche.
-Sei sicuro di volerlo fare?
-</translation>
-    </message>
     <message>
         <source>Untitled</source>
         <translation>Senza titolo</translation>
@@ -2373,10 +1079,6 @@ Sei sicuro di volerlo fare?
         <source>Loading...</source>
         <translation>Caricamento in corso...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Caricamento di %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Caricamento completato</translation>
@@ -2389,13 +1091,13 @@ Sei sicuro di volerlo fare?
         <source>Bookmark All Tabs</source>
         <translation>Segnalibri di tutte le schede</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
-    <message>
-        <source>Google</source>
-        <translation type="obsolete">Google</translation>
-    </message>
     <message>
         <source>No Recent Searches</source>
         <translation>Nessuna ricerca recente</translation>
@@ -2412,14 +1114,6 @@ Sei sicuro di volerlo fare?
         <source>Suggestions</source>
         <translation>Suggerimenti</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Aggiungi &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="vanished">Configura motori di ricerca...</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2440,45 +1134,6 @@ Sei sicuro di volerlo fare?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Errore durante l&apos;apertura della pagina: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Durante la connessione a: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.trolltech.com instead of &lt;b&gt;www&lt;/b&gt;.trolltech.com.</source>
-        <translation type="obsolete">Controlla che l&apos;indirizzo non contenga errori tipo &lt;b&gt;ww&lt;/b&gt;.trolltech.com al posto di &lt;b&gt;www&lt;/b&gt;.trolltech.com.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try to check the network connection.</source>
-        <translation type="obsolete">Se l&apos;indirizzo è corretto, controlla il corretto funzionamento della connessione di rete.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Se il computer o la rete sono protette da un firewall o da un proxy, controlla che il browser abbia i permessi per accedere alla rete.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Controlla la presenza nell&apos;indirizzo di errori del tipo &lt;b&gt;ww&lt;/b&gt;.arora-browser.org invece che &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Se l&apos;indirizzo è corretto, prova a verificare la connessione di rete.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Nuovo invio della richiesta POST</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Per visualizzare il sito, la richiesta con tutti i dati deve essere inviata nuovamente, ciò potrebbe causare un comportamento imprevisto del sito, ad es. la stessa azione potrebbe essere eseguita due volte. Vuoi continuare comunque?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2529,38 +1184,6 @@ Sei sicuro di volerlo fare?
         <source>Search with...</source>
         <translation>Cerca con...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Aggiungi alla barra delle ricerche</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Metodo non supportato</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>Il metodo %1 non è supportato.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Motore di ricerca</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Scegli il motore di ricerca desiderato</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Nome del motore</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Digita un nome per il motore</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/ja_JP.ts b/src/locale/ja_JP.ts
index b2f57361..4a0dc524 100644
--- a/src/locale/ja_JP.ts
+++ b/src/locale/ja_JP.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="ja_JP">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">About</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>著作者</translation>
@@ -15,158 +11,10 @@
         <source>License</source>
         <translation>ライセンス</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>WebKit ベースの軽いブラウザ</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>閉じる</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>%1 について</translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>WebKit バージョン: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>言語</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>言語の優先順位:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>上へ(&amp;U)</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>下へ(&amp;D)</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>削除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>追加...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>AdBlock ルール:%1 によってブロックされました</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>カスタム ルールの追加</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>ルールの書き方について...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>サブスクリプションの更新</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>サブスクリプションを参照...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>サブスクリプションを削除</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>AdBlock 設定</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>AdBlock を有効にする</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>アクション</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>カスタム ルール</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>ルール</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>登録しますか?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>この AdBlock サブスクリプションを登録しますか?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -174,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>ブックマークの追加</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>ブックマーク名を入力して、保存先を選択してください.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>URL</translation>
@@ -191,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>フォルダの追加</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>フォーム パスワード</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>削除</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>全て削除</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;パスワードを保存しますか?&lt;/b&gt;&lt;br&gt;         保存したり削除したパスワードを見直すには、オプションの自動入力タブを開いてください。</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>このサイトでは記憶しない</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>今は記憶しない</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Webサイト</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>ユーザ名</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -254,18 +53,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>新しいフォルダ</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>ブックマーク</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>削除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>フォルダの追加</translation>
-    </message>
     <message>
         <source>Edit Name</source>
         <translation>名前を編集</translation>
@@ -281,10 +68,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>ブックマークのインポート</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>%1 をインポートしました</translation>
@@ -327,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>ブックマークの追加</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">名前変更</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">アドレス変更</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation>ブックマーク バー</translation>
@@ -343,20 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Bookmarks Menu</source>
         <translation>ブックマーク メニュー</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">HTML形式ブックマークの読み込み中にエラー: %1
-</translation>
-    </message>
-    <message>
-        <source>XBEL</source>
-        <translation type="obsolete">XBEL</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -379,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>htmlToXBel ツールが必要です</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>HTML ブックマークをインポートするのに必要な Arora に搭載されている htmlToXBel ツールがインストールされていないかパスが通っていません。</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>ブックマークを読み込んでいます</translation>
@@ -393,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>HTML ブックマーク読込時にエラー: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -414,10 +175,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">ブックマーク</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>開く</translation>
@@ -438,10 +195,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>フォルダの追加...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">ブックマーク</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -456,16 +209,8 @@ Do you want to quit anyway?</source>
         <translation>復元に失敗</translation>
     </message>
     <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete"> (Change: %1 %2)</translation>
-    </message>
-    <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">このセッションを復元を試みて Arora がクラッシュした為、保存されたセッションは復元されない可能性があります。</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora は、セッションの復元を試みている時にクラッシュしました。再度復元を試みますか?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -498,14 +243,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>ブックマークをエクスポート(&amp;E)...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>印刷プレビュー(&amp;R)...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>印刷(&amp;P)...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>プライベート ブラウジング(&amp;B)...</translation>
@@ -550,10 +287,6 @@ Do you want to quit anyway?</source>
         <source>Find P&amp;revious</source>
         <translation>前を検索(&amp;R)</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">設定(&amp;N)...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -570,10 +303,6 @@ Do you want to quit anyway?</source>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -586,18 +315,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Reload Page</source>
         <translation>再読込(&amp;R)</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">文字を大きくする(&amp;B)</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">文字を通常サイズにする(&amp;N)</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">文字を小さくする(&amp;S)</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>ソースを表示(&amp;O)</translation>
@@ -634,10 +351,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Bookmarks</source>
         <translation>ブックマーク(&amp;B)</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">ブックマークの管理...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>ブックマークに追加...</translation>
@@ -668,10 +381,6 @@ Do you want to quit anyway?</source>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Web インスペクタを有効化(&amp;I)</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>ヘルプ(&amp;H)</translation>
@@ -684,10 +393,6 @@ Do you want to quit anyway?</source>
         <source>About &amp;Qt</source>
         <translation>Qt について(&amp;Q)</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Arora について(&amp;A)</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>ナビゲーション</translation>
@@ -716,15 +421,6 @@ Do you want to quit anyway?</source>
         <source>Hide Bookmarks Bar</source>
         <translation>ブックマーク バーを隠す</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Web リソースを開く</translation>
@@ -733,10 +429,6 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Web リソース (*.html *.htm *.svg *.png *.gif *.svgz);;全てのファイル (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>ドキュメントの印刷</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>プライベート ブラウジングを開始しますか?</translation>
@@ -745,16 +437,6 @@ Do you want to quit anyway?</source>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>%1 個のタブを開いていますが、ウィンドウを閉じますか?</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Web インスペクタ</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Web インスペクタは、ページを読み込む前から有効になっていなければ正しく動作しません.
-全てのページを再読込しますか?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>現在のページの読込を中止します</translation>
@@ -767,19 +449,6 @@ Do you want to reload all pages?</source>
         <source>Downloads</source>
         <translation>ダウンロード</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;プライベート モードに移行した場合、あなたのプライバシーを守る為、いくつかの機能は制限されます:&lt;ul&gt;&lt;li&gt; 表示したページは履歴に追加されません。&lt;/li&gt;&lt;li&gt; ダウンロード履歴は残りません。&lt;/li&gt;&lt;li&gt; 新しく受け取った Cookie は保存されません。既に保存済みの Cookie を参照する事もできません。&lt;/li&gt;&lt;li&gt; Web サイトのアイコンやセッションは保存されません。&lt;/li&gt;&lt;li&gt; 検索ボックスの検索履歴に追加されません。&lt;/li&gt;&lt;/ul&gt;ウィンドウを閉じるまで閲覧した Web ページに戻る/進むボタンで戻る事ができます。</translation>
-    </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">ネットワーク モニタを表示(&amp;N)</translation>
-    </message>
     <message>
         <source>Close Window</source>
         <translation>ウィンドウを閉じる</translation>
@@ -813,10 +482,6 @@ Do you want to reload all pages?</source>
         <comment>About Browser</comment>
         <translation>&amp;%1 について</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;プライベート モードに移行した場合、あなたのプライバシーを守る為、いくつかの機能は制限されます:&lt;ul&gt;&lt;li&gt; 表示したページは履歴に追加されません。&lt;/li&gt;&lt;li&gt; ダウンロード履歴は残りません。&lt;/li&gt;&lt;li&gt; 新しく受け取った Cookie は保存されません。既に保存済みの Cookie を参照する事もできません。&lt;/li&gt;&lt;li&gt; Web サイトのアイコンやセッションは保存されません。&lt;/li&gt;&lt;li&gt; 検索ボックスの検索履歴に追加されません。&lt;/li&gt;&lt;/ul&gt;ウィンドウを閉じるまでに閲覧した Web ページには戻る/進むボタンで移動する事ができます。</translation>
-    </message>
     <message>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
@@ -830,10 +495,6 @@ Do you want to reload all pages?</source>
         <source>Text Encoding</source>
         <translation>文字コード</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; Network cache is disabled.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;プライベート モードに移行した場合、あなたのプライバシーを守る為、いくつかの機能は制限されます:&lt;ul&gt;&lt;li&gt; 表示したページは履歴に追加されません。&lt;/li&gt;&lt;li&gt; ダウンロード履歴は残りません。&lt;/li&gt;&lt;li&gt; 新しく受け取った Cookie は保存されません。既に保存済みの Cookie を参照する事もできません。&lt;/li&gt;&lt;li&gt; Web サイトのアイコンやセッションは保存されません。&lt;/li&gt;&lt;li&gt; 検索ボックスの検索履歴に追加されません。&lt;/li&gt;&lt;li&gt;ネットワークキャッシュは無効です。&lt;/li&gt;&lt;/ul&gt;ウィンドウを閉じるまで閲覧した Web ページに戻る/進むボタンで戻る事ができます。</translation>
-    </message>
     <message>
         <source>Select &amp;All</source>
         <translation>すべてを選択(&amp;A)</translation>
@@ -842,10 +503,6 @@ Do you want to reload all pages?</source>
         <source>Alt+Ctrl+B</source>
         <translation>Alt+Ctrl+B</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; No new network cache is written to disk.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;プライベート モードに移行した場合、あなたのプライバシーを守る為、いくつかの機能は制限されます:&lt;ul&gt;&lt;li&gt; 表示したページは履歴に追加されません。&lt;/li&gt;&lt;li&gt; ダウンロード履歴は残りません。&lt;/li&gt;&lt;li&gt; 新しく受け取った Cookie は保存されません。既に保存済みの Cookie を参照する事もできません。&lt;/li&gt;&lt;li&gt; Web サイトのアイコンやセッションは保存されません。&lt;/li&gt;&lt;li&gt; 検索ボックスの検索履歴に追加されません。&lt;/li&gt;&lt;li&gt;新しいネットワークキャッシュをディスクに保存しません。&lt;/li&gt;&lt;/ul&gt;ウィンドウを閉じるまで閲覧した Web ページに戻る/進むボタンで戻る事ができます。</translation>
-    </message>
     <message>
         <source>Options...</source>
         <translation>オプション...</translation>
@@ -854,10 +511,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation>検索エンジンのカスタマイズ...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>広告ブロック(AdBlock)(&amp;A)...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>プライベート ブラウジングを有効にすると、あなたのプライバシーを守る為、いくつかの動作が制限されます:</translation>
@@ -870,10 +523,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>ダウンロードが終了したものは、自動的にダウンロード ウィンドウから削除されます。</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>新しく受け取った Cookie は保存されなくなり、既に保存されている Cookie へアクセスする事もできません。</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Web サイトのアイコン(favicon)は、保存されません。</translation>
@@ -914,6 +563,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -944,14 +606,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>検索履歴(&amp;S)</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>Cookie(&amp;C)</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>キャッシュされた Web ページ(&amp;A)</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Web サイトのアイコン(&amp;I)</translation>
@@ -966,279 +620,81 @@ Do you want to reload all pages?</source>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation>Flash をロード</translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation>このページの全ての Flash をロード</translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>このサイト(%1)をホワイトリストに追加</translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation>ホワイトリストから除外</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>設定</translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load Flash</source>
-        <translation>Flash のロード</translation>
+        <source>Downloads</source>
+        <translation>ダウンロード</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>ホワイトリスト一覧</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CookieExceptionsModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Web サイト</translation>
-    </message>
-    <message>
-        <source>Rule</source>
-        <translation>ルール</translation>
-    </message>
+    <name>DownloadItem</name>
     <message>
-        <source>Allow</source>
-        <translation>許可</translation>
+        <source>Save File</source>
+        <translation>ブックマークのエクスポート</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>不許可</translation>
+        <source>Download canceled: %1</source>
+        <translation>%1 のダウンロードは中止しました</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>セッション内のみ許可</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">保存ファイルの作成中にエラー:%1</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Web サイト</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">保存中にエラー:%1</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>名前</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">ネットワーク エラー:%1</translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>パス</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>安全</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 / %2 (%3/秒) - %4</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>期限</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">ダウンロード先ディレクトリ (%1) を作成できませんでした。</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>内容</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>はい</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>いいえ</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation>セッション Cookie</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>削除(&amp;R)</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bytes</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>全ての Cookie を削除(&amp;A)</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>ルールを追加(&amp;R)</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Domain:</source>
-        <translation>ドメイン:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>ブロック</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>セッション内のみ許可</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>許可</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>削除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>全て削除(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Cookie 例外条件</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>新しい例外条件</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>例外条件</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>ダウンロード</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>履歴の消去</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 件</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>開く</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Filename</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>リトライ</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>停止</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>ブックマークのエクスポート</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>%1 のダウンロードは中止しました</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>保存ファイルの作成中にエラー:%1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>保存中にエラー:%1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>ネットワーク エラー:%1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">秒</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- 残り %n 分</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- 残り %n 秒</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 / %2 (%3/sec) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 / %2 - 停止しました</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 / %2 (%3/秒) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>ダウンロード先ディレクトリ (%1) を作成できませんでした。</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
 </context>
 <context>
@@ -1284,33 +740,6 @@ Do you want to quit anyway?</source>
         <translation>GB</translation>
     </message>
 </context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>エラーはありません</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>ディレクトリ( %1 )読込中にエラー:ディレクトリがありません</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>ディレクトリ( %1 )の内容を読み込めません</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>%1 の中身</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>HistoryDialog</name>
     <message>
@@ -1325,18 +754,6 @@ Do you want to quit anyway?</source>
         <source>Delete</source>
         <translation>削除</translation>
     </message>
-    <message>
-        <source>History</source>
-        <translation>履歴</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>削除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>全て削除(&amp;A)</translation>
-    </message>
 </context>
 <context>
     <name>HistoryMenu</name>
@@ -1382,38 +799,34 @@ Do you want to quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translation>Arora にようこそ!</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>Arora スタート</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>検索!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>検索結果の提供 </translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>Arora について</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageManager</name>
-    <message>
-        <source>Default</source>
-        <translation type="obsolete">デフォルト</translation>
-    </message>
     <message>
         <source>Choose language</source>
         <translation>言語の選択</translation>
@@ -1422,120 +835,11 @@ Do you want to quit anyway?</source>
         <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
         <translation>&lt;p&gt;OSのデフォルト設定とは異なる言語で動作させる事ができます.&lt;/p&gt;&lt;p&gt;使用したい言語を選択して下さい&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">翻訳ファイルがインストールされていません。</translation>
-    </message>
     <message>
         <source>No translation files are installed at %1.</source>
         <translation>%1 に翻訳ファイルがありません。</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">SSL エラー:
-
-%1
-
-%2
-
-エラーを無視しますか?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">全ての証明書を受け入れますか?</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;%1(%2)にアクセスするにはユーザ名とパスワードが必要です&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;プロキシ サーバ &quot;%1&quot; に接続:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - SSL エラー</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL エラー:&lt;br/&gt;&lt;br/&gt;URL: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-エラーを無視しますか?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;証明書:&lt;br/&gt;%1&lt;br/&gt;全ての証明書を受け入れますか?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;証明書:&lt;br/&gt;%1&lt;br/&gt;全ての証明書を受け入れますか?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>発行者: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>発行日: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>有効期限: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>代理名:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">名前</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">値</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">ネットワーク モニタ</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">ネットワーク リクエスト</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">リクエスト ヘッダ</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">レスポンス ヘッダ</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">削除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">全てのリクエストを削除(&amp;A)</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1558,26 +862,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>You must have at least one search engine in here.</source>
         <translation>1つ以上の検索エンジンを登録して下さい。</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>OpenSearch マネージャ</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>デフォルトに戻す(&amp;R)</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>削除(&amp;D)</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>追加(&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>閉じる(&amp;C)</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1610,26 +894,18 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>認証要求</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
+    <name>PermissionBar</name>
     <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
+        <source>Allow</source>
+        <translation type="unfinished">許可</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>ユーザ名:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>パスワード:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1639,29 +915,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <translation>見つかりません</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>プロキシ認証</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>プロキシに接続</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>ユーザ名:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>パスワード:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1676,63 +929,36 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>これは OpenSearch 1.1 ファイルではありません。</translation>
     </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">リダイレクト: %1</translation>
-    </message>
     <message>
-        <source>Method</source>
-        <translation type="obsolete">メソッド</translation>
+        <source>use desktop notifications</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation type="obsolete">アドレス</translation>
+        <source>use your position</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Response</source>
-        <translation type="obsolete">レスポンス</translation>
+        <source>use your microphone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Length</source>
-        <translation type="obsolete">長さ</translation>
+        <source>use your camera</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Content Type</translation>
+        <source>use your camera and microphone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
-        <translation type="obsolete">情報</translation>
+        <source>lock your mouse</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
+    <name>SavePageDialog</name>
     <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>閉じる</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>全て強調表示</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1742,399 +968,8 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <translation>検索</translation>
     </message>
 </context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>全般</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>起動時:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>ホームページを開く</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>空白ページを開く</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>最後に開いていたウィンドウとタブを復元する</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>ホームページ:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>現在のページを使用</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>履歴を削除するタイミング:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>1日後</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>1週間後</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>2週間後</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>1ヶ月後</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>1年後</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>手動</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>アプリケーション終了時</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>リンクを開く時の動作:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">表示しているタブで開く</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>新しいウィンドウで開く</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>ダウンロード</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>毎回保存先を指定する</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>デフォルトの保存先:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>外観</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>標準のフォント:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>選択...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>固定幅フォント:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>プライバシー</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>コンテンツ</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>プラグインを有効にする</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Javascript を有効にする</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>画像を表示</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookie</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>例外...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Cookie の保持期間:</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>arora が終了するまで</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>最長90日間</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookie を表示...</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>タブ</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>タブやウィンドウを作成した時に移動する</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">複数のタブを閉じる時に確認する</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>プロキシ</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>プロキシを使用する</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>種類:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>ホスト名:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>ポート:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>ユーザ名:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>パスワード:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>拡張</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>スタイルシート:</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Cookie が送られてきたら:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>受け取る</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>受け取らない</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>サードパーティの Cookie は無視</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Cookie の有効期限が切れるまで</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>タブ毎の閉じるボタンをつけない</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Web ページを表示する際に使用する言語の設定:</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>ポップアップウィンドウをブロックする</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>リンクを開く</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>リンクを新しいウィンドウで開こうとした時の動作:</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>現在のウィンドウの新しいタブで開いて、そのタブに移動する</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>現在のウィンドウの新しいタブで開く</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>現在のタブで開く</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>Http (安全な)</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (透過)</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Flash プラグインとして ClickToFlash を使う</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>追跡用 Cookie をフィルタする</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>複数のタブやウィンドウを閉じる時に確認する</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>最後のタブを閉じる時にアプリケーションを終了する</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>ネットワーク キャッシュを有功にする</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>最大サイズ:</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation> MB</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>不正なURLが入力された場合、デフォルトの検索エンジンを使用する</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation>ディレクトリを選択...</translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation>Cookie セッションの有効期間:</translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation>アプリケーションが終了するまで</translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation>1 日間</translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation>2 日間</translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation>3 日間</translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation>7 日間</translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation>30 日間</translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation>自動入力</translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation>フォームの自動入力:</translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation>ユーザ名とパスワード</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation>編集...</translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation>参照...</translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use this external download program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose Program...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum Font size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation>再起動が必要</translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>ネットワーク キャッシュの構成を変更しました。設定を有効にするにはブラウザの再起動が必要です。</translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation>ディレクトリを選択</translation>
@@ -2162,18 +997,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation>検索(&amp;F)</translation>
     </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">ソース表示</translation>
-    </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">表示(&amp;V)</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">行を折り返す(&amp;W)</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>ページ(%1)のソース</translation>
@@ -2189,10 +1012,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Hide Tab Bar</source>
         <translation>タブ バーを隠す</translation>
     </message>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">新しいタブ(&amp;T)</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>タブを複製</translation>
@@ -2240,17 +1059,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Untitled</source>
         <translation>(無題)</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>本当にこのページを閉じますか?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>このページは変更されていますが、ページを閉じると変更は失われてしまいます.
-本当にこのページを閉じますか?</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation>Ctrl-]</translation>
@@ -2267,10 +1075,6 @@ Do you really want to close this page?
         <source>Loading...</source>
         <translation>読み込み中...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>読み込み中 %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>読み込み完了</translation>
@@ -2283,6 +1087,10 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation>全てのタブをブックマーク</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2302,14 +1110,6 @@ Do you really want to close this page?
         <source>Suggestions</source>
         <translation>候補</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; を追加</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">検索エンジンのカスタマイズ...</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2330,41 +1130,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>%1 の読み込みでエラー</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>%1 への接続中にエラーが発生しました。</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>&lt;b&gt;www&lt;/b&gt;.arora-browser.org ではなく &lt;b&gt;ww&lt;/b&gt;.arora-browser.org のような、URL誤りがないか確認してください</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try to check the network connection.</source>
-        <translation type="obsolete">URLが正しい場合は、ネットワークの接続状況を確認してみてください。</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>あなたのコンピュータやネットワークがファイアウォールやプロキシによって保護されている場合、Arora ブラウザにネットワークへのアクセスを許可してください。</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>URLが正しい場合は、ネットワークの接続状況を確認してみてください。</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>POST リクエストを再送します</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>サイトを表示する為に、全てのデータを再送する必要がありますが、予期しない動作を引き起こす(例えば、注文やコメント投稿等の操作が再度行われる)可能性があります。それでも続行しますか?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2415,38 +1180,6 @@ Do you really want to close this page?
         <source>Search with...</source>
         <translation>検索エンジンを指定して検索...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>ツールバーの検索エンジンに追加する</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>サポートされていないメソッド</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>メソッド( %1 )はサポートされていません。</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>検索エンジン</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>使用したい検索エンジンを選んでください</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>検索エンジン名の入力</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>検索エンジンの名前を入力してください</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>画像の読み込みをブロック</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/ko_KR.ts b/src/locale/ko_KR.ts
index 3df35cff..6c13edba 100644
--- a/src/locale/ko_KR.ts
+++ b/src/locale/ko_KR.ts
@@ -4,293 +4,73 @@
 <context>
     <name>AboutDialog</name>
     <message>
-        <location filename="aboutdialog.ui" line="117"/>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>WebKit 기반 경량 웹 브라우저</translation>
-    </message>
-    <message>
-        <location filename="aboutdialog.ui" line="136"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <location filename="aboutdialog.ui" line="162"/>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <location filename="aboutdialog.ui" line="193"/>
-        <location filename="aboutdialog.cpp" line="83"/>
+        <location filename="../aboutdialog.cpp" line="79"/>
         <source>Authors</source>
         <translation>제작자</translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="200"/>
-        <location filename="aboutdialog.cpp" line="88"/>
+        <location filename="../aboutdialog.cpp" line="84"/>
         <source>License</source>
         <translation>라이센스</translation>
     </message>
     <message>
-        <location filename="aboutdialog.ui" line="207"/>
-        <source>Close</source>
-        <translation>닫기</translation>
-    </message>
-    <message>
-        <location filename="aboutdialog.cpp" line="37"/>
+        <location filename="../aboutdialog.cpp" line="34"/>
         <source>About %1</source>
         <translation>%1에 대하여</translation>
     </message>
-    <message>
-        <location filename="aboutdialog.cpp" line="41"/>
-        <source>WebKit version: %1</source>
-        <translation>WebKit 버전: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <location filename="acceptlanguagedialog.ui" line="14"/>
-        <source>Languages</source>
-        <translation>언어</translation>
-    </message>
-    <message>
-        <location filename="acceptlanguagedialog.ui" line="20"/>
-        <source>Languages: in order of preference:</source>
-        <translation>언어 (선호순):</translation>
-    </message>
-    <message>
-        <location filename="acceptlanguagedialog.ui" line="33"/>
-        <source>Move &amp;Up</source>
-        <translation>위로 (&amp;U)</translation>
-    </message>
-    <message>
-        <location filename="acceptlanguagedialog.ui" line="43"/>
-        <source>Move &amp;Down</source>
-        <translation>아래로 (&amp;D)</translation>
-    </message>
-    <message>
-        <location filename="acceptlanguagedialog.ui" line="53"/>
-        <source>&amp;Remove</source>
-        <translation>제거 (&amp;R)</translation>
-    </message>
-    <message>
-        <location filename="acceptlanguagedialog.ui" line="76"/>
-        <source>Add...</source>
-        <translation>추가...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <location filename="adblock/adblockblockednetworkreply.cpp" line="42"/>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>AdBlockRule 에 의해 차단됨: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <location filename="adblock/adblockdialog.ui" line="14"/>
-        <source>AdBlock Configuration</source>
-        <translation>AdBlock 설정</translation>
-    </message>
-    <message>
-        <location filename="adblock/adblockdialog.ui" line="20"/>
-        <source>Enable AdBlock</source>
-        <translation>AdBlock 활성화</translation>
-    </message>
-    <message>
-        <location filename="adblock/adblockdialog.ui" line="68"/>
-        <source>Action</source>
-        <translation>동작</translation>
-    </message>
-    <message>
-        <location filename="adblock/adblockdialog.cpp" line="75"/>
-        <source>Add Custom Rule</source>
-        <translation>개별 규칙 추가</translation>
-    </message>
-    <message>
-        <location filename="adblock/adblockdialog.cpp" line="78"/>
-        <source>Learn more about writing rules...</source>
-        <translation>규칙 작성하는 방법 배우기...</translation>
-    </message>
-    <message>
-        <location filename="adblock/adblockdialog.cpp" line="85"/>
-        <source>Update Subscription</source>
-        <translation>구독 업데이트</translation>
-    </message>
-    <message>
-        <location filename="adblock/adblockdialog.cpp" line="90"/>
-        <source>Browse Subscriptions...</source>
-        <translation>구독 찾기...</translation>
-    </message>
-    <message>
-        <location filename="adblock/adblockdialog.cpp" line="95"/>
-        <source>Remove Subscription</source>
-        <translation>구독 제거</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <location filename="adblock/adblockmanager.cpp" line="119"/>
-        <source>Custom Rules</source>
-        <translation>개별 규칙</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <location filename="adblock/adblockmodel.cpp" line="83"/>
-        <source>Rule</source>
-        <translation>규칙</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <location filename="adblock/adblockschemeaccesshandler.cpp" line="55"/>
-        <source>Subscribe?</source>
-        <translation>구독 여부 확인</translation>
-    </message>
-    <message>
-        <location filename="adblock/adblockschemeaccesshandler.cpp" line="56"/>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>이 AdBlock 규칙을 구독할까요?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
     <message>
-        <location filename="bookmarks/addbookmarkdialog.ui" line="14"/>
-        <location filename="bookmarks/addbookmarkdialog.cpp" line="173"/>
+        <location filename="../bookmarks/addbookmarkdialog.cpp" line="187"/>
         <source>Add Bookmark</source>
         <translation>북마크 추가</translation>
     </message>
     <message>
-        <location filename="bookmarks/addbookmarkdialog.ui" line="20"/>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>북마크 이름을 입력한 후 저장할 위치를 선택하여 주십시요.</translation>
-    </message>
-    <message>
-        <location filename="bookmarks/addbookmarkdialog.cpp" line="120"/>
+        <location filename="../bookmarks/addbookmarkdialog.cpp" line="134"/>
         <source>Url</source>
         <translation>URL</translation>
     </message>
     <message>
-        <location filename="bookmarks/addbookmarkdialog.cpp" line="121"/>
+        <location filename="../bookmarks/addbookmarkdialog.cpp" line="135"/>
         <source>Title</source>
         <translation>제목</translation>
     </message>
     <message>
-        <location filename="bookmarks/addbookmarkdialog.cpp" line="170"/>
+        <location filename="../bookmarks/addbookmarkdialog.cpp" line="184"/>
         <source>Add Folder</source>
         <translation>폴더 추가</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <location filename="autofilldialog.ui" line="14"/>
-        <source>Form Passwords</source>
-        <translation>폼 비밀번호</translation>
-    </message>
-    <message>
-        <location filename="autofilldialog.ui" line="43"/>
-        <source>Remove</source>
-        <translation>제거</translation>
-    </message>
-    <message>
-        <location filename="autofilldialog.ui" line="50"/>
-        <source>Remove All</source>
-        <translation>모두 제거</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <location filename="autofillmanager.cpp" line="199"/>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation>&lt;b&gt;이 비밀번호를 저장할까요?&lt;/b&gt;&lt;br&gt;         저장된 비밀번호를 확인하고 제거하려면 설정에서 자동 채움 항목을 확인하여 주십시요.</translation>
-    </message>
-    <message>
-        <location filename="autofillmanager.cpp" line="201"/>
-        <source>Never for this site</source>
-        <translation>이 사이트에서는 안 함</translation>
-    </message>
-    <message>
-        <location filename="autofillmanager.cpp" line="202"/>
-        <source>Not now</source>
-        <translation>지금 안 함</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <location filename="autofilldialog.cpp" line="58"/>
-        <source>WebSite</source>
-        <translation>웹사이트</translation>
-    </message>
-    <message>
-        <location filename="autofilldialog.cpp" line="59"/>
-        <source>User Name</source>
-        <translation>사용자명</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
-        <location filename="bookmarks/bookmarksdialog.ui" line="13"/>
-        <source>Bookmarks</source>
-        <translation>북마크 목록</translation>
-    </message>
-    <message>
-        <location filename="bookmarks/bookmarksdialog.ui" line="40"/>
-        <source>&amp;Remove</source>
-        <translation>제거 (&amp;R)</translation>
-    </message>
-    <message>
-        <location filename="bookmarks/bookmarksdialog.ui" line="47"/>
-        <source>Add Folder</source>
-        <translation>폴더 추가</translation>
-    </message>
-    <message>
-        <location filename="bookmarks/bookmarksdialog.cpp" line="160"/>
+        <location filename="../bookmarks/bookmarksdialog.cpp" line="160"/>
         <source>Open</source>
         <translation>열기</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksdialog.cpp" line="161"/>
+        <location filename="../bookmarks/bookmarksdialog.cpp" line="161"/>
         <source>Open in New Tab</source>
         <translation>새 탭에서 열기</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksdialog.cpp" line="165"/>
+        <location filename="../bookmarks/bookmarksdialog.cpp" line="165"/>
         <source>Edit Name</source>
         <translation>이름 편집</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksdialog.cpp" line="168"/>
+        <location filename="../bookmarks/bookmarksdialog.cpp" line="168"/>
         <source>Edit Address</source>
         <translation>주소 편집</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksdialog.cpp" line="171"/>
+        <location filename="../bookmarks/bookmarksdialog.cpp" line="171"/>
         <source>Delete</source>
         <translation>삭제</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksdialog.cpp" line="238"/>
+        <location filename="../bookmarks/bookmarksdialog.cpp" line="238"/>
         <source>New Folder</source>
         <translation>새 폴더</translation>
     </message>
@@ -298,114 +78,114 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BookmarksManager</name>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="89"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="89"/>
         <source>Bookmarks Bar</source>
         <translation>북마크 바</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="90"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="90"/>
         <source>Bookmarks Menu</source>
         <translation>북마크 메뉴</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="135"/>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="316"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="135"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="316"/>
         <source>Error when loading bookmarks on line %1, column %2:
 %3</source>
         <translation>북마크 목록을 읽는 데에 오류가 발생하였습니다. %1 번째 줄, %2번째 열을 확인하십시오.
 %3</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="144"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="144"/>
         <source>Toolbar Bookmarks</source>
         <translation>북마크 도구 바</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="152"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="152"/>
         <source>Menu</source>
         <translation>메뉴</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="282"/>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="331"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="282"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="331"/>
         <source>XBEL bookmarks</source>
         <translation>XBEL 북마크 목록</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="283"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="283"/>
         <source>HTML Netscape bookmarks</source>
         <translation>HTML Netscape 북마크 목록</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="285"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="285"/>
         <source>Open File</source>
         <translation>파일 열기</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="301"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="301"/>
         <source>htmlToXBel tool required</source>
         <translation>htmlToXBel 도구가 필요합니다</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="302"/>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>Arora에 포함된 htmlToXBel 도구는 HTML 북마크 목록을 가지고 오는 데 필요하지만 지정된 경로에 설치되지 않았거나 찾을 수 없습니다.</translation>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="302"/>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="305"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="305"/>
         <source>Loading Bookmark</source>
         <translation>북마크 가져오기</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="306"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="306"/>
         <source>Error when loading HTML bookmarks: %1
 </source>
         <translation>HTML 북마크 목록을 가져오는 데에 오류가 발생하였습니다: %1
 </translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="323"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="323"/>
         <source>Imported %1</source>
         <translation>%1 을(를) 가져왔습니다</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="329"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="329"/>
         <source>Save File</source>
         <translation>파일로 저장</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="330"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="330"/>
         <source>%1 Bookmarks.xbel</source>
         <translation>%1 북마크 목록.xbel</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="337"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="337"/>
         <source>Export error</source>
         <translation>내보내기 오류</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="337"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="337"/>
         <source>error saving bookmarks</source>
         <translation>북마크 목록 저장에 실패함</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="341"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="341"/>
         <source>Remove Bookmark</source>
         <translation>북마크 제거</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="375"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="375"/>
         <source>Insert Bookmark</source>
         <translation>북마크 추가</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="389"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="389"/>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
         <translation>이름 바꾸기</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmanager.cpp" line="392"/>
+        <location filename="../bookmarks/bookmarksmanager.cpp" line="392"/>
         <source>Address Change</source>
         <comment>Undo bookmark url change</comment>
         <translation>주소 바꾸기</translation>
@@ -414,7 +194,7 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BookmarksMenu</name>
     <message>
-        <location filename="bookmarks/bookmarksmenu.cpp" line="115"/>
+        <location filename="../bookmarks/bookmarksmenu.cpp" line="121"/>
         <source>Open in Tabs</source>
         <translation>탭에서 열기</translation>
     </message>
@@ -422,12 +202,12 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BookmarksModel</name>
     <message>
-        <location filename="bookmarks/bookmarksmodel.cpp" line="150"/>
+        <location filename="../bookmarks/bookmarksmodel.cpp" line="153"/>
         <source>Title</source>
         <translation>제목</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarksmodel.cpp" line="151"/>
+        <location filename="../bookmarks/bookmarksmodel.cpp" line="155"/>
         <source>Address</source>
         <translation>주소</translation>
     </message>
@@ -435,27 +215,27 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BookmarksToolBar</name>
     <message>
-        <location filename="bookmarks/bookmarkstoolbar.cpp" line="63"/>
+        <location filename="../bookmarks/bookmarkstoolbar.cpp" line="78"/>
         <source>Open</source>
         <translation>열기</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarkstoolbar.cpp" line="66"/>
+        <location filename="../bookmarks/bookmarkstoolbar.cpp" line="81"/>
         <source>Open in New &amp;Tab</source>
         <translation>새 탭에서 열기 (&amp;T)</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarkstoolbar.cpp" line="72"/>
+        <location filename="../bookmarks/bookmarkstoolbar.cpp" line="87"/>
         <source>Remove</source>
         <translation>제거</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarkstoolbar.cpp" line="78"/>
+        <location filename="../bookmarks/bookmarkstoolbar.cpp" line="93"/>
         <source>Add Bookmark...</source>
         <translation>북마크 추가...</translation>
     </message>
     <message>
-        <location filename="bookmarks/bookmarkstoolbar.cpp" line="79"/>
+        <location filename="../bookmarks/bookmarkstoolbar.cpp" line="94"/>
         <source>Add Folder...</source>
         <translation>폴더 추가...</translation>
     </message>
@@ -463,504 +243,472 @@ p, li { white-space: pre-wrap; }
 <context>
     <name>BrowserApplication</name>
     <message>
-        <location filename="browserapplication.cpp" line="288"/>
+        <location filename="../browserapplication.cpp" line="379"/>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
         <translation>지금 %1 개의 창과 %2 개의 탭이 열려 있습니다.
 모든 창과 탭을 닫고 종료하시겠습니까?</translation>
     </message>
     <message>
-        <location filename="browserapplication.cpp" line="464"/>
+        <location filename="../browserapplication.cpp" line="553"/>
         <source>Restore failed</source>
         <translation>복원 실패함</translation>
     </message>
     <message>
-        <location filename="browserapplication.cpp" line="465"/>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora가 세션을 복원하는 과정에서 동작을 정지하였습니다. 다시 시도할까요?</translation>
+        <location filename="../browserapplication.cpp" line="554"/>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>BrowserMainWindow</name>
     <message>
-        <location filename="browsermainwindow.cpp" line="880"/>
+        <location filename="../browsermainwindow.cpp" line="857"/>
         <source>Hide Toolbar</source>
         <translation>도구 바 숨기기</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="880"/>
+        <location filename="../browsermainwindow.cpp" line="857"/>
         <source>Show Toolbar</source>
         <translation>도구 바 보이기</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="881"/>
+        <location filename="../browsermainwindow.cpp" line="858"/>
         <source>Hide Bookmarks Bar</source>
         <translation>북마크 바 숨기기</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="881"/>
+        <location filename="../browsermainwindow.cpp" line="858"/>
         <source>Show Bookmarks Bar</source>
         <translation>북마크 바 보이기</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="882"/>
+        <location filename="../browsermainwindow.cpp" line="859"/>
         <source>Hide Status Bar</source>
         <translation>상태 바 숨기기</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="882"/>
+        <location filename="../browsermainwindow.cpp" line="859"/>
         <source>Show Status Bar</source>
         <translation>상태 바 보이기</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="901"/>
+        <location filename="../browsermainwindow.cpp" line="878"/>
         <source>Default</source>
         <translation>기본값</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="931"/>
+        <location filename="../browsermainwindow.cpp" line="908"/>
         <source>&amp;File</source>
         <translation>파일 (&amp;F)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="932"/>
+        <location filename="../browsermainwindow.cpp" line="909"/>
         <source>&amp;New Window</source>
         <translation>새 창 열기 (&amp;N)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="933"/>
+        <location filename="../browsermainwindow.cpp" line="910"/>
         <source>&amp;Open File...</source>
         <translation>파일 열기 (&amp;O)...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="934"/>
+        <location filename="../browsermainwindow.cpp" line="911"/>
         <source>Open &amp;Location...</source>
         <translation>경로 열기 (&amp;L)...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="935"/>
+        <location filename="../browsermainwindow.cpp" line="912"/>
         <source>&amp;Save As...</source>
         <translation>새 이름으로 저장 (&amp;S)...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="936"/>
+        <location filename="../browsermainwindow.cpp" line="913"/>
         <source>&amp;Import Bookmarks...</source>
         <translation>북마크 목록 가져오기 (&amp;I)...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="937"/>
+        <location filename="../browsermainwindow.cpp" line="914"/>
         <source>&amp;Export Bookmarks...</source>
         <translation>북마크 목록 내보내기 (&amp;E)...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="938"/>
+        <location filename="../browsermainwindow.cpp" line="915"/>
         <source>P&amp;rint Preview...</source>
-        <translation>인쇄 미리보기 (&amp;R)...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="939"/>
+        <location filename="../browsermainwindow.cpp" line="916"/>
         <source>&amp;Print...</source>
-        <translation>인쇄 (&amp;P)...</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="940"/>
+        <location filename="../browsermainwindow.cpp" line="917"/>
         <source>Private &amp;Browsing...</source>
         <translation>개인정보 보호 브라우징 (&amp;B)...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="941"/>
+        <location filename="../browsermainwindow.cpp" line="918"/>
         <source>Close Window</source>
         <translation>창 닫기</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="942"/>
+        <location filename="../browsermainwindow.cpp" line="919"/>
         <source>&amp;Quit</source>
         <translation>종료 (&amp;Q)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="944"/>
+        <location filename="../browsermainwindow.cpp" line="921"/>
         <source>&amp;Edit</source>
         <translation>편집 (&amp;E)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="945"/>
+        <location filename="../browsermainwindow.cpp" line="922"/>
         <source>&amp;Undo</source>
         <translation>되돌리기 (&amp;U)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="946"/>
+        <location filename="../browsermainwindow.cpp" line="923"/>
         <source>&amp;Redo</source>
         <translation>다시하기 (&amp;R)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="947"/>
+        <location filename="../browsermainwindow.cpp" line="924"/>
         <source>Cu&amp;t</source>
         <translation>잘라내기 (&amp;T)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="948"/>
+        <location filename="../browsermainwindow.cpp" line="925"/>
         <source>&amp;Copy</source>
         <translation>복사 (&amp;C)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="949"/>
+        <location filename="../browsermainwindow.cpp" line="926"/>
         <source>&amp;Paste</source>
         <translation>붙여넣기 (&amp;P)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="950"/>
+        <location filename="../browsermainwindow.cpp" line="927"/>
         <source>Select &amp;All</source>
         <translation>모두 선택 (&amp;A)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="951"/>
+        <location filename="../browsermainwindow.cpp" line="928"/>
         <source>&amp;Find</source>
         <translation>찾기 (&amp;F)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="952"/>
+        <location filename="../browsermainwindow.cpp" line="929"/>
         <source>Find Nex&amp;t</source>
         <translation>다음 항목 찾기 (&amp;T)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="953"/>
+        <location filename="../browsermainwindow.cpp" line="930"/>
         <source>Find P&amp;revious</source>
         <translation>이전 항목 찾기 (&amp;R)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="955"/>
+        <location filename="../browsermainwindow.cpp" line="932"/>
         <source>&amp;View</source>
         <translation>보기 (&amp;V)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="956"/>
+        <location filename="../browsermainwindow.cpp" line="933"/>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="957"/>
+        <location filename="../browsermainwindow.cpp" line="934"/>
         <source>Alt+Ctrl+B</source>
         <translation>Alt+Ctrl+B</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="958"/>
+        <location filename="../browsermainwindow.cpp" line="935"/>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="959"/>
+        <location filename="../browsermainwindow.cpp" line="936"/>
         <source>Show Menu Bar</source>
         <translation>메뉴 바 보이기</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="960"/>
+        <location filename="../browsermainwindow.cpp" line="937"/>
         <source>&amp;Reload Page</source>
         <translation>페이지 새로 고침 (&amp;R)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="961"/>
+        <location filename="../browsermainwindow.cpp" line="938"/>
         <source>&amp;Stop</source>
         <translation>중지 (&amp;S)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="962"/>
+        <location filename="../browsermainwindow.cpp" line="939"/>
         <source>Zoom &amp;In</source>
         <translation>확대 (&amp;I)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="963"/>
+        <location filename="../browsermainwindow.cpp" line="940"/>
         <source>Zoom &amp;Normal</source>
         <translation>기본 배율로 (&amp;N)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="964"/>
+        <location filename="../browsermainwindow.cpp" line="941"/>
         <source>Zoom &amp;Out</source>
         <translation>축소 (&amp;O)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="965"/>
+        <location filename="../browsermainwindow.cpp" line="942"/>
         <source>Zoom &amp;Text Only</source>
         <translation>글자만 확대 (&amp;T)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="966"/>
+        <location filename="../browsermainwindow.cpp" line="943"/>
         <source>Page S&amp;ource</source>
         <translation>페이지 소스 (&amp;O)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="967"/>
+        <location filename="../browsermainwindow.cpp" line="944"/>
         <source>Ctrl+Alt+U</source>
         <translation>Ctrl+Alt+U</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="968"/>
+        <location filename="../browsermainwindow.cpp" line="945"/>
         <source>&amp;Full Screen</source>
         <translation>전체 화면 (&amp;F)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="969"/>
+        <location filename="../browsermainwindow.cpp" line="946"/>
         <source>Text Encoding</source>
         <translation>문자 인코딩</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="971"/>
+        <location filename="../browsermainwindow.cpp" line="948"/>
         <source>Hi&amp;story</source>
         <translation>기록 (&amp;S)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="972"/>
+        <location filename="../browsermainwindow.cpp" line="949"/>
         <source>Back</source>
         <translation>뒤로</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="973"/>
+        <location filename="../browsermainwindow.cpp" line="950"/>
         <source>Forward</source>
         <translation>앞으로</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="974"/>
+        <location filename="../browsermainwindow.cpp" line="951"/>
         <source>Home</source>
         <translation>홈</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="975"/>
+        <location filename="../browsermainwindow.cpp" line="952"/>
         <source>Restore Last Session</source>
         <translation>마지막 세션 복원</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="977"/>
-        <location filename="browsermainwindow.cpp" line="1003"/>
+        <location filename="../browsermainwindow.cpp" line="954"/>
+        <location filename="../browsermainwindow.cpp" line="978"/>
         <source>&amp;Bookmarks</source>
         <translation>북마크 목록 (&amp;B)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="978"/>
+        <location filename="../browsermainwindow.cpp" line="955"/>
         <source>Show All Bookmarks...</source>
         <translation>모든 북마크 목록 보기...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="979"/>
+        <location filename="../browsermainwindow.cpp" line="956"/>
         <source>Add Bookmark...</source>
         <translation>북마크 추가...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="980"/>
+        <location filename="../browsermainwindow.cpp" line="957"/>
         <source>Add Folder...</source>
         <translation>폴더 추가...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="982"/>
+        <location filename="../browsermainwindow.cpp" line="959"/>
         <source>&amp;Window</source>
         <translation>창 (&amp;W)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="984"/>
+        <location filename="../browsermainwindow.cpp" line="961"/>
         <source>&amp;Tools</source>
         <translation>도구 (&amp;T)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="985"/>
+        <location filename="../browsermainwindow.cpp" line="962"/>
         <source>Web &amp;Search</source>
         <translation>웹 검색 (&amp;S)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="986"/>
+        <location filename="../browsermainwindow.cpp" line="963"/>
         <source>Ctrl+K</source>
         <comment>Web Search</comment>
         <translation>Ctrl+K</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="987"/>
+        <location filename="../browsermainwindow.cpp" line="964"/>
         <source>&amp;Clear Private Data</source>
         <translation>개인정보 데이터 지우기 (&amp;C)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="988"/>
+        <location filename="../browsermainwindow.cpp" line="965"/>
         <source>Ctrl+Shift+Delete</source>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="989"/>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>웹 속성 도구 활성화 (&amp;I)</translation>
+        <location filename="../browsermainwindow.cpp" line="1150"/>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="990"/>
+        <location filename="../browsermainwindow.cpp" line="966"/>
         <source>Options...</source>
         <translation>옵션...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="991"/>
+        <location filename="../browsermainwindow.cpp" line="967"/>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="992"/>
+        <location filename="../browsermainwindow.cpp" line="968"/>
         <source>Configure Search Engines...</source>
         <translation>검색 엔진 설정...</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="993"/>
+        <location filename="../browsermainwindow.cpp" line="969"/>
         <source>User Agent</source>
         <translation>사용자 에이전트</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="994"/>
-        <source>&amp;Ad Block...</source>
-        <translation>광고 차단 (&amp;A)...</translation>
-    </message>
-    <message>
-        <location filename="browsermainwindow.cpp" line="996"/>
+        <location filename="../browsermainwindow.cpp" line="971"/>
         <source>&amp;Help</source>
         <translation>도움말 (&amp;H)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="997"/>
+        <location filename="../browsermainwindow.cpp" line="972"/>
         <source>Switch application language </source>
         <translation>응용 프로그램 언어 변경 </translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="998"/>
+        <location filename="../browsermainwindow.cpp" line="973"/>
         <source>About &amp;Qt</source>
         <translation>Qt 에 대하여 (&amp;Q)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="999"/>
+        <location filename="../browsermainwindow.cpp" line="974"/>
         <source>About &amp;%1</source>
         <comment>About Browser</comment>
         <translation>&amp;%1에 대하여</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1002"/>
+        <location filename="../browsermainwindow.cpp" line="977"/>
         <source>Navigation</source>
         <translation>탐색</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1005"/>
+        <location filename="../browsermainwindow.cpp" line="980"/>
         <source>Reload / Stop</source>
         <translation>새로 고침 / 중지</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1175"/>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
-    <message>
-        <location filename="browsermainwindow.cpp" line="1201"/>
+        <location filename="../browsermainwindow.cpp" line="1176"/>
         <source>Open Web Resource</source>
         <translation>웹 리소스 열기</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1202"/>
+        <location filename="../browsermainwindow.cpp" line="1177"/>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>웹 리소스 (*.html *.htm *.svg *.png *.gif *.svgz);;모든 파일 (*.*)</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1231"/>
-        <source>Print Document</source>
-        <translation>문서 인쇄</translation>
-    </message>
-    <message>
-        <location filename="browsermainwindow.cpp" line="1240"/>
+        <location filename="../browsermainwindow.cpp" line="1241"/>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>개인정보 보호 브라우징으로 전환할까요?</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1241"/>
+        <location filename="../browsermainwindow.cpp" line="1242"/>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>개인정보 보호 브라우징으로 전환하게 되면 개인정보를 침해할 수 있는 일부 기능은 비활성화됩니다.</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1244"/>
+        <location filename="../browsermainwindow.cpp" line="1245"/>
         <source>Webpages are not added to the history.</source>
         <translation>웹 페이지가 기록에 추가되지 않습니다.</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1245"/>
+        <location filename="../browsermainwindow.cpp" line="1246"/>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>다운로드 목록 창의 항목은 자동으로 제거됩니다.</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1246"/>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>새 쿠키는 저장하지 않으며, 현재 쿠키도 접근할 수 없습니다.</translation>
-    </message>
-    <message>
-        <location filename="browsermainwindow.cpp" line="1247"/>
+        <location filename="../browsermainwindow.cpp" line="1247"/>
         <source>Site icons won&apos;t be stored.</source>
         <translation>사이트 아이콘이 저장되지 않습니다.</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1248"/>
+        <location filename="../browsermainwindow.cpp" line="1248"/>
         <source>Session won&apos;t be saved.</source>
         <translation>세션이 저장되지 않습니다.</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1249"/>
+        <location filename="../browsermainwindow.cpp" line="1249"/>
         <source>Searches are not added to the pop-up menu in the search box.</source>
         <translation>검색 상자 안에서 이루어진 검색은 팝업 메뉴에 추가되지 않습니다.</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1250"/>
+        <location filename="../browsermainwindow.cpp" line="1250"/>
         <source>No new network cache is written to disk.</source>
         <translation>디스크에 새로운 네트워크 캐시를 저장하지 않습니다.</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1252"/>
+        <location filename="../browsermainwindow.cpp" line="1252"/>
         <source>Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
         <translation>창을 닫을 때까지 열었던 페이지는 &quot;뒤로&quot; &quot;앞으로&quot; 버튼을 클릭하면 언제든지 접근할 수 있습니다.</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1258"/>
+        <location filename="../browsermainwindow.cpp" line="1258"/>
         <source>Private Browsing</source>
         <translation>개인정보 보호 브라우징</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1298"/>
+        <location filename="../browsermainwindow.cpp" line="1298"/>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>모든 탭을 닫고 종료하시겠습니까? 지금 %1 개의 탭이 열려 있습니다.</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1424"/>
-        <source>Web Inspector</source>
-        <translation>웹 속성 도구</translation>
-    </message>
-    <message>
-        <location filename="browsermainwindow.cpp" line="1425"/>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>웹 속성 도구가 페이지를 올바르게 조사하려면 페이지가 열리기 전에 활성화되어야 합니다.
-지금 모든 페이지를 새로 고칠까요?</translation>
-    </message>
-    <message>
-        <location filename="browsermainwindow.cpp" line="1465"/>
+        <location filename="../browsermainwindow.cpp" line="1461"/>
         <source>Stop loading the current page</source>
         <translation>이 페이지를 불러오는 것을 중단합니다</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1466"/>
+        <location filename="../browsermainwindow.cpp" line="1462"/>
         <source>Stop</source>
         <translation>중지</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1468"/>
+        <location filename="../browsermainwindow.cpp" line="1464"/>
         <source>Reload the current page</source>
         <translation>이 페이지를 새로 고칩니다</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1469"/>
+        <location filename="../browsermainwindow.cpp" line="1465"/>
         <source>Reload</source>
         <translation>새로 고침</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1536"/>
+        <location filename="../browsermainwindow.cpp" line="1532"/>
         <source>Downloads</source>
         <translation>다운로드 목록</translation>
     </message>
     <message>
-        <location filename="browsermainwindow.cpp" line="1536"/>
+        <location filename="../browsermainwindow.cpp" line="1532"/>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
         <translation>Ctrl+Y</translation>
@@ -969,7 +717,7 @@ Do you want to reload all pages?</source>
 <context>
     <name>ClearButton</name>
     <message>
-        <location filename="clearbutton.cpp" line="38"/>
+        <location filename="../clearbutton.cpp" line="38"/>
         <source>Clear</source>
         <translation>지우기</translation>
     </message>
@@ -977,264 +725,55 @@ Do you want to reload all pages?</source>
 <context>
     <name>ClearPrivateData</name>
     <message>
-        <location filename="clearprivatedata.cpp" line="43"/>
+        <location filename="../clearprivatedata.cpp" line="41"/>
         <source>Clear Private Data</source>
         <translation>개인정보 데이터 지우기</translation>
     </message>
     <message>
-        <location filename="clearprivatedata.cpp" line="46"/>
+        <location filename="../clearprivatedata.cpp" line="44"/>
         <source>Clear the following items:</source>
         <translation>다음 항목이 지워집니다.</translation>
     </message>
     <message>
-        <location filename="clearprivatedata.cpp" line="51"/>
+        <location filename="../clearprivatedata.cpp" line="49"/>
         <source>&amp;Browsing History</source>
         <translation>웹 브라우징 기록 (&amp;B)</translation>
     </message>
     <message>
-        <location filename="clearprivatedata.cpp" line="55"/>
+        <location filename="../clearprivatedata.cpp" line="53"/>
         <source>&amp;Download History</source>
         <translation>다운로드한 기록 (&amp;D)</translation>
     </message>
     <message>
-        <location filename="clearprivatedata.cpp" line="59"/>
+        <location filename="../clearprivatedata.cpp" line="57"/>
         <source>&amp;Search History</source>
         <translation>검색한 기록 (&amp;S)</translation>
     </message>
     <message>
-        <location filename="clearprivatedata.cpp" line="63"/>
-        <source>&amp;Cookies</source>
-        <translation>쿠키 (&amp;C)</translation>
-    </message>
-    <message>
-        <location filename="clearprivatedata.cpp" line="67"/>
-        <source>C&amp;ached Web Pages</source>
-        <translation>저장된 웹 페이지 (&amp;A)</translation>
-    </message>
-    <message>
-        <location filename="clearprivatedata.cpp" line="75"/>
+        <location filename="../clearprivatedata.cpp" line="61"/>
         <source>Website &amp;Icons</source>
         <translation>웹사이트 아이콘 (&amp;I)</translation>
     </message>
     <message>
-        <location filename="clearprivatedata.cpp" line="81"/>
+        <location filename="../clearprivatedata.cpp" line="67"/>
         <source>Clear &amp;Private Data</source>
         <translation>개인정보 데이터 (&amp;P)</translation>
     </message>
     <message>
-        <location filename="clearprivatedata.cpp" line="83"/>
+        <location filename="../clearprivatedata.cpp" line="69"/>
         <source>&amp;Cancel</source>
         <translation>취소 (&amp;C)</translation>
     </message>
 </context>
-<context>
-    <name>ClickToFlash</name>
-    <message>
-        <location filename="qwebplugins/clicktoflash/clicktoflash.ui" line="43"/>
-        <source>Load Flash</source>
-        <translation>플래시 불러오기</translation>
-    </message>
-    <message>
-        <location filename="qwebplugins/clicktoflash/clicktoflash.cpp" line="57"/>
-        <source>Load</source>
-        <translation>불러오기</translation>
-    </message>
-    <message>
-        <location filename="qwebplugins/clicktoflash/clicktoflash.cpp" line="58"/>
-        <source>Load All</source>
-        <translation>모두 불러오기</translation>
-    </message>
-    <message>
-        <location filename="qwebplugins/clicktoflash/clicktoflash.cpp" line="61"/>
-        <source>Add %1 to Whitelist</source>
-        <translation>%1 을(를) 허용 목록에 추가</translation>
-    </message>
-    <message>
-        <location filename="qwebplugins/clicktoflash/clicktoflash.cpp" line="62"/>
-        <source>Remove from Whitelist</source>
-        <translation>허용 목록에서 제거</translation>
-    </message>
-    <message>
-        <location filename="qwebplugins/clicktoflash/clicktoflash.cpp" line="67"/>
-        <source>Settings</source>
-        <translation>설정</translation>
-    </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
-    <message>
-        <location filename="qwebplugins/clicktoflash/clicktoflashsettings.ui" line="17"/>
-        <source>Whitelist sites</source>
-        <translation>사이트 허용 목록</translation>
-    </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
-    <message>
-        <location filename="network/cookiejar/cookieexceptionsmodel.cpp" line="93"/>
-        <source>Website</source>
-        <translation>웹사이트</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookieexceptionsmodel.cpp" line="95"/>
-        <source>Rule</source>
-        <translation>규칙</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookieexceptionsmodel.cpp" line="115"/>
-        <source>Allow</source>
-        <translation>허용</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookieexceptionsmodel.cpp" line="124"/>
-        <source>Block</source>
-        <translation>차단</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookieexceptionsmodel.cpp" line="133"/>
-        <source>Allow For Session</source>
-        <translation>이 세션에서 허용</translation>
-    </message>
-</context>
-<context>
-    <name>CookieModel</name>
-    <message>
-        <location filename="network/cookiejar/cookiemodel.cpp" line="96"/>
-        <source>Website</source>
-        <translation>웹사이트</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiemodel.cpp" line="98"/>
-        <source>Name</source>
-        <translation>이름</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiemodel.cpp" line="100"/>
-        <source>Path</source>
-        <translation>경로</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiemodel.cpp" line="102"/>
-        <source>Secure</source>
-        <translation>보안</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiemodel.cpp" line="104"/>
-        <source>Expires</source>
-        <translation>만료일</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiemodel.cpp" line="106"/>
-        <source>Contents</source>
-        <translation>내용</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiemodel.cpp" line="149"/>
-        <source>true</source>
-        <translation>안전함</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiemodel.cpp" line="149"/>
-        <source>false</source>
-        <translation>안전하지 않음</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiemodel.cpp" line="151"/>
-        <source>Session cookie</source>
-        <translation>세션 쿠키</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <location filename="network/cookiejar/cookies.ui" line="14"/>
-        <source>Cookies</source>
-        <translation>쿠키 목록</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookies.ui" line="41"/>
-        <source>&amp;Remove</source>
-        <translation>제거 (&amp;R)</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookies.ui" line="48"/>
-        <source>Remove &amp;All Cookies</source>
-        <translation>모든 쿠키 제거 (&amp;A)</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookies.ui" line="55"/>
-        <source>Add &amp;Rule</source>
-        <translation>규칙 추가 (&amp;R)</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <location filename="network/cookiejar/cookiesexceptions.ui" line="13"/>
-        <source>Cookie Exceptions</source>
-        <translation>쿠키 예외 목록</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiesexceptions.ui" line="19"/>
-        <source>New Exception</source>
-        <translation>새 예외 항목</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiesexceptions.ui" line="27"/>
-        <source>Domain:</source>
-        <translation>도메인:</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiesexceptions.ui" line="57"/>
-        <source>Block</source>
-        <translation>차단</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiesexceptions.ui" line="67"/>
-        <source>Allow For Session</source>
-        <translation>이 세션에서 허용</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiesexceptions.ui" line="77"/>
-        <source>Allow</source>
-        <translation>허용</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiesexceptions.ui" line="89"/>
-        <source>Exceptions</source>
-        <translation>예외 목록</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiesexceptions.ui" line="114"/>
-        <source>&amp;Remove</source>
-        <translation>제거 (&amp;R)</translation>
-    </message>
-    <message>
-        <location filename="network/cookiejar/cookiesexceptions.ui" line="121"/>
-        <source>Remove &amp;All</source>
-        <translation>모두 제거 (&amp;A)</translation>
-    </message>
-</context>
 <context>
     <name>DownloadDialog</name>
     <message>
-        <location filename="downloads.ui" line="14"/>
-        <location filename="downloadmanager.cpp" line="606"/>
+        <location filename="../downloadmanager.cpp" line="495"/>
         <source>Downloads</source>
         <translation>다운로드 목록</translation>
     </message>
     <message>
-        <location filename="downloads.ui" line="44"/>
-        <source>Clean up</source>
-        <translation>비우기</translation>
-    </message>
-    <message>
-        <location filename="downloads.ui" line="66"/>
-        <source>0 Items</source>
-        <translation>0 항목</translation>
-    </message>
-    <message>
-        <location filename="downloadmanager.cpp" line="604"/>
+        <location filename="../downloadmanager.cpp" line="493"/>
         <source>Downloading %1</source>
         <translation>%1 다운로드 중</translation>
     </message>
@@ -1242,189 +781,147 @@ Do you want to reload all pages?</source>
 <context>
     <name>DownloadItem</name>
     <message>
-        <location filename="downloaditem.ui" line="25"/>
-        <source>Ico</source>
-        <translation>아이콘</translation>
+        <location filename="../downloadmanager.cpp" line="203"/>
+        <source>Save File</source>
+        <translation>파일 저장</translation>
+    </message>
+    <message>
+        <location filename="../downloadmanager.cpp" line="207"/>
+        <source>Download canceled: %1</source>
+        <translation>다운로드 취소됨: %1</translation>
     </message>
     <message>
-        <location filename="downloaditem.ui" line="40"/>
-        <source>Filename</source>
-        <translation>파일명</translation>
+        <location filename="../downloadmanager.cpp" line="285"/>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloaditem.ui" line="87"/>
-        <source>Try Again</source>
-        <translation>재시도</translation>
+        <location filename="../downloadmanager.cpp" line="288"/>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloaditem.ui" line="94"/>
-        <source>Stop</source>
-        <translation>중지</translation>
+        <location filename="../downloadmanager.cpp" line="300"/>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloaditem.ui" line="101"/>
-        <source>Open</source>
-        <translation>열기</translation>
+        <location filename="../downloadmanager.cpp" line="303"/>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="170"/>
-        <source>Save File</source>
-        <translation>파일 저장</translation>
+        <location filename="../downloadmanager.cpp" line="310"/>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="175"/>
-        <source>Download canceled: %1</source>
-        <translation>다운로드 취소됨: %1</translation>
+        <source>bytes</source>
+        <translation type="obsolete">바이트</translation>
+    </message>
+    <message>
+        <source>kB</source>
+        <translation type="obsolete">KB</translation>
+    </message>
+    <message>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="191"/>
         <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>다운로드할 디렉토리 (%1) 을(를) 만들 수 없었습니다.</translation>
+        <translation type="vanished">다운로드할 디렉토리 (%1) 을(를) 만들 수 없었습니다.</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="293"/>
         <source>Error opening output file: %1</source>
-        <translation>출력 파일 열기 오류: %1</translation>
+        <translation type="vanished">출력 파일 열기 오류: %1</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="302"/>
         <source>Error saving: %1</source>
-        <translation>저장 오류: %1</translation>
+        <translation type="vanished">저장 오류: %1</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="318"/>
         <source>Network Error: %1</source>
-        <translation>네트워크 오류: %1</translation>
+        <translation type="vanished">네트워크 오류: %1</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="414"/>
         <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%2 중 %1 (%3/초) - %4</translation>
+        <translation type="vanished">%2 중 %1 (%3/초) - %4</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="416"/>
+        <location filename="../downloadmanager.cpp" line="305"/>
         <source>?</source>
         <translation>?</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="423"/>
         <source>%1 of %2 - Download Complete</source>
-        <translation>%2 중 %1 (%3/초) - 다운로드를 완료하였습니다.</translation>
+        <translation type="vanished">%2 중 %1 (%3/초) - 다운로드를 완료하였습니다.</translation>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message>
-        <location filename="downloadmanager.cpp" line="510"/>
+        <location filename="../downloadmanager.cpp" line="422"/>
         <source>There are %1 downloads in progress
 Do you want to quit anyway?</source>
         <translation>지금 %1 개의 다운로드 항목이 완료되지 않았습니다.
 다운로드를 중지하고 종료하시겠습니까?</translation>
     </message>
     <message numerus="yes">
-        <location filename="downloadmanager.cpp" line="749"/>
+        <location filename="../downloadmanager.cpp" line="634"/>
         <source>%n Download(s)</source>
         <translation>
             <numerusform>%n 개의 다운로드 항목</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="downloadmanager.cpp" line="771"/>
+        <location filename="../downloadmanager.cpp" line="656"/>
         <source>%n minutes remaining</source>
         <translation>
             <numerusform>%n 분 남음</numerusform>
         </translation>
     </message>
     <message numerus="yes">
-        <location filename="downloadmanager.cpp" line="775"/>
+        <location filename="../downloadmanager.cpp" line="660"/>
         <source>%n seconds remaining</source>
         <translation>
             <numerusform>%n 초 남음</numerusform>
         </translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="788"/>
+        <location filename="../downloadmanager.cpp" line="673"/>
         <source>bytes</source>
         <translation>바이트</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="791"/>
+        <location filename="../downloadmanager.cpp" line="676"/>
         <source>kB</source>
         <translation>KB</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="794"/>
+        <location filename="../downloadmanager.cpp" line="679"/>
         <source>MB</source>
         <translation>MB</translation>
     </message>
     <message>
-        <location filename="downloadmanager.cpp" line="797"/>
+        <location filename="../downloadmanager.cpp" line="682"/>
         <source>GB</source>
         <translation>GB</translation>
     </message>
 </context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <location filename="network/fileaccesshandler.cpp" line="69"/>
-        <source>No Error</source>
-        <translation>오류 없음</translation>
-    </message>
-    <message>
-        <location filename="network/fileaccesshandler.cpp" line="119"/>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>%1 을(를) 열 수 없습니다. 파일이나 디렉토리가 아닙니다.</translation>
-    </message>
-    <message>
-        <location filename="network/fileaccesshandler.cpp" line="125"/>
-        <source>Unable to read %1</source>
-        <translation>%1 을 읽을 수 없습니다</translation>
-    </message>
-    <message>
-        <location filename="network/fileaccesshandler.cpp" line="136"/>
-        <source>Contents of %1</source>
-        <translation>%1 의 내용</translation>
-    </message>
-    <message>
-        <location filename="network/fileaccesshandler.cpp" line="178"/>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <location filename="network/fileaccesshandler.cpp" line="188"/>
-        <source>Show Hidden Files</source>
-        <translation>숨겨진 파일 보기</translation>
-    </message>
-</context>
 <context>
     <name>HistoryDialog</name>
     <message>
-        <location filename="history/history.ui" line="13"/>
-        <source>History</source>
-        <translation>기록</translation>
-    </message>
-    <message>
-        <location filename="history/history.ui" line="40"/>
-        <source>&amp;Remove</source>
-        <translation>제거 (&amp;R)</translation>
-    </message>
-    <message>
-        <location filename="history/history.ui" line="47"/>
-        <source>Remove &amp;All</source>
-        <translation>모두 제거 (&amp;A)</translation>
-    </message>
-    <message>
-        <location filename="history/history.cpp" line="450"/>
+        <location filename="../history/history.cpp" line="460"/>
         <source>Open</source>
         <translation>열기</translation>
     </message>
     <message>
-        <location filename="history/history.cpp" line="452"/>
+        <location filename="../history/history.cpp" line="462"/>
         <source>Copy</source>
         <translation>복사</translation>
     </message>
     <message>
-        <location filename="history/history.cpp" line="454"/>
+        <location filename="../history/history.cpp" line="464"/>
         <source>Delete</source>
         <translation>삭제</translation>
     </message>
@@ -1432,22 +929,22 @@ Do you want to quit anyway?</source>
 <context>
     <name>HistoryMenu</name>
     <message>
-        <location filename="history/history.cpp" line="375"/>
+        <location filename="../history/history.cpp" line="380"/>
         <source>Show All History</source>
         <translation>모든 기록 보기</translation>
     </message>
     <message>
-        <location filename="history/history.cpp" line="382"/>
+        <location filename="../history/history.cpp" line="387"/>
         <source>Clear History...</source>
         <translation>기록 비우기...</translation>
     </message>
     <message>
-        <location filename="history/history.cpp" line="398"/>
+        <location filename="../history/history.cpp" line="403"/>
         <source>Clear History</source>
         <translation>기록 비우기</translation>
     </message>
     <message>
-        <location filename="history/history.cpp" line="398"/>
+        <location filename="../history/history.cpp" line="403"/>
         <source>Do you want to clear the history?</source>
         <translation>기록을 비우시겠습니까?</translation>
     </message>
@@ -1455,12 +952,12 @@ Do you want to quit anyway?</source>
 <context>
     <name>HistoryModel</name>
     <message>
-        <location filename="history/history.cpp" line="133"/>
+        <location filename="../history/history.cpp" line="135"/>
         <source>Title</source>
         <translation>제목</translation>
     </message>
     <message>
-        <location filename="history/history.cpp" line="134"/>
+        <location filename="../history/history.cpp" line="137"/>
         <source>Address</source>
         <translation>주소</translation>
     </message>
@@ -1468,12 +965,12 @@ Do you want to quit anyway?</source>
 <context>
     <name>HistoryTreeModel</name>
     <message>
-        <location filename="history/history.cpp" line="751"/>
+        <location filename="../history/history.cpp" line="763"/>
         <source>Earlier Today</source>
         <translation>방금 전</translation>
     </message>
     <message numerus="yes">
-        <location filename="history/history.cpp" line="755"/>
+        <location filename="../history/history.cpp" line="767"/>
         <source>%n item(s)</source>
         <translation>
             <numerusform>%n 항목</numerusform>
@@ -1481,158 +978,81 @@ Do you want to quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <location filename="webpage.cpp" line="63"/>
-        <source>Welcome to Arora!</source>
-        <translation>Arora 를 사용해 주셔서 감사합니다.</translation>
+        <location filename="../webpage.cpp" line="54"/>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webpage.cpp" line="64"/>
-        <source>Arora Start</source>
-        <translation>Arora 시작</translation>
+        <location filename="../webpage.cpp" line="55"/>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webpage.cpp" line="65"/>
+        <location filename="../webpage.cpp" line="56"/>
         <source>Search!</source>
-        <translation>검색</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webpage.cpp" line="66"/>
+        <location filename="../webpage.cpp" line="57"/>
         <source>Search the web with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webpage.cpp" line="67"/>
+        <location filename="../webpage.cpp" line="58"/>
         <source>Search results provided by</source>
-        <translation>검색 결과 제공자: </translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="webpage.cpp" line="68"/>
-        <source>About Arora</source>
-        <translation>Arora에 대하여</translation>
+        <location filename="../webpage.cpp" line="59"/>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageManager</name>
     <message>
-        <location filename="utils/languagemanager.cpp" line="240"/>
+        <location filename="../utils/languagemanager.cpp" line="240"/>
         <source>No translation files are installed at %1.</source>
         <translation>언어 파일이 %1 에 설치되지 않았습니다.</translation>
     </message>
     <message>
-        <location filename="utils/languagemanager.cpp" line="268"/>
+        <location filename="../utils/languagemanager.cpp" line="268"/>
         <source>Choose language</source>
         <translation>언어 선택</translation>
     </message>
     <message>
-        <location filename="utils/languagemanager.cpp" line="269"/>
+        <location filename="../utils/languagemanager.cpp" line="269"/>
         <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
         <translation>&lt;p&gt;운영체제 기본 언어가 아닌 다른 언어라도&lt;br&gt;적용하여 실행할 수 있습니다.&lt;/p&gt;&lt;p&gt;사용할 언어를 선택하여 주십시요.&lt;/p&gt;</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <location filename="network/networkaccessmanager.cpp" line="215"/>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&quot;%1&quot; 에서 사용하는 사용자명과 암호를 %2 에 입력하십시오.&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <location filename="network/networkaccessmanager.cpp" line="242"/>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;&quot;%1&quot; 프록시 서버에 다음을 사용하여 연결:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <location filename="network/networkaccessmanager.cpp" line="259"/>
-        <source>Issuer: %1</source>
-        <translation>발행자: %1</translation>
-    </message>
-    <message>
-        <location filename="network/networkaccessmanager.cpp" line="261"/>
-        <source>Not valid before: %1</source>
-        <translation>%1 부터 유효함</translation>
-    </message>
-    <message>
-        <location filename="network/networkaccessmanager.cpp" line="262"/>
-        <source>Valid until: %1</source>
-        <translation>%1 까지 유효함</translation>
-    </message>
-    <message>
-        <location filename="network/networkaccessmanager.cpp" line="268"/>
-        <source>Alternate Names:</source>
-        <translation>별칭:</translation>
-    </message>
-    <message>
-        <location filename="network/networkaccessmanager.cpp" line="307"/>
-        <source> - SSL Errors</source>
-        <translation> - SSL 오류</translation>
-    </message>
-    <message>
-        <location filename="network/networkaccessmanager.cpp" line="308"/>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL 오류:&lt;br/&gt;&lt;br/&gt;&lt;tt&gt;%1&lt;/tt&gt; 에서 발생&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-이 오류를 무시하겠습니까?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <location filename="network/networkaccessmanager.cpp" line="321"/>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;인증서:&lt;br/&gt;%1&lt;br/&gt;이 인증서를 모두 허용하시겠습니까?&lt;/qt&gt;</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
-        <location filename="opensearch/opensearchdialog.ui" line="14"/>
-        <source>OpenSearch Manager</source>
-        <translation>OpenSearch 관리자</translation>
-    </message>
-    <message>
-        <location filename="opensearch/opensearchdialog.ui" line="31"/>
-        <source>&amp;Add</source>
-        <translation>추가 (&amp;A)</translation>
-    </message>
-    <message>
-        <location filename="opensearch/opensearchdialog.ui" line="38"/>
-        <source>&amp;Delete</source>
-        <translation>삭제 (&amp;D)</translation>
-    </message>
-    <message>
-        <location filename="opensearch/opensearchdialog.ui" line="45"/>
-        <source>&amp;Restore Defaults</source>
-        <translation>기본값으로 (&amp;R)</translation>
-    </message>
-    <message>
-        <location filename="opensearch/opensearchdialog.ui" line="64"/>
-        <source>&amp;Close</source>
-        <translation>닫기 (&amp;C)</translation>
-    </message>
-    <message>
-        <location filename="opensearch/opensearchdialog.cpp" line="61"/>
+        <location filename="../opensearch/opensearchdialog.cpp" line="61"/>
         <source>Open File</source>
         <translation>파일 열기</translation>
     </message>
     <message>
-        <location filename="opensearch/opensearchdialog.cpp" line="63"/>
+        <location filename="../opensearch/opensearchdialog.cpp" line="63"/>
         <source>OpenSearch</source>
         <translation>OpenSearch</translation>
     </message>
     <message>
-        <location filename="opensearch/opensearchdialog.cpp" line="67"/>
-        <location filename="opensearch/opensearchdialog.cpp" line="76"/>
+        <location filename="../opensearch/opensearchdialog.cpp" line="67"/>
+        <location filename="../opensearch/opensearchdialog.cpp" line="76"/>
         <source>Error</source>
         <translation>오류</translation>
     </message>
     <message>
-        <location filename="opensearch/opensearchdialog.cpp" line="68"/>
+        <location filename="../opensearch/opensearchdialog.cpp" line="68"/>
         <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
         <translation>%1 은(는) 올바른 OpenSearch 1.1 규격 파일이 아니거나 이미 목록에 있습니다.</translation>
     </message>
     <message>
-        <location filename="opensearch/opensearchdialog.cpp" line="77"/>
+        <location filename="../opensearch/opensearchdialog.cpp" line="77"/>
         <source>You must have at least one search engine in here.</source>
         <translation>하나 이상의 검색 엔진이 있어야 합니다.</translation>
     </message>
@@ -1640,27 +1060,27 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
 <context>
     <name>OpenSearchEngineModel</name>
     <message>
-        <location filename="opensearch/opensearchenginemodel.cpp" line="109"/>
+        <location filename="../opensearch/opensearchenginemodel.cpp" line="109"/>
         <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
         <translation>&lt;strong&gt;규격:&lt;/strong&gt; %1</translation>
     </message>
     <message>
-        <location filename="opensearch/opensearchenginemodel.cpp" line="113"/>
+        <location filename="../opensearch/opensearchenginemodel.cpp" line="113"/>
         <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
         <translation>&lt;strong&gt;문장 제안을 제공함&lt;/strong&gt;</translation>
     </message>
     <message>
-        <location filename="opensearch/opensearchenginemodel.cpp" line="127"/>
+        <location filename="../opensearch/opensearchenginemodel.cpp" line="127"/>
         <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation>구분점으로 구분된 단어 목록은 주소 바에 입력할 수 있고, 이 검색 엔진을 사용할 때 검색 규칙에 따라 처리됩니다</translation>
     </message>
     <message>
-        <location filename="opensearch/opensearchenginemodel.cpp" line="165"/>
+        <location filename="../opensearch/opensearchenginemodel.cpp" line="165"/>
         <source>Name</source>
         <translation>이름</translation>
     </message>
     <message>
-        <location filename="opensearch/opensearchenginemodel.cpp" line="167"/>
+        <location filename="../opensearch/opensearchenginemodel.cpp" line="167"/>
         <source>Keywords</source>
         <translation>키워드</translation>
     </message>
@@ -1668,592 +1088,115 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
 <context>
     <name>OpenSearchManager</name>
     <message>
-        <location filename="opensearch/opensearchmanager.cpp" line="312"/>
+        <location filename="../opensearch/opensearchmanager.cpp" line="313"/>
         <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
         <translation>이 검색 엔진 목록을 브라우저에서 이용할 검색 목록에 추가하시겠습니까?&lt;br /&gt;&lt;br /&gt;이름: %1&lt;br /&gt;검색 위치: %2</translation>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
+    <name>PermissionBar</name>
     <message>
-        <location filename="network/passworddialog.ui" line="13"/>
-        <source>Authentication Required</source>
-        <translation>인증이 필요함</translation>
-    </message>
-    <message>
-        <location filename="network/passworddialog.ui" line="21"/>
-        <source>DUMMY ICON</source>
-        <translation>더미 아이콘</translation>
-    </message>
-    <message>
-        <location filename="network/passworddialog.ui" line="34"/>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>텍스트 더미 인트로</translation>
+        <location filename="../permissionbar.cpp" line="92"/>
+        <source>Allow</source>
+        <translation type="unfinished">허용</translation>
     </message>
     <message>
-        <location filename="network/passworddialog.ui" line="43"/>
-        <source>Username:</source>
-        <translation>사용자명:</translation>
+        <location filename="../permissionbar.cpp" line="93"/>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="network/passworddialog.ui" line="53"/>
-        <source>Password:</source>
-        <translation>암호:</translation>
+        <location filename="../permissionbar.cpp" line="111"/>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PlainTextEditSearch</name>
     <message>
-        <location filename="plaintexteditsearch.cpp" line="62"/>
+        <location filename="../plaintexteditsearch.cpp" line="62"/>
         <source>Not Found</source>
         <translation>찾을 수 없음</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <location filename="network/proxy.ui" line="14"/>
-        <source>Proxy Authentication</source>
-        <translation>프록시 서버 인증</translation>
-    </message>
-    <message>
-        <location filename="network/proxy.ui" line="27"/>
-        <source>Connect to proxy</source>
-        <translation>프록시 서버에 연결</translation>
-    </message>
-    <message>
-        <location filename="network/proxy.ui" line="37"/>
-        <source>Username:</source>
-        <translation>사용자명:</translation>
-    </message>
-    <message>
-        <location filename="network/proxy.ui" line="47"/>
-        <source>Password:</source>
-        <translation>암호:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="bookmarks/xbel/xbelreader.cpp" line="111"/>
+        <location filename="../bookmarks/xbel/xbelreader.cpp" line="111"/>
         <source>The file is not an XBEL version 1.0 file.</source>
         <translation>이 파일은 XBEL 1.0 규격 파일이 아닙니다.</translation>
     </message>
     <message>
-        <location filename="bookmarks/xbel/xbelreader.cpp" line="209"/>
+        <location filename="../bookmarks/xbel/xbelreader.cpp" line="209"/>
         <source>Unknown title</source>
         <translation>제목 없음</translation>
     </message>
     <message>
-        <location filename="opensearch/opensearchreader.cpp" line="89"/>
+        <location filename="../opensearch/opensearchreader.cpp" line="89"/>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>이 파일은 OpenSearch 1.1 규격 파일이 아닙니다.</translation>
     </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <location filename="searchbanner.ui" line="51"/>
-        <source>Highlight All</source>
-        <translation>모두 표시</translation>
-    </message>
-    <message>
-        <location filename="searchbanner.ui" line="81"/>
-        <source>Done</source>
-        <translation>완료</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <location filename="searchlineedit.cpp" line="56"/>
-        <source>Search</source>
-        <translation>검색</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <location filename="settings.ui" line="14"/>
-        <source>Preferences</source>
-        <translation>설정</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="34"/>
-        <source>General</source>
-        <translation>일반</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="40"/>
-        <source>On startup:</source>
-        <translation>시작할 때:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="51"/>
-        <source>Show my home page</source>
-        <translation>내 홈 페이지 보이기</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="56"/>
-        <source>Show a blank page</source>
-        <translation>빈 페이지 보이기</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="61"/>
-        <source>Restore windows and tabs from last time</source>
-        <translation>마지막으로 열었던 창과 탭 복원</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="69"/>
-        <source>Home Page:</source>
-        <translation>홈 페이지:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="86"/>
-        <source>Set to current page</source>
-        <translation>현재 페이지로 설정</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="106"/>
-        <source>Remove history items:</source>
-        <translation>기록 항목 제거:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="117"/>
-        <source>After one day</source>
-        <translation>하루마다</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="122"/>
-        <source>After one week</source>
-        <translation>1주마다</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="127"/>
-        <source>After two weeks</source>
-        <translation>2주마다</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="132"/>
-        <source>After one month</source>
-        <translation>1달마다</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="137"/>
-        <source>After one year</source>
-        <translation>1년마다</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="142"/>
-        <source>Manually</source>
-        <translation>수동으로</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="147"/>
-        <source>On application exit</source>
-        <translation>어플리케이션을 종료할 때</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="155"/>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>입력한 URL이 올바르지 않을 때 기본 검색 엔진 사용</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="165"/>
-        <source>Enable access keys</source>
-        <translation>접근 키 활성화</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="172"/>
-        <source>Downloads</source>
-        <translation>다운로드</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="178"/>
-        <source>Ask for a destination each time</source>
-        <translation>다운로드할 경로를 매번 물어봄</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="187"/>
-        <source>Use this destination:</source>
-        <translation>이 경로를 사용:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="204"/>
-        <source>Choose Directory...</source>
-        <translation>디렉토리 선택...</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="215"/>
-        <source>Use this external download program:</source>
-        <translation>다른 다운로드 프로그램 사용:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="225"/>
-        <source>Choose Program...</source>
-        <translation>프로그램 선택...</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="251"/>
-        <source>Appearance</source>
-        <translation>모양새</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="257"/>
-        <source>Standard font:</source>
-        <translation>기본 글꼴:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="286"/>
-        <location filename="settings.ui" line="316"/>
-        <location filename="settings.ui" line="330"/>
-        <source>Select...</source>
-        <translation>선택...</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="293"/>
-        <source>Fixed-width font:</source>
-        <translation>고정폭 글꼴:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="323"/>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>웹 페이지를 볼 언어:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="337"/>
-        <source>Minimum Font size:</source>
-        <translation>글꼴 최소 크기:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="371"/>
-        <source>Privacy</source>
-        <translation>개인 정보</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="377"/>
-        <source>Web Content</source>
-        <translation>웹 항목</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="383"/>
-        <source>Block Popup Windows</source>
-        <translation>팝업 창 차단</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="393"/>
-        <source>Enable Plugins</source>
-        <translation>플러그인 활성화</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="425"/>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
-        <translation>이 옵션을 활성화하면 플래시 객체를 바로 불러들이지 않도록 않도록 설정됩니다. 이 플래시 객체는 각각 버튼으로 대체되며, 사용자가 버튼을 눌러 이 플래시 객체를 불러들일 것인지 선택할 수 있습니다. </translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="428"/>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>플래시 플러그인에 ClickToFlash 사용</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="438"/>
-        <source>Enable Javascript</source>
-        <translation>Javascript 활성화</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="448"/>
-        <source>View Images</source>
-        <translation>이미지 보기</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="458"/>
-        <source>Persistent Data Storage</source>
-        <translation>오프라인 저장소 사용</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="471"/>
-        <source>Cookies</source>
-        <translation>쿠키</translation>
-    </message>
     <message>
-        <location filename="settings.ui" line="477"/>
-        <source>Accept Cookies:</source>
-        <translation>쿠키 허용:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="488"/>
-        <source>Always</source>
-        <translation>항상</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="493"/>
-        <source>Never</source>
-        <translation>안함</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="498"/>
-        <source>Only from sites you navigate to</source>
-        <translation>방문한 사이트만</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="506"/>
-        <source>Exceptions...</source>
-        <translation>예외...</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="513"/>
-        <source>Keep Cookies Until:</source>
-        <translation>쿠키 보존 기한:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="524"/>
-        <source>They expire</source>
-        <translation>사이트가 지정한 만료일</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="529"/>
-        <source>I exit the application</source>
-        <translation>어플리케이션을 닫을 때까지</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="534"/>
-        <source>At most 90 days</source>
-        <translation>90일간</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="542"/>
-        <source>Cookies...</source>
-        <translation>쿠키...</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="562"/>
-        <source>Filter Tracking Cookies</source>
-        <translation>방문자 추적 쿠키 거르기</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="569"/>
-        <source>A cookie session ends:</source>
-        <translation>쿠키 세션 만료일:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="580"/>
-        <source>When I exit the application</source>
-        <translation>어플리케이션을 닫을 때</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="585"/>
-        <source>1 day</source>
-        <translation>1일</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="590"/>
-        <source>2 days</source>
-        <translation>2일</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="595"/>
-        <source>3 days</source>
-        <translation>3일</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="600"/>
-        <source>7 days</source>
-        <translation>7일</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="605"/>
-        <source>30 days</source>
-        <translation>30일</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="630"/>
-        <source>Tabs</source>
-        <translation>탭</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="636"/>
-        <source>Select tabs and windows as they are created</source>
-        <translation>생성된 탭과 창을 보여줌</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="643"/>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>여러 탭과 창을 닫을 때 물어보기</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="653"/>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>각 탭의 닫기 버튼을 단일 닫기 버튼으로 대체</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="663"/>
-        <source>Quit the application when last tab is closed</source>
-        <translation>마지막 탭을 닫았을 때 어플리케이션을 종료</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="673"/>
-        <source>Opening links</source>
-        <translation>링크를 열 방법</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="679"/>
-        <source>Links that want to open in a new window:</source>
-        <translation>새 창으로 링크를 열 때:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="690"/>
-        <location filename="settings.ui" line="724"/>
-        <source>In a new window</source>
-        <translation>새 창 열기</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="695"/>
-        <location filename="settings.ui" line="729"/>
-        <source>In a new selected tab in the current window</source>
-        <translation>현재 창에서 새 탭을 열어 보이기</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="700"/>
-        <location filename="settings.ui" line="734"/>
-        <source>In a new tab in the current window</source>
-        <translation>현재 창에서 새 탭으로 열기</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="705"/>
-        <location filename="settings.ui" line="739"/>
-        <source>In the current tab</source>
-        <translation>현재 탭에서 보이기</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="713"/>
-        <source>Open links from applications:</source>
-        <translation>어플리케이션에서 링크를 열 때:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="764"/>
-        <source>Proxy</source>
-        <translation>프록시</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="770"/>
-        <source>Use proxy server</source>
-        <translation>프록시 서버 사용</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="779"/>
-        <source>Type:</source>
-        <translation>연결 종류:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="790"/>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="795"/>
-        <source>Http (Secure)</source>
-        <translation>Http (보안)</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="800"/>
-        <source>Http (Transparent)</source>
-        <translation>Http (투명)</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="808"/>
-        <source>Host name:</source>
-        <translation>호스트:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="825"/>
-        <source>Port:</source>
-        <translation>포트:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="858"/>
-        <source>User Name:</source>
-        <translation>사용자명:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="875"/>
-        <source>Password:</source>
-        <translation>암호:</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="912"/>
-        <source>AutoFill</source>
-        <translation>자동완성</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="918"/>
-        <source>AutoFill web forms:</source>
-        <translation>웹 폼 자동완성</translation>
-    </message>
-    <message>
-        <location filename="settings.ui" line="931"/>
-        <source>User names and passwords</source>
-        <translation>사용자명과 암호</translation>
+        <location filename="../permissionbar.cpp" line="65"/>
+        <source>use desktop notifications</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="938"/>
-        <source>Edit...</source>
-        <translation>편집...</translation>
+        <location filename="../permissionbar.cpp" line="67"/>
+        <source>use your position</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="972"/>
-        <source>Advanced</source>
-        <translation>고급</translation>
+        <location filename="../permissionbar.cpp" line="69"/>
+        <source>use your microphone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="978"/>
-        <source>Style Sheet:</source>
-        <translation>스타일시트:</translation>
+        <location filename="../permissionbar.cpp" line="71"/>
+        <source>use your camera</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="992"/>
-        <source>Browse...</source>
-        <translation>찾기...</translation>
+        <location filename="../permissionbar.cpp" line="73"/>
+        <source>use your camera and microphone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="settings.ui" line="999"/>
-        <source>Enable network cache</source>
-        <translation>네트워크 캐시 활성화</translation>
+        <location filename="../permissionbar.cpp" line="75"/>
+        <source>lock your mouse</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <location filename="settings.ui" line="1011"/>
-        <source>Maximum Size:</source>
-        <translation>용량 한도:</translation>
+        <location filename="../savepagedialog.cpp" line="91"/>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <location filename="settings.ui" line="1018"/>
-        <source> MB</source>
-        <translation> MB</translation>
+        <location filename="../searchlineedit.cpp" line="56"/>
+        <source>Search</source>
+        <translation>검색</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
     <message>
-        <location filename="settings.cpp" line="457"/>
-        <source>Restart required</source>
-        <translation>다시 시작이 필요함</translation>
-    </message>
-    <message>
-        <location filename="settings.cpp" line="458"/>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>네트워크 캐시 설정이 변경되었습니다. 변경된 설정을 적용하려면 브라우저를 다시 시작해야 합니다.</translation>
-    </message>
-    <message>
-        <location filename="settings.cpp" line="478"/>
+        <location filename="../settings.cpp" line="354"/>
         <source>Choose Directory</source>
         <translation>디렉토리 선택</translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="484"/>
+        <location filename="../settings.cpp" line="360"/>
         <source>Choose Program</source>
         <translation>프로그램 선택</translation>
     </message>
     <message>
-        <location filename="settings.cpp" line="527"/>
+        <location filename="../settings.cpp" line="403"/>
         <source>Choose CSS File</source>
         <translation>CSS 파일 선택</translation>
     </message>
@@ -2261,22 +1204,22 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
 <context>
     <name>SourceViewer</name>
     <message>
-        <location filename="sourceviewer.cpp" line="42"/>
+        <location filename="../sourceviewer.cpp" line="41"/>
         <source>Loading...</source>
         <translation>불러오는 중...</translation>
     </message>
     <message>
-        <location filename="sourceviewer.cpp" line="47"/>
+        <location filename="../sourceviewer.cpp" line="46"/>
         <source>&amp;Edit</source>
         <translation>편집 (&amp;E)</translation>
     </message>
     <message>
-        <location filename="sourceviewer.cpp" line="48"/>
+        <location filename="../sourceviewer.cpp" line="47"/>
         <source>&amp;Find</source>
         <translation>찾기 (&amp;F)</translation>
     </message>
     <message>
-        <location filename="sourceviewer.cpp" line="51"/>
+        <location filename="../sourceviewer.cpp" line="50"/>
         <source>Source of Page %1</source>
         <translation>%1 페이지의 소스</translation>
     </message>
@@ -2284,37 +1227,37 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
 <context>
     <name>TabBar</name>
     <message>
-        <location filename="tabbar.cpp" line="145"/>
+        <location filename="../tabbar.cpp" line="145"/>
         <source>Show Tab Bar</source>
         <translation>탭 바 보이기</translation>
     </message>
     <message>
-        <location filename="tabbar.cpp" line="145"/>
+        <location filename="../tabbar.cpp" line="145"/>
         <source>Hide Tab Bar</source>
         <translation>탭 바 숨기기</translation>
     </message>
     <message>
-        <location filename="tabbar.cpp" line="170"/>
+        <location filename="../tabbar.cpp" line="170"/>
         <source>Duplicate Tab</source>
         <translation>탭 복제</translation>
     </message>
     <message>
-        <location filename="tabbar.cpp" line="176"/>
+        <location filename="../tabbar.cpp" line="176"/>
         <source>&amp;Close Tab</source>
         <translation>탭 닫기 (&amp;C)</translation>
     </message>
     <message>
-        <location filename="tabbar.cpp" line="180"/>
+        <location filename="../tabbar.cpp" line="180"/>
         <source>Close &amp;Other Tabs</source>
         <translation>다른 탭 닫기 (&amp;O)</translation>
     </message>
     <message>
-        <location filename="tabbar.cpp" line="186"/>
+        <location filename="../tabbar.cpp" line="186"/>
         <source>Reload Tab</source>
         <translation>탭 새로 고침</translation>
     </message>
     <message>
-        <location filename="tabbar.cpp" line="192"/>
+        <location filename="../tabbar.cpp" line="192"/>
         <source>Reload All Tabs</source>
         <translation>모든 탭 새로 고침</translation>
     </message>
@@ -2322,86 +1265,72 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
 <context>
     <name>TabWidget</name>
     <message>
-        <location filename="tabwidget.cpp" line="426"/>
+        <location filename="../tabwidget.cpp" line="447"/>
         <source>Untitled</source>
         <translation>제목 없음</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="479"/>
+        <location filename="../tabwidget.cpp" line="482"/>
         <source>Saved Tabs</source>
         <translation>저장된 탭 목록</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="565"/>
-        <source>Do you really want to close this page?</source>
-        <translation>이 페이지를 정말 닫으시겠습니까?</translation>
-    </message>
-    <message>
-        <location filename="tabwidget.cpp" line="566"/>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>이 페이지에서 편집한 내용은 페이지를 닫을 때 손실될 수 있습니다.
-이 페이지를 정말 닫으시겠습니까?
-</translation>
-    </message>
-    <message>
-        <location filename="tabwidget.cpp" line="635"/>
+        <location filename="../tabwidget.cpp" line="676"/>
         <source>Loading...</source>
         <translation>불러오는 중...</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="649"/>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>%1% 불러옴 (%2 %3)...</translation>
+        <location filename="../tabwidget.cpp" line="691"/>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="674"/>
+        <location filename="../tabwidget.cpp" line="716"/>
         <source>Finished loading</source>
         <translation>불러오기 성공</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="676"/>
+        <location filename="../tabwidget.cpp" line="718"/>
         <source>Failed to load</source>
         <translation>불러오기 실패</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="756"/>
+        <location filename="../tabwidget.cpp" line="801"/>
         <source>Show Next Tab</source>
         <translation>다음 탭 보기</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="760"/>
+        <location filename="../tabwidget.cpp" line="805"/>
         <source>Ctrl-]</source>
         <translation>Ctrl-]</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="764"/>
+        <location filename="../tabwidget.cpp" line="809"/>
         <source>Show Previous Tab</source>
         <translation>기존 탭 보기</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="768"/>
+        <location filename="../tabwidget.cpp" line="813"/>
         <source>Ctrl-[</source>
         <translation>Ctrl-[</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="772"/>
+        <location filename="../tabwidget.cpp" line="817"/>
         <source>Recently Closed Tabs</source>
         <translation>이전에 닫은 탭 보기</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="773"/>
+        <location filename="../tabwidget.cpp" line="818"/>
         <source>New &amp;Tab</source>
         <translation>새 탭 (&amp;T)</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="774"/>
+        <location filename="../tabwidget.cpp" line="819"/>
         <source>&amp;Close Tab</source>
         <translation>탭 닫기 (&amp;C)</translation>
     </message>
     <message>
-        <location filename="tabwidget.cpp" line="775"/>
+        <location filename="../tabwidget.cpp" line="820"/>
         <source>Bookmark All Tabs</source>
         <translation>모든 탭 북마크</translation>
     </message>
@@ -2409,27 +1338,22 @@ Do you really want to close this page?
 <context>
     <name>ToolbarSearch</name>
     <message>
-        <location filename="toolbarsearch.cpp" line="292"/>
+        <location filename="../toolbarsearch.cpp" line="292"/>
         <source>Suggestions</source>
         <translation>제안</translation>
     </message>
     <message>
-        <location filename="toolbarsearch.cpp" line="341"/>
-        <source>Add &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; 추가</translation>
-    </message>
-    <message>
-        <location filename="toolbarsearch.cpp" line="351"/>
+        <location filename="../toolbarsearch.cpp" line="351"/>
         <source>Clear Recent Searches</source>
         <translation>최근 검색 기록 비우기</translation>
     </message>
     <message>
-        <location filename="toolbarsearch.cpp" line="406"/>
+        <location filename="../toolbarsearch.cpp" line="406"/>
         <source>No Recent Searches</source>
         <translation>최근 검색 기록 없음</translation>
     </message>
     <message>
-        <location filename="toolbarsearch.cpp" line="410"/>
+        <location filename="../toolbarsearch.cpp" line="410"/>
         <source>Recent Searches</source>
         <translation>최근 검색 기록</translation>
     </message>
@@ -2437,163 +1361,85 @@ Do you really want to close this page?
 <context>
     <name>UserAgentMenu</name>
     <message>
-        <location filename="useragent/useragentmenu.cpp" line="53"/>
+        <location filename="../useragent/useragentmenu.cpp" line="53"/>
         <source>Default</source>
         <translation>기본값</translation>
     </message>
     <message>
-        <location filename="useragent/useragentmenu.cpp" line="67"/>
+        <location filename="../useragent/useragentmenu.cpp" line="67"/>
         <source>Other...</source>
         <translation>다른 설정...</translation>
     </message>
     <message>
-        <location filename="useragent/useragentmenu.cpp" line="132"/>
+        <location filename="../useragent/useragentmenu.cpp" line="132"/>
         <source>Custom user agent</source>
         <translation>사용자 에이전트 지정</translation>
     </message>
     <message>
-        <location filename="useragent/useragentmenu.cpp" line="133"/>
+        <location filename="../useragent/useragentmenu.cpp" line="133"/>
         <source>User agent:</source>
         <translation>사용자 에이전트:</translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <location filename="webpage.cpp" line="232"/>
-        <source>Resending POST request</source>
-        <translation>POST 요청 재전송 필요함</translation>
-    </message>
-    <message>
-        <location filename="webpage.cpp" line="233"/>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>이 사이트를 표시하려면 사이트를 요청할 때 이용한 모든 데이터를 다시 보내야 합니다. 이 작업은 사이트에서 기대하지 않은 동작을 진행할 수 있습니다. 예로, 방금 했던 작업이 다시 실행될 수 있습니다. 계속 진행하시겠습니까?</translation>
-    </message>
-    <message>
-        <location filename="webpage.cpp" line="392"/>
-        <source>Error loading page: %1</source>
-        <translation>%1 페이지 불러오기 오류</translation>
-    </message>
-    <message>
-        <location filename="webpage.cpp" line="403"/>
-        <source>When connecting to: %1.</source>
-        <translation>%1 에 접속하려고 하였습니다.</translation>
-    </message>
-    <message>
-        <location filename="webpage.cpp" line="404"/>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>주소를 실수로 &lt;b&gt;www&lt;/b&gt;.arora-browser.org 대신 &lt;b&gt;ww&lt;/b&gt;.arora-browser.org 와 같이 입력하였는지 확인하여 주십시요.</translation>
-    </message>
-    <message>
-        <location filename="webpage.cpp" line="405"/>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>주소를 제대로 입력하였다면 네트워크 연결을 확인하여 주십시요.</translation>
-    </message>
-    <message>
-        <location filename="webpage.cpp" line="406"/>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>컴퓨터나 네트워크가 방화벽이나 프록시 서버로 보호받고 있다면 브라우저가 네트워크에 접속하는 데 제한이 있는지 확인하여 주십시요.</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
-        <location filename="webview.cpp" line="166"/>
+        <location filename="../webview.cpp" line="217"/>
         <source>Open in New &amp;Window</source>
         <translation>새 창에서 열기 (&amp;N)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="168"/>
+        <location filename="../webview.cpp" line="219"/>
         <source>Open in New &amp;Tab</source>
         <translation>새 탭에서 열기 (&amp;T)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="171"/>
+        <location filename="../webview.cpp" line="222"/>
         <source>Save Lin&amp;k</source>
         <translation>링크 저장 (&amp;K)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="172"/>
+        <location filename="../webview.cpp" line="223"/>
         <source>&amp;Bookmark This Link</source>
         <translation>이 링크를 북마크 (&amp;B)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="176"/>
+        <location filename="../webview.cpp" line="227"/>
         <source>&amp;Copy Link Location</source>
         <translation>링크 주소 복사 (&amp;C)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="182"/>
+        <location filename="../webview.cpp" line="233"/>
         <source>Open Image in New &amp;Window</source>
         <translation>새 창에 이미지 열기 (&amp;W)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="184"/>
+        <location filename="../webview.cpp" line="235"/>
         <source>Open Image in New &amp;Tab</source>
         <translation>새 탭에 이미지 열기 (&amp;T)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="187"/>
+        <location filename="../webview.cpp" line="238"/>
         <source>&amp;Save Image</source>
         <translation>이미지 저장 (&amp;S)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="188"/>
+        <location filename="../webview.cpp" line="239"/>
         <source>&amp;Copy Image</source>
         <translation>이미지 복사 (&amp;C)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="189"/>
+        <location filename="../webview.cpp" line="240"/>
         <source>C&amp;opy Image Location</source>
         <translation>이미지 주소 복사 (&amp;O)</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="191"/>
-        <source>Block Image</source>
-        <translation>이미지 차단</translation>
-    </message>
-    <message>
-        <location filename="webview.cpp" line="200"/>
+        <location filename="../webview.cpp" line="249"/>
         <source>Search with...</source>
         <translation>이 부분을 검색...</translation>
     </message>
     <message>
-        <location filename="webview.cpp" line="226"/>
-        <source>Add to the toolbar search</source>
-        <translation>도구 검색에 추가</translation>
-    </message>
-    <message>
-        <location filename="webview.cpp" line="381"/>
-        <source>Method not supported</source>
-        <translation>기능 지원 안됨</translation>
-    </message>
-    <message>
-        <location filename="webview.cpp" line="382"/>
-        <source>%1 method is not supported.</source>
-        <translation>%1 기능은 지원하지 않습니다.</translation>
-    </message>
-    <message>
-        <location filename="webview.cpp" line="426"/>
-        <source>Search engine</source>
-        <translation>검색 엔진</translation>
-    </message>
-    <message>
-        <location filename="webview.cpp" line="427"/>
-        <source>Choose the desired search engine</source>
-        <translation>검색할 엔진을 선택하십시오</translation>
-    </message>
-    <message>
-        <location filename="webview.cpp" line="441"/>
-        <source>Engine name</source>
-        <translation>엔진 이름</translation>
-    </message>
-    <message>
-        <location filename="webview.cpp" line="441"/>
-        <source>Type in a name for the engine</source>
-        <translation>엔진 이름을 입력하십시오</translation>
-    </message>
-    <message>
-        <location filename="webview.cpp" line="532"/>
+        <location filename="../webview.cpp" line="578"/>
         <source>Loading...</source>
         <translation>불러오는 중...</translation>
     </message>
@@ -2601,7 +1447,7 @@ Do you really want to close this page?
 <context>
     <name>WebViewSearch</name>
     <message>
-        <location filename="webviewsearch.cpp" line="67"/>
+        <location filename="../webviewsearch.cpp" line="60"/>
         <source>Not Found</source>
         <translation>찾을 수 없음</translation>
     </message>
diff --git a/src/locale/locale.pri b/src/locale/locale.pri
deleted file mode 100644
index 893fd971..00000000
--- a/src/locale/locale.pri
+++ /dev/null
@@ -1,54 +0,0 @@
-
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-TRANSLATIONS += \
-    ast.ts \
-    ca.ts \
-    cs_CZ.ts \
-    da_DK.ts \
-    de_DE.ts \
-    el_GR.ts \
-    es.ts \
-    es_CR.ts \
-    et_EE.ts \
-    fi_FI.ts \
-    fr_CA.ts \
-    fr_FR.ts \
-    gl.ts \
-    he_IL.ts \
-    hu_HU.ts \
-    it_IT.ts \
-    ja_JP.ts \
-    ko_KR.ts \
-    ms.ts \
-    nb_NO.ts \
-    nl.ts \
-    pl_PL.ts \
-    pt_PT.ts \
-    pt_BR.ts \
-    ru_RU.ts \
-    sk_SK.ts \
-    sr_RS.ts \
-    sr_RS@latin.ts \
-    tr_TR.ts \
-    uk.ts \
-    zh_CN.ts \
-    zh_TW.ts
-
-isEmpty(QMAKE_LRELEASE) {
-    win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\lrelease.exe
-    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
-    unix {
-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 }
-    } else {
-        !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease }
-    }
-}
-
-updateqm.input = TRANSLATIONS
-updateqm.output = .qm/locale/${QMAKE_FILE_BASE}.qm
-updateqm.commands = $$QMAKE_LRELEASE -silent ${QMAKE_FILE_IN} -qm .qm/locale/${QMAKE_FILE_BASE}.qm
-updateqm.CONFIG += no_link target_predeps
-QMAKE_EXTRA_COMPILERS += updateqm
diff --git a/src/locale/ms.ts b/src/locale/ms.ts
index f9527f56..81e51c8a 100644
--- a/src/locale/ms.ts
+++ b/src/locale/ms.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="en_US">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Perihal</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Penulis</translation>
@@ -15,137 +11,10 @@
         <source>License</source>
         <translation>Lesen</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Pelayan web ringan berasaskan WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Tutup</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Bahasa</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Bahasa di dalam turutan minat:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Naik A&amp;tas</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Turun Ba&amp;wah</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Keluarkan</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Tambah...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished">Peraturan</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -153,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Tambah Tandabuku</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Taipkan nama tandabuku dan pilih di mana harus disimpan.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Url</translation>
@@ -170,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Tambah Folder</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished">Buang</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -229,18 +53,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Folder Baru</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Tandabuku</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Buang</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Tambah Folder</translation>
-    </message>
     <message>
         <source>Edit Name</source>
         <translation>Sunting Nama</translation>
@@ -270,10 +82,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Buka Fail</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>%1 diimport</translation>
@@ -302,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Masukkan tandabuku</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Perubahan Nama</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Alamat Berubah</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation>Bar Tandabuku</translation>
@@ -318,16 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Bookmarks Menu</source>
         <translation>Menu Tandabuku</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Ralat semasa memuatkan tandabuku html: %1
-</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -350,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation type="unfinished"></translation>
@@ -363,6 +149,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -384,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Tandabuku</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Buka</translation>
@@ -408,17 +194,9 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Tambah Folder...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Tandabuku</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete"> (Ubah: %1 %2)</translation>
-    </message>
     <message>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
@@ -430,11 +208,7 @@ Teruskan untuk keluar?</translation>
         <translation>Gagal mengembalikan</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Arora gagal berfungsi semasa cuba mengembalikan sessi yang disimpan. Sessi berkenaan tidak akan dikembalikan.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -468,14 +242,6 @@ Teruskan untuk keluar?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Eksport Tandabuku...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>P&amp;rapapar Pencetak...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Pencetak...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Melungsur secara pri&amp;vasi...</translation>
@@ -520,10 +286,6 @@ Teruskan untuk keluar?</translation>
         <source>Find P&amp;revious</source>
         <translation>C&amp;ari Sebelumnya</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Opsye&amp;n...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -540,10 +302,6 @@ Teruskan untuk keluar?</translation>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -556,18 +314,6 @@ Teruskan untuk keluar?</translation>
         <source>&amp;Reload Page</source>
         <translation>&amp;Muatsemula Laman</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">&amp;Besarkan Text</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">&amp;Normalkan Text</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">&amp;Kecilkan Text</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>S&amp;umber Laman</translation>
@@ -604,10 +350,6 @@ Teruskan untuk keluar?</translation>
         <source>&amp;Bookmarks</source>
         <translation>Tanda&amp;buku</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Urus Tandabuku...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Tambah Tandabuku...</translation>
@@ -638,10 +380,6 @@ Teruskan untuk keluar?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Benarkan Peny&amp;iasat Web</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>Bant&amp;uan</translation>
@@ -654,10 +392,6 @@ Teruskan untuk keluar?</translation>
         <source>About &amp;Qt</source>
         <translation>Perihal &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Perihal &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Navigasi</translation>
@@ -686,15 +420,6 @@ Teruskan untuk keluar?</translation>
         <source>Hide Bookmarks Bar</source>
         <translation>Sembunyi Bar Tandabuku</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Buka Sumber Web</translation>
@@ -703,32 +428,10 @@ Teruskan untuk keluar?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Sumber Web (*.html *.htm *.svg *.png *.gif *.svgz);;Semua fail (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Cetak Dokumen</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Anda pasti ingin membuka lungsuran secara privasi?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Apabila lungsuran secara privasi sedang dibuka, Aksi yang melibatkan privasi anda dilumpuhkan:&lt;ul&gt;&lt;li&gt; Laman yang dilawati tidak ditambah ke sejarah.&lt;/li&gt;&lt;li&gt; Senarai muaturun dibersihkan.&lt;/li&gt;&lt;li&gt; Cookies baru tidak disimpan, cookies semasa tidak boleh dicapai.&lt;/li&gt;&lt;li&gt; Ikon laman web dan sessi tidak disimpan.&lt;/li&gt;&lt;li&gt; Carian tidak disimpan di menu popup kotak carian.&lt;/li&gt;&lt;/ul&gt;Selagi tetingkap tidak ditutup, anda masih boleh klik pada butang Undur dan Maju untuk kembalik ke laman yang pernah dibuka.</translation>
-    </message>
-    <message>
-        <source>Are you sure you want to close the window? &#xa0;There are %1 tabs open</source>
-        <translation type="obsolete">Anda pasti ingin menutup tetingkap ini? Masih ada %1 tab terbuka</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Penyiasat Web</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Penyiasat Web cuma akan berfungsi dengan baik di laman yang dibuka selepas ia dibenarkan berfungsi. 
-Anda mahu memuatsemula kesemua laman?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Henti memuat laman semasa</translation>
@@ -741,15 +444,6 @@ Anda mahu memuatsemula kesemua laman?</translation>
         <source>Downloads</source>
         <translation>Muaturun</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">Papar Penyelia Rangkaia&amp;n</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Anda pasti ingin menutup tetingkap ini? Masih ada %1 tab yang terbuka</translation>
@@ -788,10 +482,6 @@ Anda mahu memuatsemula kesemua laman?</translation>
         <translatorcomment>Perihal Pelayar</translatorcomment>
         <translation>Perihal &amp;%1</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Apabila lungsuran privasi dipasang, sebahagian tindakan melibatkan privasi akan di lumpuhkan:&lt;ul&gt;&lt;li&gt; Laman web tidak disimpan di dalam sejarah.&lt;/li&gt;&lt;li&gt; Senarai muaturun akan dikeluarkan dari tetingkap Muaturun.&lt;/li&gt;&lt;li&gt; Cookies baru tidak akan disimpan dan cookies semasa tidak dapat digunakan.&lt;/li&gt;&lt;li&gt; Ikon laman web tidak disimpan, sessi tidak disimpan.&lt;/li&gt;&lt;li&gt; Carian tidak ditambah pada menu popup di kekotak carian.&lt;/li&gt;&lt;/ul&gt;Sebelum anda menutup tetingkap, anda masih boleh menggunakan butang Undur dan Maju untuk kembali ke laman web yang pernah di buka.</translation>
-    </message>
     <message>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
@@ -822,10 +512,6 @@ Anda mahu memuatsemula kesemua laman?</translation>
         <source>Configure Search Engines...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -838,10 +524,6 @@ Anda mahu memuatsemula kesemua laman?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -882,6 +564,19 @@ Anda mahu memuatsemula kesemua laman?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -912,14 +607,6 @@ Anda mahu memuatsemula kesemua laman?</translation>
         <source>&amp;Search History</source>
         <translation>Sejarah &amp;Carian</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>Coo&amp;kie</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>C&amp;ache Laman Web</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>&amp;Ikon Laman web</translation>
@@ -934,1185 +621,356 @@ Anda mahu memuatsemula kesemua laman?</translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
+        <source>Downloads</source>
+        <translation>Muaturun</translation>
     </message>
     <message>
-        <source>Load All</source>
+        <source>Downloading %1</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation type="unfinished"></translation>
+        <source>Save File</source>
+        <translation>Simpan Fail</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation type="unfinished"></translation>
+        <source>Download canceled: %1</source>
+        <translation>Muaturun dibatalkan: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Ralat membuka fail keluaran: %1</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation type="unfinished"></translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Ralat menyimpan: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation type="unfinished"></translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Ralat Rangkaian: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Laman web</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Peraturan</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 dari %2 (%3/saat) - %4</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Benar</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Larang</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Benarkan Untuk Sessi</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Laman web</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Nama</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Path</translation>
+        <source>bytes</source>
+        <translation type="obsolete">byte</translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Selamat</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Luput</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
-    <message>
-        <source>Contents</source>
-        <translation>Kandungan</translation>
-    </message>
-    <message>
-        <source>true</source>
-        <translation>true</translation>
-    </message>
-    <message>
-        <source>false</source>
-        <translation>false</translation>
-    </message>
-    <message>
-        <source>Session cookie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookie</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Buang</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Buang Semu&amp;a Cookie</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Pengecualian Cookie</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Cookie Baru</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Domain:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Larang</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Benarkan Untuk Sessi</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Benar</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Pengecualian</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Buang</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Buang Semu&amp;a</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Muaturun</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Bersihkan</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 perkara</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Nama fail</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Cuba Semula</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Henti</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Buka</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Simpan Fail</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Muaturun dibatalkan: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Ralat membuka fail keluaran: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Ralat menyimpan: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Ralat Rangkaian: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">saat</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>lagi %n minit</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>lagi %n saat</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 dari %2 (%3/saat) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 of %2 - Berhenti</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">byte</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 dari %2 (%3/saat) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n Muaturun</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Masih ada %1 proses muaturun berjalan
-Anda masih ingin keluar?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>lagi %n minit</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>lagi %n saat</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>byte</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Buka</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Salin</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Padam</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Sejarah</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Buang</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Buang Semu&amp;a</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Tunjuk Semua Sejarah</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Hapus Sejarah...</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Hapus Sejarah</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Anda mahu hapus sejarah?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Tajuk</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Alamat</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Awal Hari Ini</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n perkara</numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>System locale (%1) %2</source>
-        <translation type="obsolete">Sistem Lokal (%1) %2</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Pilih bahasa</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Anda boleh menggunakan bahasa selain dari&lt;br&gt;tetapan sistem operasi.&lt;/p&gt;&lt;p&gt;Sila pilih bahasa yang harus digunakan&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>Default</source>
-        <translation type="obsolete">Lalai</translation>
-    </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Fail terjemahan tidak dipasang.</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Masukkan nama pengguna dan katalaluan untuk &quot;%1&quot; di %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Berhubung dengan proxy &quot;%1&quot; menggunakan:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">Ralat SSL:
-
-%1
-
-%2
-
-Anda mahu abaikan ralat ini?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Anda mahu menerima kesemua sijil?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - Ralat SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Ralat SSL:&lt;br/&gt;&lt;br/&gt;untuk: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Anda ingin abaikan ralat ini?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Sijil:&lt;br/&gt;%1&lt;br/&gt;Anda mahu menerima kesemua sijil ini?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nama</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Nilai</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Penyelia Rangkaian</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Permintaan Rangkaian</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Pengepala Permintaan</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Pengepala Balasan</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Buang</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">Buang Semu&amp;a Permintaan</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished">Buka Fail</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Nama</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Pengesahan Diperlukan</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nama pengguna:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Katalaluan:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Tiada di laman ini</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Pengesahan Proxy</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Berhubung dengan proxy</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nama pengguna:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Katalaluan:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Ini bukan fail XBEL versi 1.0.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Tajuk tidak diketahui</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Lencongan %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Kaedah</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Alamat</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Balasan</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Panjang</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Jenis Kandungan</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Maklumat</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Sudah</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Cari</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Opsyen</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Umum</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Bila dibuka:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Tunjuk laman utama saya</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Tunjuk laman kosong</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Kembalikan tetingkap dan tab dari masa lampau</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Laman Utama:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Tetapkan kepada laman semasa</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Buang sejarah:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Selepas sehari</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Selepas seminggu</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Selepas dua minggu</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Selepas sebulan</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Selepas setahun</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Secara manual</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Bila aplikasi keluar</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Buka pautan dari aplikasi:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">Di tab pada tetingkap semasa</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>Di tetingkap baru</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Muaturun</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Sentiasa menanya destinasi</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Gunakan destinasi ini:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Penampilan</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Font Standard:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Pilih...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Font lebar-tetap:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Privasi</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Kandungan Web</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Benarkan Plugin</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Benarkan Javascript</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Tunjuk Imej</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookie</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Terima Cookie:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Sentiasa</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Tidak</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Cuma dari laman yang anda pergi</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Pengecualian...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Simpan cookie sehingga:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>ia lupus</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>saya keluar dari aplikasi</translation>
+</context>
+<context>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n Muaturun</numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>At most 90 days</source>
-        <translation>sehingga 90 hari</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Masih ada %1 proses muaturun berjalan
+Anda masih ingin keluar?</translation>
     </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookie...</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>lagi %n minit</numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Tab</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>lagi %n saat</numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Pilih tab dan tetingkap sebaik ia dicipta</translation>
+        <source>bytes</source>
+        <translation>byte</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Pastikan bila menutup berbilang tab</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation>Guna server proxy</translation>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Type:</source>
-        <translation>Type:</translation>
+        <source>Open</source>
+        <translation>Buka</translation>
     </message>
     <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
+        <source>Copy</source>
+        <translation>Salin</translation>
     </message>
     <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
+        <source>Delete</source>
+        <translation>Padam</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Host name:</source>
-        <translation>Host name:</translation>
+        <source>Show All History</source>
+        <translation>Tunjuk Semua Sejarah</translation>
     </message>
     <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
+        <source>Clear History...</source>
+        <translation>Hapus Sejarah...</translation>
     </message>
     <message>
-        <source>User Name:</source>
-        <translation>Nama pengguna:</translation>
+        <source>Clear History</source>
+        <translation>Hapus Sejarah</translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Katalaluan:</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Anda mahu hapus sejarah?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Advanced</source>
-        <translation>Lanjut</translation>
+        <source>Title</source>
+        <translation>Tajuk</translation>
     </message>
     <message>
-        <source>Style Sheet:</source>
-        <translation>Style Sheet:</translation>
+        <source>Address</source>
+        <translation>Alamat</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Papar cuma satu butang tutup bagi keseluruhan tab</translation>
+        <source>Earlier Today</source>
+        <translation>Awal Hari Ini</translation>
     </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Bahasa digemari untuk melihat laman web:</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n perkara</numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Block Popup Windows</source>
-        <translation>Halang Tetingkap Popup</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opening links</source>
-        <translation>Membuka capaian</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Capaian yang hendak dibuka di tetingkap baru:</translation>
+        <source>Search!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>Di dalam tab terpilih baru di tetingkap semasa</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>Di dalam tab baru di tetingkap semasa</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
-        <translation>Di dalam tab semasa</translation>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Http (Secure)</source>
-        <translation>Http (Selamat)</translation>
+        <source>Choose language</source>
+        <translation>Pilih bahasa</translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (Telus)</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Anda boleh menggunakan bahasa selain dari&lt;br&gt;tetapan sistem operasi.&lt;/p&gt;&lt;p&gt;Sila pilih bahasa yang harus digunakan&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
+        <source>No translation files are installed at %1.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation type="unfinished"></translation>
+        <source>Open File</source>
+        <translation type="unfinished">Buka Fail</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
+        <source>OpenSearch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable network cache</source>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
+        <source>You must have at least one search engine in here.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source> MB</source>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Directory...</source>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation type="unfinished">Nama</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>1 day</source>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>2 days</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Benar</translation>
     </message>
     <message>
-        <source>3 days</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7 days</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>30 days</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation>Tiada di laman ini</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>AutoFill</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Ini bukan fail XBEL versi 1.0.</translation>
     </message>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>Tajuk tidak diketahui</translation>
     </message>
     <message>
-        <source>User names and passwords</source>
+        <source>The file is not an OpenSearch 1.1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit...</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Cari</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -2140,18 +998,6 @@ Anda ingin abaikan ralat ini?&lt;/qt&gt;</translation>
         <source>&amp;Find</source>
         <translation>&amp;Cari</translation>
     </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Sumber Laman</translation>
-    </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Lihat</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">&amp;Wrap barisan</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation type="unfinished"></translation>
@@ -2167,10 +1013,6 @@ Anda ingin abaikan ralat ini?&lt;/qt&gt;</translation>
         <source>Hide Tab Bar</source>
         <translation>Sembunyi Bar Tab</translation>
     </message>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">&amp;Tab Baru</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Salin Tab</translation>
@@ -2218,18 +1060,6 @@ Anda ingin abaikan ralat ini?&lt;/qt&gt;</translation>
         <source>Untitled</source>
         <translation>Tiada tajuk</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Anda benar-benar mahu menutup laman ini?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Anda sudah mengubah laman ini dan jika menutupnya akan menyebabkan kehilangan perubahan ini.
-Anda benar-benar mahu teruskan dengan menutup laman ini?
-</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation>Ctrl-]</translation>
@@ -2246,10 +1076,6 @@ Anda benar-benar mahu teruskan dengan menutup laman ini?
         <source>Loading...</source>
         <translation>Memuat...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Memuat %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Selesai dimuatkan</translation>
@@ -2262,6 +1088,10 @@ Anda benar-benar mahu teruskan dengan menutup laman ini?
         <source>Bookmark All Tabs</source>
         <translation>Tandabukukan Ke Semua Tab</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2281,10 +1111,6 @@ Anda benar-benar mahu teruskan dengan menutup laman ini?
         <source>Suggestions</source>
         <translation>Cadangan</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2305,41 +1131,6 @@ Anda benar-benar mahu teruskan dengan menutup laman ini?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Ralat memuat laman: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Semasa berhubung ke: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Periksa alamat untuk kesilapan seperti &lt;b&gt;ww&lt;/br&gt;.arora-browser.org yang sepatutnya &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try to check the network connection.</source>
-        <translation type="obsolete">Jika alamatnya betul, cuba periksa sambungan rangkaian.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Jika komputer atau rangkaian dilindungi oleh firewall atau proxy, pastikan pelungsur dibenarkan mencapai rangkaian.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Jika alamat betul, cuba periksa sambungan rangkaian.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2390,38 +1181,6 @@ Anda benar-benar mahu teruskan dengan menutup laman ini?
         <source>Search with...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/nb_NO.ts b/src/locale/nb_NO.ts
index d28f29dd..316e0faa 100644
--- a/src/locale/nb_NO.ts
+++ b/src/locale/nb_NO.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="nb_NO">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Om</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Forfattere</translation>
@@ -15,170 +11,10 @@
         <source>License</source>
         <translation>Lisens</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Lettvekts WebKit-basert nettleser</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Opphavsrett © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Lukk</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translatorcomment>Update the dates in the copyright notice?</translatorcomment>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Opphavsrett © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>Om %1</translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Opphavsrett © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>WebKit versjon: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Opphavsrett © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Språk</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Språk: ordnet etter preferanse:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Flytt &amp;opp</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Flytt &amp;ned</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Legg til...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>Blokkert av AdBlockRule:%1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Legg til regel</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Lær mer om å skrive regler...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Oppdater abonement</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Bla igjennom abonementer...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Fjern abonement</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>AdBlock konfigurasjon</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>Skru på AdBlock</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Handling</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Regel</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Regel</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Abonemer?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Abonemer på dette AdBlock abonementet? %1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -186,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Legg til bokmerke</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Gi bokmerket et navn og velg hvor du vil lagre det.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Addresse</translation>
@@ -203,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Legg til mappe</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Passord</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Fjern</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Fjern alle</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Vil du lagre dette passordet?&lt;/b&gt;&lt;br&gt;         Du kan se hvilke passord du har lagret og eventuelt slette dem under Egenskaper.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Aldri for denne siden</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Ikke nå</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Nettside</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Brukernavn</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -262,18 +49,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Ny mappe</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Bokmerker</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Legg til mappe</translation>
-    </message>
     <message>
         <source>Open in New Tab</source>
         <translation>Åpne i ny fane</translation>
@@ -307,10 +82,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Åpne fil</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>Importerte %1</translation>
@@ -347,15 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Bookmarks Menu</source>
         <translation>Bokmerkemeny</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Feil ved lasting av html bokmerker: %1</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -378,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>trenger htmlToXBel verktøy</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>htmlToXBel verktøyet som følger med Arora og som trengs for å importere HTML bokmerker, er ikke installert eller er ikke i søkebanene.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Laster bokmerker</translation>
@@ -391,6 +149,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation>Feil ved lasting av HTML bokmerker: %1</translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -412,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Bokmerker</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Åpne</translation>
@@ -436,10 +194,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Legg til mappe...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Bokmerker</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -454,20 +208,8 @@ Er du sikker på at du vil avslutte Arora?</translation>
         <translation>Gjennopretningen misslyktes</translation>
     </message>
     <message>
-        <source>The saved session will not being restored because last time it was restored Arora crashed.</source>
-        <translation type="obsolete">Den lagrede økten blir ikke gjennoprettet siden forrige gang den ble gjnoprettet krasjet Arora.</translation>
-    </message>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete">(Endring: %1 %2)</translation>
-    </message>
-    <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Den lagrede økten blir ikke gjennoprettet siden det førte til at Arora krasjet.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora kræsjet forrige gang vi prøvde å gjennoprette denne siden. Skal vi prøve igjenn?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -500,14 +242,6 @@ Er du sikker på at du vil avslutte Arora?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Eksporter bokmerker...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>&amp;Forhåndsvisning...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Skriv ut...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>&amp;Privat surfing...</translation>
@@ -552,10 +286,6 @@ Er du sikker på at du vil avslutte Arora?</translation>
         <source>&amp;View</source>
         <translation>&amp;Vis</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
@@ -604,10 +334,6 @@ Er du sikker på at du vil avslutte Arora?</translation>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Bokmerker</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Håndter bokmerker...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Legg til bokmerke...</translation>
@@ -629,10 +355,6 @@ Er du sikker på at du vil avslutte Arora?</translation>
         <comment>Web Search</comment>
         <translation>Ctrl+K</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>&amp;Aktiver nettinspektøren</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>H&amp;jelp</translation>
@@ -641,10 +363,6 @@ Er du sikker på at du vil avslutte Arora?</translation>
         <source>About &amp;Qt</source>
         <translation>Om &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Om &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Navigering</translation>
@@ -665,15 +383,6 @@ Er du sikker på at du vil avslutte Arora?</translation>
         <source>Hide Toolbar</source>
         <translation>Skjul verktøylinjen</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Åpne nettresurs</translation>
@@ -682,10 +391,6 @@ Er du sikker på at du vil avslutte Arora?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Nettresurser (*.html *.htm *.svg *.png *.gif *.svgz);;Alle filer (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Skriv ut dokument</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Er du sikker på at du vil skru på privat surfing?</translation>
@@ -694,20 +399,6 @@ Er du sikker på at du vil avslutte Arora?</translation>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Er du sikker på at du vil lukke vinduet? Du har %1 faner åpne</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">Kildekoden til %1</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Nettinspektør</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Nettinspektøren virker kun som den skal for sider som blir lastet etter at den ble aktivert.
-Vil du laste alle sider på nytt?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Avbryt lasting av denne siden</translation>
@@ -720,11 +411,6 @@ Vil du laste alle sider på nytt?</translation>
         <source>Downloads</source>
         <translation>Nedlastinger</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
     <message>
         <source>&amp;Clear Private Data</source>
         <translation>&amp;Slett privat informasjon</translation>
@@ -742,46 +428,18 @@ Vil du laste alle sider på nytt?</translation>
         <source>Hide Bookmarks Bar</source>
         <translation>Skjul bokmerkelinjen</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Noen handlinger relatert til dine personlige opplysninger vil bli deaktiverte når privat surfing er skrudd på:&lt;ul&gt;&lt;li&gt; Nettsider blir ikke lagt til i historien.&lt;/li&gt;&lt;li&gt; Elementer blir automatisk fjernet fra Nedlastninger vinduet.&lt;/li&gt;&lt;li&gt; Nye informasjonskapsler blir ikke lagret og gamle kan ikke åpnes.&lt;/li&gt;&lt;li&gt; Ikoner og økter blir ikke lagret.&lt;/li&gt;&lt;li&gt; Søk blir ikke lagt til i sprett-opp menyen i søkeboksen.&lt;/li&gt;&lt;/ul&gt;Du kan fremdeles klikke Tilbake og Fram intill du lukker vinduet.</translation>
-    </message>
-    <message>
-        <source>Find &amp;Next</source>
-        <translation type="obsolete">Finn &amp;Neste</translation>
-    </message>
     <message>
         <source>Find P&amp;revious</source>
         <translation>Finn &amp;forrige</translation>
     </message>
-    <message>
-        <source>Prefe&amp;rences</source>
-        <translation type="obsolete">&amp;Instillinger</translation>
-    </message>
     <message>
         <source>&amp;Reload Page</source>
         <translation>&amp;Last siden på nytt</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">Gjør teksten &amp;større</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">Gjør teksten &amp;normal</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">Gjør teksten &amp;mindre</translation>
-    </message>
     <message>
         <source>Find Nex&amp;t</source>
         <translation>Finn &amp;neste</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">&amp;Instillinger...</translation>
-    </message>
     <message>
         <source>Show Menu Bar</source>
         <translation>Vis menylinjen</translation>
@@ -790,10 +448,6 @@ Vil du laste alle sider på nytt?</translation>
         <source>Switch application language </source>
         <translation>Endre språk</translation>
     </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">&amp;Vis nettverksovervåkeren</translation>
-    </message>
     <message>
         <source>Close Window</source>
         <translation>Lukk vinduet</translation>
@@ -827,10 +481,6 @@ Vil du laste alle sider på nytt?</translation>
         <comment>About Browser</comment>
         <translation>Om &amp;%1</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Noen handlinger relatert til dine personlige opplysninger vil bli deaktiverte når privat surfing er skrudd på:&lt;ul&gt;&lt;li&gt; Nettsider blir ikke lagt til i historien.&lt;/li&gt;&lt;li&gt; Elementer blir automatisk fjernet fra Nedlastinger vinduet.&lt;/li&gt;&lt;li&gt; Nye informasjonskapsler blir ikke lagret og gamle kan ikke åpnes.&lt;/li&gt;&lt;li&gt; Ikoner og økter blir ikke lagret.&lt;/li&gt;&lt;li&gt; Søk blir ikke lagt til i sprett-opp menyen i søkeboksen.&lt;/li&gt;&lt;/ul&gt;Du kan fremdeles klikke Tilbake og Fram intill du lukker vinduet.</translation>
-    </message>
     <message>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
@@ -852,10 +502,6 @@ Vil du laste alle sider på nytt?</translation>
         <source>Alt+Ctrl+B</source>
         <translation>Alt+Ctrl+B</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; No new network cache is written to disk.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Noen handlinger relatert til dine personlige opplysninger vil bli deaktiverte når privat surfing er skrudd på:&lt;ul&gt;&lt;li&gt; Nettsider blir ikke lagt til i historien.&lt;/li&gt;&lt;li&gt; Elementer blir automatisk fjernet fra Nedlastninger vinduet.&lt;/li&gt;&lt;li&gt; Nye informasjonskapsler blir ikke lagret og gamle kan ikke åpnes.&lt;/li&gt;&lt;li&gt; Ikoner og økter blir ikke lagret.&lt;/li&gt;&lt;li&gt; Søk blir ikke lagt til i sprett-opp menyen i søkeboksen.&lt;/li&gt;&lt;/ul&gt;Du kan fremdeles klikke Tilbake og Fram intill du lukker vinduet.</translation>
-    </message>
     <message>
         <source>Options...</source>
         <translation>Alternativer...</translation>
@@ -864,10 +510,6 @@ Vil du laste alle sider på nytt?</translation>
         <source>Configure Search Engines...</source>
         <translation>Konfigurer søkemotorer...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;AdBlock...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Så lenge privat surfing er skrudd på, vil noen handlinger være skrudd av:</translation>
@@ -880,10 +522,6 @@ Vil du laste alle sider på nytt?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Nedlastninger blir automatisk fjernet fra Nedlastninger vinduet.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Nye informasjonskapsler blir ikke lagret og eksisterende informasjonskapsler kan ikke brukes.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Nettsideikoner blir ikke lagret.</translation>
@@ -924,6 +562,19 @@ Vil du laste alle sider på nytt?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -954,14 +605,6 @@ Vil du laste alle sider på nytt?</translation>
         <source>&amp;Search History</source>
         <translation>S&amp;økehistorie</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Informasjonskapsler</translation>
-    </message>
-    <message>
-        <source>C&amp;ache</source>
-        <translation type="obsolete">&amp;Hurtiglager</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>N&amp;ettside ikoner</translation>
@@ -974,1205 +617,362 @@ Vil du laste alle sider på nytt?</translation>
         <source>&amp;Cancel</source>
         <translation>&amp;Avbryt</translation>
     </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>&amp;Mellomlagrede nettsider</translation>
-    </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation>Last</translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation>Last alle</translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Legg til %1 i godkjentlisten</translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation>Fjern fra godkjentlisten</translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Settings</source>
-        <translation>Innstilinger</translation>
+        <source>Downloads</source>
+        <translation>Nedlastinger</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Last Flash</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlashSettings</name>
+    <name>DownloadItem</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Godkjente sider</translation>
+        <source>Save File</source>
+        <translation>Lagre fil</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Nettside</translation>
+        <source>Download canceled: %1</source>
+        <translation>Nedlasting avbrutt: %1</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation type="obsolete">Status</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Feil ved lagring: %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Tillat</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Nettverksfeil: %1</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Blokker</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Tillat for denne økten</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Feil ved skriving til fil: %1</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Regel</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 av %2 (%3/sek) - %4</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Nettside</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Nedlastningsbanen (%1) kunne ikke opprettes.</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Navn</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Sti</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Sikker</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Utløper</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Innhold</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>ja</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bytes</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>nei</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation>Sesjonsinformasjonskapsel</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
 </context>
 <context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Informasjonskapsler</translation>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n nedlasting</numerusform>
+            <numerusform>%n nedlastinger</numerusform>
+        </translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Slett</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Slett &amp;alle informasjonskapslene</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation>Legg til &amp;regel</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Unntak for informasjonskapsler</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Nytt unntak</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Domene:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Blokker</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Tillat for økt</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Tillat</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Unntak</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Fjern &amp;alle</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Nedlastinger</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Rydd opp</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>Ingen elementer</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Save File</source>
-        <translation>Lagre fil</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Nedlasting avbrutt: %1</translation>
-    </message>
-    <message>
-        <source>Error opening save file: %1</source>
-        <translation type="obsolete">Feil ved åpning av lagret fil: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Feil ved lagring: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Nettverksfeil: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">sekunder</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 av %2 (%3/sek) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 av %2 - Stoppet</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Skjema</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ikon</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Filnavn</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Prøv igjenn</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Stopp</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Åpne</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n minutt gjennstår</numerusform>
-            <numerusform>- %n minutter gjennstår</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n sekund gjennstår</numerusform>
-            <numerusform>- %n sekunder gjennstår</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Feil ved skriving til fil: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 av %2 (%3/sek) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Nedlastningsbanen (%1) kunne ikke opprettes.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n nedlasting</numerusform>
-            <numerusform>%n nedlastinger</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Det er %1 aktive nedlastinger
-Er du sikker på at du vil avslutte?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minutt gjennstår</numerusform>
-            <numerusform>%n minutter gjennstår</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n sekund gjennstår</numerusform>
-            <numerusform>%n sekunder gjennstår</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Ingen feil</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Feil ved åpning av: %1: Filen eller banen finnes ikke</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Kan ikke lese %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Innhold i %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Åpne</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopier</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Slett</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Historie</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Fjern &amp;alle</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Vis hele historien</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Slett historien</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Slett historien...</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Vil du slette historien?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Tittel</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresse</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>I dag</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n element</numerusform>
-            <numerusform>%n elementer</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation>Velkommen til Arora!</translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation>Arora start</translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation>Søk!</translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation>Søkeresultater levert av</translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation>Om Arora</translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Default</source>
-        <translation type="obsolete">Standardspråk</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Velg språk</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Du kan bruke at annet språk enn&lt;br&gt;operativsystemets standardspråk.&lt;/p&gt;&lt;p&gt;Velg språk&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Ingen oversettelses filer er installert.</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation>Ingen oversettelsesfiler er installert i %1.</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Oppgi brukernavn og passord for &quot;%1&quot; på %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Koble til mellomtjener &quot;%1&quot; ved å bruke:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">SSL Feil:
-
-%1
-
-%2
-
-Vil du ignorere disse feilene?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Vil du akseptere alle disse sertifikatene?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - SSL Feil</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL Feil:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Vil du ignorere disse feilene?&lt;qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Sertifikater:&lt;br/&gt;%1&lt;br/&gt;Vil du akseptere alle disse sertifikatene?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Sertifikater:&lt;br/&gt;%1&lt;br/&gt;Vil du akseptere alle disse sertifikatene?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Utsteder: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Ikke gyldig før: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Gyldig inntil: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Alternative navn:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Navn</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Verdi</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Nettverksovervåker</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Nettverksforespørselser</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Forespørselshode</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Svarhode</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Fjern</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">Fjern &amp;alle forespørselser</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation>Åpne fil</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation>OpenSearch</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Feil</translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation>%1 er ikke en gyldig OpenSearch 1.1 beskrivelse, eller så finnes den allerede i listen.</translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation>Det må være minst en søkemotor her.</translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>OpenSearch-behandler</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Gjennoprett forvalg</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Slett</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Legg til</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Lukk</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation>&lt;strong&gt;Beskrivelse:&lt;/strong&gt; %1</translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation>&lt;strong&gt;Gir forslag&lt;/strong&gt;</translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Navn</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation>Nøkkelord</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation>Vil du legge til den følgende motoren i listen over søkemotorer?&lt;br /&gt;&lt;br /&gt;Navn: %1&lt;br /&gt;Søker på: %2</translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Brukernavn:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Passord:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Ikke funnet</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Koble til mellomtjener</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Brukernavn:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Passord:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Filen er ikke en XBEL versjon 1.0 fil.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Ukjent tittel</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation>Filen er ikke en OpenSearch 1.1 fil.</translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Videresend: %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Metode</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Adresse</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Svar</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Lengde</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Innholdstype</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Info</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Done</source>
-        <translation>Ferdig</translation>
-    </message>
-    <message>
-        <source>Form</source>
-        <translatorcomment>Is there a way for things like these be ommitted from translation since they are never shown in the UI? A comment would probably do, so translators don&apos;t have to figure it out :-)</translatorcomment>
-        <translation type="obsolete">Skjema</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Merk alt</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Søk</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Innstilinger</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Generelt</translation>
-    </message>
-    <message>
-        <source>Home:</source>
-        <translation type="obsolete">Hjem:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Sett til nåværende side</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Slett elementer fra historien:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Etter en dag</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Etter en uke</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Etter to uker</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Etter en måned</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Etter ett år</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Manuelt</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Åpne lenker fra andre programmer:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">I en fane i det nåværende vinduet</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>I et nytt vindu</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Utforming</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Fastbreddeskrift:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Personvern</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Nettinnhold</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Aktiver programtillegg</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Aktiver Javascript</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Informasjonskapsler</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Aksepter informasjonskapsler:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Alltid</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Aldri</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Kun fra sider du surfer til</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Unntak...</translation>
-    </message>
-    <message>
-        <source>Keep until:</source>
-        <translation type="obsolete">Behold inntil:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>De utløper</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Jeg lukker programmet</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Høyst 90 dager</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Informasjonskapsler...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Mellomtjener</translation>
-    </message>
-    <message>
-        <source>Enable proxy</source>
-        <translation type="obsolete">Aktiver mellomtjener</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Type:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="obsolete">Host:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Brukernavn:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Passord:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avansert</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Stilsett:</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Nedlastinger</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Spørr om målkatalog hver gang</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Bruk denne katalogen:</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Standard skrift:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Velg...</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Når programmet avsluttes</translation>
-    </message>
-    <message>
-        <source>Enable Images</source>
-        <translation type="obsolete">Aktiver bilder</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Det er %1 aktive nedlastinger
+Er du sikker på at du vil avslutte?</translation>
     </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Faner</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n minutt gjennstår</numerusform>
+            <numerusform>%n minutter gjennstår</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Aktiver faner og vinduer når de opprettes</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n sekund gjennstår</numerusform>
+            <numerusform>%n sekunder gjennstår</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Be om bekreftelse for å lukke flere faner</translation>
+        <source>bytes</source>
+        <translation>bytes</translation>
     </message>
     <message>
-        <source>On startup:</source>
-        <translation>Ved oppstart:</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Show my home page</source>
-        <translation>Vis min hjemmeside</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Show a blank page</source>
-        <translation>Vis en blank side</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Gjennoprett vinduer og faner fra forrige gang</translation>
+        <source>Open</source>
+        <translation>Åpne</translation>
     </message>
     <message>
-        <source>Preferences</source>
-        <translation>Egenskaper</translation>
+        <source>Copy</source>
+        <translation>Kopier</translation>
     </message>
     <message>
-        <source>Home Page:</source>
-        <translation>Hjemmeside:</translation>
+        <source>Delete</source>
+        <translation>Slett</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>View Images</source>
-        <translation>Vis bilder</translation>
+        <source>Show All History</source>
+        <translation>Vis hele historien</translation>
     </message>
     <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Behold informasjonskapsler inntil:</translation>
+        <source>Clear History</source>
+        <translation>Slett historien</translation>
     </message>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Vis kunn en lukkeknapp istedet for en per fane</translation>
+        <source>Clear History...</source>
+        <translation>Slett historien...</translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation>Bruk mellomtjener</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Vil du slette historien?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Host name:</source>
-        <translation>Vertsnavn:</translation>
+        <source>Title</source>
+        <translation>Tittel</translation>
     </message>
     <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Foretrukkne språk for visning av nettsider:</translation>
+        <source>Address</source>
+        <translation>Adresse</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Block Popup Windows</source>
-        <translation>Blokker sprettoppvinduer</translation>
+        <source>Earlier Today</source>
+        <translation>I dag</translation>
     </message>
-    <message>
-        <source>Opening links</source>
-        <translation>Åpning av lenker</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n element</numerusform>
+            <numerusform>%n elementer</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Lenker som vil åpnes i et nytt vindu:</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>I en ny, aktiv fane i det aktive vinduet</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>I en ny fane i det aktive vinduet</translation>
+        <source>Search!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
-        <translation>I den aktive fanen</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Secure)</source>
-        <translation>Http (Sikker)</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translatorcomment>I don&apos;t know the Norwegian equivalent of this word in this context.</translatorcomment>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Bruk ClickToFlash på flash-programtillegg</translation>
+        <source>Choose language</source>
+        <translation>Velg språk</translation>
     </message>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Filtrer ut sporingsinformasjonskapsler</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Du kan bruke at annet språk enn&lt;br&gt;operativsystemets standardspråk.&lt;/p&gt;&lt;p&gt;Velg språk&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Be om bekreftelse for å lukke flere faner eller viduer</translation>
+        <source>No translation files are installed at %1.</source>
+        <translation>Ingen oversettelsesfiler er installert i %1.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Lukk programmet når siste fane blir lukket</translation>
+        <source>Open File</source>
+        <translation>Åpne fil</translation>
     </message>
     <message>
-        <source>Enable network cache</source>
-        <translation>Aktiver nettverkshurtiglager</translation>
+        <source>OpenSearch</source>
+        <translation>OpenSearch</translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
-        <translation>Maksimal størrelse:</translation>
+        <source>Error</source>
+        <translation>Feil</translation>
     </message>
     <message>
-        <source> MB</source>
-        <translation>MB</translation>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
+        <translation>%1 er ikke en gyldig OpenSearch 1.1 beskrivelse, eller så finnes den allerede i listen.</translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Bruk standardsøkemotoren hvis URLen gitt av brukeren er ugyldig</translation>
+        <source>You must have at least one search engine in here.</source>
+        <translation>Det må være minst en søkemotor her.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source>Choose Directory...</source>
-        <translation>Velg katalog...</translation>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
+        <translation>&lt;strong&gt;Beskrivelse:&lt;/strong&gt; %1</translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation>En informasjonskapselsesjon slutter:</translation>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
+        <translation>&lt;strong&gt;Gir forslag&lt;/strong&gt;</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
-        <translation>Når jeg skruv av programmet</translation>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 day</source>
-        <translation>1 dag</translation>
+        <source>Name</source>
+        <translation>Navn</translation>
     </message>
     <message>
-        <source>2 days</source>
-        <translation>2 dager</translation>
+        <source>Keywords</source>
+        <translation>Nøkkelord</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>3 days</source>
-        <translation>3 dager</translation>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
+        <translation>Vil du legge til den følgende motoren i listen over søkemotorer?&lt;br /&gt;&lt;br /&gt;Navn: %1&lt;br /&gt;Søker på: %2</translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>7 days</source>
-        <translation>7 dager</translation>
+        <source>Allow</source>
+        <translation type="unfinished">Tillat</translation>
     </message>
     <message>
-        <source>30 days</source>
-        <translation>30 dager</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AutoFill</source>
-        <translation>AutoFill</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation>AutoFill skjemaer:</translation>
+        <source>Not Found</source>
+        <translation>Ikke funnet</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>User names and passwords</source>
-        <translation>Brukernavn og passord</translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Filen er ikke en XBEL versjon 1.0 fil.</translation>
     </message>
     <message>
-        <source>Edit...</source>
-        <translation>Rediger...</translation>
+        <source>Unknown title</source>
+        <translation>Ukjent tittel</translation>
     </message>
     <message>
-        <source>Browse...</source>
-        <translation>Bla igjennom...</translation>
+        <source>The file is not an OpenSearch 1.1 file.</source>
+        <translation>Filen er ikke en OpenSearch 1.1 fil.</translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
-        <translation>Omstart påkrevd</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>Nettverkshurtiglagerkonfigurasjonen har blitt endret. Nettleseren må startes på nytt for å kunne bruke endringene.</translation>
+        <source>Search</source>
+        <translation>Søk</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>Velg katalog</translation>
@@ -2200,18 +1000,6 @@ Vil du ignorere disse feilene?&lt;qt&gt;</translation>
         <source>&amp;Find</source>
         <translation>&amp;Finn</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Vis</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">&amp;Bryt linjer</translation>
-    </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Sidens kildekode</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>Kildekoden til %1</translation>
@@ -2219,10 +1007,6 @@ Vil du ignorere disse feilene?&lt;qt&gt;</translation>
 </context>
 <context>
     <name>TabBar</name>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Ny &amp;fane</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Kopier fane</translation>
@@ -2274,22 +1058,6 @@ Vil du ignorere disse feilene?&lt;qt&gt;</translation>
         <source>Recently Closed Tabs</source>
         <translation>Nylig lukkede faner</translation>
     </message>
-    <message>
-        <source>(Untitled)</source>
-        <translation type="obsolete">(Uten tittel)</translation>
-    </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Vil du virkelig lukke denne siden?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Du har gjort endringer til denne siden og når du lukker den vil du bli tapt.
-Vil du virkelig lukke denne siden?
-</translation>
-    </message>
     <message>
         <source>Untitled</source>
         <translation>Uten tittel</translation>
@@ -2310,10 +1078,6 @@ Vil du virkelig lukke denne siden?
         <source>Loading...</source>
         <translation>Laster...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Laster %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Lastet ferdig</translation>
@@ -2326,13 +1090,13 @@ Vil du virkelig lukke denne siden?
         <source>Bookmark All Tabs</source>
         <translation>Arkiver alle faner som bokmerker</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
-    <message>
-        <source>Google</source>
-        <translation type="obsolete">Google</translation>
-    </message>
     <message>
         <source>No Recent Searches</source>
         <translation>Ingen nylige søk</translation>
@@ -2349,20 +1113,12 @@ Vil du virkelig lukke denne siden?
         <source>Suggestions</source>
         <translation>Forslag</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Legg til &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">Konfigurer søkemotorer...</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
     <message>
         <source>Default</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">Forvalg</translation>
     </message>
     <message>
         <source>Other...</source>
@@ -2377,45 +1133,6 @@ Vil du virkelig lukke denne siden?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Feil ved lasting av side: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Ved tilkobling til: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.trolltech.com instead of &lt;b&gt;www&lt;/b&gt;.trolltech.com.</source>
-        <translation type="obsolete">Sjekk adresselinjen for feil som &lt;b&gt;ww&lt;/b&gt;.trolltech.com isteden for &lt;b&gt;www&lt;/b&gt;.trolltech.com.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try to check the network connection.</source>
-        <translation type="obsolete">Hvis adressen er riktig, undersøk nettilkolingen.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Hvis datamaskinen eller nettverket ditt er beskyttet av en brannmur eller mellomtjener, sjekk at nettleseren har adgang til nettverket.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Sjekk adresselinjen for feil som &lt;b&gt;ww&lt;/b&gt;.arora-browser.org isteden for &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Hvis adressen er riktig undersøk nettilkoblingen.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Sender POST forespørsel på nytt</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Forespørselen, sammen med all dataen, må sendes på nytt for å kunne vise siden. Dette kan føre til uforutsette konsekvenser. F.eks., kan den samme handlingen bli utført flere ganger. Vil du fortsette?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2466,38 +1183,6 @@ Vil du virkelig lukke denne siden?
         <source>Search with...</source>
         <translation>Søk med...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Legg til i søkeverktøylinja</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Metoden er ikke støttet</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>%1 metoden er ikke støttet.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Søkemotor</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Velg den ønskede søkemotoren</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Søkemotorens navn</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Gi søkemotoren et navn</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Blokker bilde</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/nl.ts b/src/locale/nl.ts
index 11909294..922b4981 100644
--- a/src/locale/nl.ts
+++ b/src/locale/nl.ts
@@ -11,146 +11,10 @@
         <source>License</source>
         <translation>Licentie</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Lichte browser gebaseerd op WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Sluiten</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>Over %1</translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>WebKit-versie: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Talen</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Talen in volgorde van voorkeur:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Om&amp;hoog</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Om&amp;laag</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>Ve&amp;rwijderen</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Toevoegen...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>Geblokkeerd door regel: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Eigen regel toevoegen</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Meer leren over regels schrijven...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Abonnement bijwerken</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Abonnementen bekijken...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Abonnement verwijderen</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>Advertentieblokkering instellen</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>Advertentieblokkering inschakelen</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Actie</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Eigen regels</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Regel</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Abonneren?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Aan dit abonnement voor advertentieblokkering abonneren?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -158,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Bladwijzer toevoegen</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Voer de naam voor de bladwijzer in, en kies waar op te slaan.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Url</translation>
@@ -175,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Map toevoegen</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Formulierwachtwoorden</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Verwijderen</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Alle verwijderen</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Wilt u dit wachtwoord opslaan?&lt;/b&gt;&lt;br&gt;         Om opgeslagen wachtwoorden na te kijken of te verwijderen, open het deel Automatisch Invullen in de voorkeuren.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Nooit voor deze site</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Niet nu</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Website</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Gebruikersnaam</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -238,18 +53,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nieuwe map</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Bladwijzers</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>Ver&amp;wijderen</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Map toevoegen</translation>
-    </message>
     <message>
         <source>Edit Name</source>
         <translation>Naam bewerken</translation>
@@ -337,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>htmlToXBel is nodig</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>htmlToXBel, wat wordt geleverd met Arora, is nodig om HTML-bladwijzers te importeren. Het is echter niet geïnstalleerd.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Bladwijzer laden</translation>
@@ -351,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Fout bij het laden van HTML-bladwijzers: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -406,8 +209,8 @@ Wilt u toch afsluiten?</translation>
         <translation>Herstellen mislukt</translation>
     </message>
     <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora crashte bij het herstellen van deze sessie. Opnieuw proberen?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -440,14 +243,6 @@ Wilt u toch afsluiten?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>Bladwijzers &amp;exporteren...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Afdruk&amp;voorbeeld...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Afdrukken...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Anoniem sur&amp;fen...</translation>
@@ -570,10 +365,6 @@ Wilt u toch afsluiten?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Web &amp;Inspector inschakelen</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Help</translation>
@@ -602,11 +393,6 @@ Wilt u toch afsluiten?</translation>
         <source>Hide Toolbar</source>
         <translation>Werkbalk verbergen</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Webresources openen</translation>
@@ -615,10 +401,6 @@ Wilt u toch afsluiten?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Webresources (*.html *.htm *.svg *.png *.gif *.svgz);;Alle bestanden(*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Document afdrukken</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Bent u zeker dat u anoniem surfen wilt inschakelen?</translation>
@@ -627,16 +409,6 @@ Wilt u toch afsluiten?</translation>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Bent u zeker dat u het venster wil sluiten? Er zijn %1 tabs geopend</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Web Inspector</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>De Web Inspector zal alleen correct werken voor pagina&apos;s die werden geladen na het inschakelen.
-Wilt u alle pagina&apos;s herladen?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Stop het laden van deze pagina</translation>
@@ -739,10 +511,6 @@ Wilt u alle pagina&apos;s herladen?</translation>
         <source>Configure Search Engines...</source>
         <translation>Zoekmachines instellen...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;Advertentieblokkering...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Wanneer anoniem surfen aan staat zullen sommige acties omtrent uw privacy worden uitgeschakeld:</translation>
@@ -755,10 +523,6 @@ Wilt u alle pagina&apos;s herladen?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Items worden automatisch verwijderd uit het Downloads-scherm.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Nieuwe cookies worden niet opgeslagen, huidige cookies kunnen niet worden bereikt.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Sitepictogrammen worden niet opgeslagen.</translation>
@@ -799,6 +563,19 @@ Wilt u alle pagina&apos;s herladen?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -829,10 +606,6 @@ Wilt u alle pagina&apos;s herladen?</translation>
         <source>&amp;Search History</source>
         <translation>&amp;Zoekgeschiedenis</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Website&amp;pictogrammen</translation>
@@ -845,375 +618,174 @@ Wilt u alle pagina&apos;s herladen?</translation>
         <source>&amp;Cancel</source>
         <translation>&amp;Annuleren</translation>
     </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>Gec&amp;achte pagina&apos;s</translation>
-    </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation>Laden</translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation>Alles laden</translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>%1 aan whitelist toevoegen</translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation>Van whitelist verwijderen</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load Flash</source>
-        <translation>Flash laden</translation>
+        <source>Downloads</source>
+        <translation>Downloads</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Whitelist-sites</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CookieExceptionsModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Website</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Toestaan</translation>
-    </message>
+    <name>DownloadItem</name>
     <message>
-        <source>Block</source>
-        <translation>Blokkeren</translation>
+        <source>Save File</source>
+        <translation>Bestand opslaan</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Voor deze sessie toestaan</translation>
+        <source>Download canceled: %1</source>
+        <translation>Download geannuleerd: %1</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Regel</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Fout bij opslaan: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Website</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Netwerkfout: %1</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Naam</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Pad</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Fout bij het openen van het outputbestand: %1</translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Veilig</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 van %2 (%3/sec) - %4</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Vervalt</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Downloadmap (%1) kon niet worden gemaakt.</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Inhoud</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>waar</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>fout</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation>Sessie-cookie</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>Ver&amp;wijderen</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bytes</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>&amp;Alle cookies verwijderen</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>&amp;Regel toevoegen</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Cookie-uitzonderingen</translation>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>1 download</numerusform>
+            <numerusform>%n downloads</numerusform>
+        </translation>
     </message>
     <message>
-        <source>New Exception</source>
-        <translation>Nieuwe uitzondering</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Er zijn %1 downloads bezig
+Wilt u toch afsluiten?</translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n minuut resterend</numerusform>
+            <numerusform>%n minuten resterend</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n seconde resterend</numerusform>
+            <numerusform>%n seconden resterend</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Domain:</source>
-        <translation>Domein:</translation>
+        <source>bytes</source>
+        <translation>bytes</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Blokkeren</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Toestaan voor sessie</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Toestaan</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Exceptions</source>
-        <translation>Uitzonderingen</translation>
+        <source>Open</source>
+        <translation>Openen</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>Ver&amp;wijderen</translation>
+        <source>Copy</source>
+        <translation>Kopieren</translation>
     </message>
     <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;Alle verwijderen</translation>
+        <source>Delete</source>
+        <translation>Verwijderen</translation>
     </message>
 </context>
 <context>
-    <name>DownloadDialog</name>
+    <name>HistoryMenu</name>
     <message>
-        <source>Downloads</source>
-        <translation>Downloads</translation>
+        <source>Show All History</source>
+        <translation>Volledige geschiedenis tonen</translation>
     </message>
     <message>
-        <source>Clean up</source>
-        <translation>Opschonen</translation>
+        <source>Clear History</source>
+        <translation>Geschiedenis wissen</translation>
     </message>
     <message>
-        <source>0 Items</source>
-        <translation>0 items</translation>
+        <source>Clear History...</source>
+        <translation>Geschiedenis wissen...</translation>
     </message>
     <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Wilt u de hele geschiedenis wissen?</translation>
     </message>
 </context>
 <context>
-    <name>DownloadItem</name>
+    <name>HistoryModel</name>
     <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
+        <source>Title</source>
+        <translation>Titel</translation>
     </message>
     <message>
-        <source>Filename</source>
-        <translation>Bestandsnaam</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Opnieuw proberen</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Stoppen</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Openen</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Bestand opslaan</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Download geannuleerd: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Fout bij opslaan: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Netwerkfout: %1</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 van %2 - Gestopt</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Fout bij het openen van het outputbestand: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 van %2 (%3/sec) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Downloadmap (%1) kon niet worden gemaakt.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>1 download</numerusform>
-            <numerusform>%n downloads</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Er zijn %1 downloads bezig
-Wilt u toch afsluiten?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minuut resterend</numerusform>
-            <numerusform>%n minuten resterend</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n seconde resterend</numerusform>
-            <numerusform>%n seconden resterend</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Geen fout</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Fout bij het openen: %1: is geen bestand of map</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Kon %1 niet lezen</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Inhoud van %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Openen</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopieren</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Verwijderen</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Geschiedenis</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>Ver&amp;wijderen</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;Alles verwijderen</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Volledige geschiedenis tonen</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Geschiedenis wissen</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Geschiedenis wissen...</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Wilt u de hele geschiedenis wissen?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Titel</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
+        <source>Address</source>
+        <translation>Adres</translation>
     </message>
 </context>
 <context>
@@ -1231,29 +803,29 @@ Wilt u toch afsluiten?</translation>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translation>Welkom bij Arora!</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>Arora Start</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>Zoeken!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>Zoekresultaten van</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>Over Arora</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1272,49 +844,6 @@ Wilt u toch afsluiten?</translation>
         <translation>Er zijn geen vertaalbestanden geïnstalleerd op %1.</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Voer gebruikersnaam en wachtwoord voor &quot;%1&quot; op %2 in&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Verbinden met proxy &quot;%1&quot; met:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - SSL-fouten</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL-fouten:&lt;br/&gt;&lt;br/&gt;voor: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Wilt u deze fouten negeren?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Certificaten:&lt;br/&gt;%1&lt;br/&gt;Wilt u al deze certificaten accepteren?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>UItgever: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Niet geldig voor: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Geldig tot: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Alternatieve namen:</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1337,26 +866,6 @@ Wilt u deze fouten negeren?&lt;/qt&gt;</translation>
         <source>You must have at least one search engine in here.</source>
         <translation>U moet hiet tenminste één zoekmachine hebben.</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>OpenSearch-manager</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>Standaa&amp;rdwaarden herstellen</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>Verwij&amp;deren</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Toevoegen</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Sluiten</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1389,26 +898,18 @@ Wilt u deze fouten negeren?&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Authentificatie vereist</translation>
-    </message>
+    <name>PermissionBar</name>
     <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
+        <source>Allow</source>
+        <translation type="unfinished">Toestaan</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>Gebruikersnaam:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Wachtwoord:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1418,25 +919,6 @@ Wilt u deze fouten negeren?&lt;/qt&gt;</translation>
         <translation>Niet gevonden</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Proxy-authentificatie</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Met proxy verbinden</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Gebruikersnaam:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Wachtwoord:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1451,398 +933,47 @@ Wilt u deze fouten negeren?&lt;/qt&gt;</translation>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>Het bestand is geen OpenSearch 1.1-bestand.</translation>
     </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Done</source>
-        <translation>Klaar</translation>
-    </message>
     <message>
-        <source>Highlight All</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Zoeken</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Huidige pagina gebruiken</translation>
-    </message>
     <message>
-        <source>Remove history items:</source>
-        <translation>Geschiedenisitems verwijderen:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Na één dag</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Na één week</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Na twee weken</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Na één maand</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Na één jaar</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Handmatig</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Bij het afsluiten van het programma</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Links uit programma&apos;s openen:</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>In een nieuw venster</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Downloads</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Elke keer om een bestemming vragen</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Deze bestemming gebruiken:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Uiterlijk</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Standaard lettertype:</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Selecteren...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Lettertype met vaste breedte:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Privacy</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Webinhoud</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Plugins inschakelen</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Javascript inschakelen</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Cookies accepteren:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Altijd</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Nooit</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Alleen van sites waar u heen surft</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Uitzonderingen...</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Ze vervallen</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Ik het programma afsluit</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Maximaal 90 dagen</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies...</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Tabs</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Tabs en vensters selecteren als ze gemaakt worden</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Type:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Poort:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Gebruikersnaam:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Wachtwoord:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Geavanceerd</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Stijlblad:</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Bij het opstarten:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Toon mijn startpagina</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Toon een lege pagina</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Herstel vensters en tabs van de vorige keer</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation>Voorkeuren</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Startpagina:</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Afbeeldingen weergeven</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Cookies houden tot:</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>Proxyserver gebruiken</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>Hostnaam:</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Alleen één sluitknop tonen in plaats van één voor elke tab</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Popupvensters blokkeren</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>Links openen</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Links die in een nieuw venster geopend willen worden:</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>In een nieuwe geselecteerde tab in het huidige venster</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>In een nieuwe tab in het huidige venster</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>In de huidige tab</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>Http (veilig)</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (transparant)</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Voorkeurstaal om webpagina&apos;s in te zien:</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>ClickToFlash gebruiken bij flashplugins</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Opspoor-cookies filteren</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Bevestiging vragen bij het sluiten van meerdere tabs</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Het programma afsluiten indien de laatste tab wordt gesloten</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>Netwerkcache inschakelen</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>Maximumgrootte:</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Op de standaard zoekmachine terugvallen bij een foute URL</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation>Map kiezen...</translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation>Een cookiesessie eindigt:</translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation>Wanneer ik het programma afsluit</translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation>Na 1 dag</translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation>Na 2 dagen</translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation>Na 3 dagen</translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation>Na 7 dagen</translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation>Na 30 dagen</translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation>Automatisch invullen</translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation>Webformulieren automatisch invullen:</translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation>Gebruikersnamen en wachtwoorden</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation>Bewerken...</translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Bladeren...</translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation>Herstart vereist</translation>
-    </message>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>De configuratie van de netwerkcache is gewijzigd. Om dit effectief toe te passen moet de browser opnieuw worden opgestart.</translation>
+        <source>Search</source>
+        <translation>Zoeken</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>Map kiezen</translation>
@@ -1928,18 +1059,6 @@ Wilt u deze fouten negeren?&lt;/qt&gt;</translation>
         <source>Recently Closed Tabs</source>
         <translation>Kortgeleden gesloten tabs</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Bent u zeker dat u deze pagina wilt sluiten?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>U hebt deze pagina gewijzigd en als u deze sluit zult u de wijzigingen kwijtraken.
-Bent u zeker dat u deze pagina wilt sluiten?
-</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation>Ctrl-]</translation>
@@ -1956,10 +1075,6 @@ Bent u zeker dat u deze pagina wilt sluiten?
         <source>Loading...</source>
         <translation>Laden...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Laden %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Laden voltooid</translation>
@@ -1976,6 +1091,10 @@ Bent u zeker dat u deze pagina wilt sluiten?
         <source>Bookmark All Tabs</source>
         <translation>Van alle tabs bladwijzers maken</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -1995,10 +1114,6 @@ Bent u zeker dat u deze pagina wilt sluiten?
         <source>Suggestions</source>
         <translation>Suggesties</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>&apos;%1&apos; toevoegen</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2019,37 +1134,6 @@ Bent u zeker dat u deze pagina wilt sluiten?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Fout bij het laden van de pagina: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Bij het verbinden met: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Het adres controleren op fouten als &lt;b&gt;ww&lt;/b&gt;.arora-browser.org in plaats van &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Indien uw computer of netwerk beschermd wordt door een firewall of proxy, zorg er dan voor dat de browser toegang krijgt tot het netwerk.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Indien het adres juist is, de netwerkverbinding proberen te testen.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>POST opnieuw versturen</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2100,38 +1184,6 @@ Bent u zeker dat u deze pagina wilt sluiten?
         <source>Search with...</source>
         <translation>Zoeken met...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Aan zoekbalk toevoegen</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Methode niet ondersteund</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>De methode %1 wordt niet ondersteund.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Zoekmachine</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Kies de zoekmachine</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Naam</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Kies een naam voor de zoekmachine</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/pl_PL.ts b/src/locale/pl_PL.ts
index 22bd0555..9825b94a 100644
--- a/src/locale/pl_PL.ts
+++ b/src/locale/pl_PL.ts
@@ -11,146 +11,10 @@
         <source>License</source>
         <translation>Licencja</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Lekka przeglądarka internetowa bazująca na silniku WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Zamknij</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>O programie %1</translation>
     </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>Wersja WebKita: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Języki</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Języki: w kolejności preferencji:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Przesuń w &amp;górę</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Przesuń w &amp;dół</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Usuń</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Dodaj...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>Zablokowany przez regułę AdBlock: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Dodaj własną regułę</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Dowiedz się więcej o tworzeniu reguł...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Zaktualizuj subskrypcję</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Przeglądaj subskrypcje...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Usuń subskrypcję</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>Konfiguracja AdBlock</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>Włącz AdBlock</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Akcja</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Własne reguły</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Reguła</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Subskrybować?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Dodać tę subskrypcję AdBlocka?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -158,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Dodaj zakładkę</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Podaj nazwę dla zakładki i wybierz gdzie chcesz ją umieścić.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>URL</translation>
@@ -175,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Dodaj katalog</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Hasła w formularzach</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Usuń</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Usuń wszystkie</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Chciałbyś zapisać to hasło?&lt;/b&gt;&lt;br /&gt;         By przeglądać hasła, które zapisałeś i usunąć je, otwórz panel AutoFill w preferencjach.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Nigdy dla tej strony</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Nie teraz</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Strona</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Nazwa użytkownika</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -238,18 +53,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nowy katalog</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Zakładki</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Usuń</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Dodaj katalog</translation>
-    </message>
     <message>
         <source>Edit Name</source>
         <translation>Edytuj nazwę</translation>
@@ -337,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>Narzędzie htmlToXBel</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>Narzędzie htmlToXBel, które jest dostarczane z Arorą i wymagane do zaimportowania zakładek HTML, nie jest zainstalowane bądź nie jest dostępne w systemowych ścieżkach przeszukiwania.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Ładowanie zakładek</translation>
@@ -351,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Błąd w trakcie ładowania zakładek: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -392,10 +195,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Dodaj katalog...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Zakładki</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -410,12 +209,8 @@ Czy mimo to chcesz zakończyć?</translation>
         <translation>Przywracanie nie powiodło się</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Zapisana sesja nie mogła zostać przywrócona ponieważ Arora wysypała się.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora wywalila się w trakcie odzyskiwania sesji. Spróbować jeszcze raz?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -448,14 +243,6 @@ Czy mimo to chcesz zakończyć?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Eksportuj zakładki...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Podgląd wyd&amp;ruku...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Drukuj...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>&amp;Prywatne przeglądanie...</translation>
@@ -578,10 +365,6 @@ Czy mimo to chcesz zakończyć?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Włącz &amp;inspektora stron</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Pomoc</translation>
@@ -610,11 +393,6 @@ Czy mimo to chcesz zakończyć?</translation>
         <source>Hide Toolbar</source>
         <translation>Schowaj pasek narzędziowy</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Otwórz zasób internetowy</translation>
@@ -623,10 +401,6 @@ Czy mimo to chcesz zakończyć?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Pliki internetowe (*.html *.htm *.svg *.png *.gif *.svgz);;Wszystkie pliki (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Drukuj dokument</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Czy jesteś pewny że chcesz włączyć prywatne przeglądanie sieci?</translation>
@@ -635,16 +409,6 @@ Czy mimo to chcesz zakończyć?</translation>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Czy jesteś pewien, że chcesz zamknąć okno? %1 kart jest otwartych</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Inspektor stron</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Inspektor stron działa poprawnie tylko dla stron, które zostały wczytane po jego aktywowaniu.
-Czy chcesz odświeżyć wszystkie strony?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Zatrzymaj ładowanie strony</translation>
@@ -759,10 +523,6 @@ Czy chcesz odświeżyć wszystkie strony?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Pobrane pliki są automatycznie usuwane z okna Pobierania.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Nowe ciasteczka nie są przechowywane, aktualnie istniejące nie mogą być modyfikowane.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Ikony stron nie będą zapisywane.</translation>
@@ -787,10 +547,6 @@ Czy chcesz odświeżyć wszystkie strony?</translation>
         <source>Private Browsing</source>
         <translation>Prywatne przeglądanie</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;AdBlock...</translation>
-    </message>
     <message>
         <source>User Agent</source>
         <translation type="unfinished"></translation>
@@ -807,6 +563,19 @@ Czy chcesz odświeżyć wszystkie strony?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -837,10 +606,6 @@ Czy chcesz odświeżyć wszystkie strony?</translation>
         <source>&amp;Search History</source>
         <translation>Historia &amp;wyszukiwania</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Ciasteczka</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>&amp;Ikony stron</translation>
@@ -853,385 +618,184 @@ Czy chcesz odświeżyć wszystkie strony?</translation>
         <source>&amp;Cancel</source>
         <translation>&amp;Anuluj</translation>
     </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>Z&amp;apisane w cache strony</translation>
-    </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation>Wczytaj</translation>
+        <source>Downloads</source>
+        <translation>Pobieranie</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>Wczytaj wszystkie</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Dodaj %1 do białej listy</translation>
+        <source>Save File</source>
+        <translation>Zapisz plik</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>Usuń z białej listy</translation>
+        <source>Download canceled: %1</source>
+        <translation>Pobieranie anulowane: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Błąd przy zapisie: %1</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Wczytaj Flash</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Błąd sieci: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Strony na białej liście</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Strona</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Błąd w trakcie otwierania pliku docelowego: %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Zezwól</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 z %2 (%3/sek) - %4</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Blokuj</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Katalog docelowy (%1) nie mógł zostać stworzony.</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Zezwól na czas sesji</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Zasada</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Strona</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Nazwa</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Ścieżka</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Bezpieczne</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bajtów</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Wygasa</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Zawartość</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
-    <message>
-        <source>true</source>
-        <translation>prawda</translation>
+</context>
+<context>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n pobierany plik</numerusform>
+            <numerusform>%n pobierane pliki</numerusform>
+            <numerusform>%n pobieranych plików</numerusform>
+        </translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>fałsz</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Trwa pobieranie %1 plików.
+Czy mimo to chcesz zakończyć?</translation>
     </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>Ciasteczko sesji</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n minuta pozostała</numerusform>
+            <numerusform>%n minuty pozostały</numerusform>
+            <numerusform>%n minut pozostało</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n sekunda pozostała</numerusform>
+            <numerusform>%n sekundy pozostały</numerusform>
+            <numerusform>%n sekund pozostało</numerusform>
+        </translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Ciasteczka</translation>
+        <source>bytes</source>
+        <translation>bajtów</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Usuń</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Usuń &amp;wszystkie ciasteczka</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>Dodaj &amp;regułę</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
+    <name>HistoryDialog</name>
     <message>
-        <source>Cookie Exceptions</source>
-        <translation>Wyjątki ciasteczek</translation>
+        <source>Open</source>
+        <translation>Otwórz</translation>
     </message>
     <message>
-        <source>New Exception</source>
-        <translation>Nowy wyjątek</translation>
+        <source>Copy</source>
+        <translation>Kopiuj</translation>
     </message>
     <message>
-        <source>Domain:</source>
-        <translation>Domena:</translation>
+        <source>Delete</source>
+        <translation>Skasuj</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Block</source>
-        <translation>Blokuj</translation>
+        <source>Show All History</source>
+        <translation>Pokaż całą historię</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Zezwól na czas sesji</translation>
+        <source>Clear History</source>
+        <translation>Wyczyść historię</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Zezwól</translation>
+        <source>Clear History...</source>
+        <translation>Wyczyść historię...</translation>
     </message>
     <message>
-        <source>Exceptions</source>
-        <translation>Wyjątki</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Chcesz wyczyścić historię?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Usuń</translation>
+        <source>Title</source>
+        <translation>Tytuł</translation>
     </message>
     <message>
-        <source>Remove &amp;All</source>
-        <translation>Usuń &amp;wszystkie</translation>
+        <source>Address</source>
+        <translation>Adres</translation>
     </message>
 </context>
 <context>
-    <name>DownloadDialog</name>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Downloads</source>
-        <translation>Pobieranie</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Wyczyść</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 elementów</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Ico</source>
-        <translation>Ikona</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Nazwa pliku</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Spróbuj ponownie</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Zatrzymaj</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Otwórz</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Zapisz plik</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Pobieranie anulowane: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Błąd przy zapisie: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Błąd sieci: %1</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 z %2 - Zatrzymano</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Błąd w trakcie otwierania pliku docelowego: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 z %2 (%3/sek) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Katalog docelowy (%1) nie mógł zostać stworzony.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n pobierany plik</numerusform>
-            <numerusform>%n pobierane pliki</numerusform>
-            <numerusform>%n pobieranych plików</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Trwa pobieranie %1 plików.
-Czy mimo to chcesz zakończyć?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minuta pozostała</numerusform>
-            <numerusform>%n minuty pozostały</numerusform>
-            <numerusform>%n minut pozostało</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n sekunda pozostała</numerusform>
-            <numerusform>%n sekundy pozostały</numerusform>
-            <numerusform>%n sekund pozostało</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bajtów</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Brak błędu</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Błąd w trakcie otwierania %1: Plik lub katalog nie istnieje</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Nie można czytać z %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Zawartość %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Otwórz</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopiuj</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Skasuj</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Historia</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Usuń</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Usuń &amp;wszystkie</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Pokaż całą historię</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Wyczyść historię</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Wyczyść historię...</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Chcesz wyczyścić historię?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Tytuł</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Dzisiaj</translation>
+        <source>Earlier Today</source>
+        <translation>Dzisiaj</translation>
     </message>
     <message numerus="yes">
         <source>%n item(s)</source>
@@ -1243,29 +807,29 @@ Czy mimo to chcesz zakończyć?</translation>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translation>Witaj w Arorze!</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>Arora Start</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>Szukaj!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>Wyniki wyszukiwania pochodzą z</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>O programie Arora</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1279,58 +843,11 @@ Czy mimo to chcesz zakończyć?</translation>
         <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
         <translation>&lt;p&gt;Możesz używać innego języka niż&lt;br /&gt;domyślny systemowy.&lt;/p&gt;&lt;p&gt;Wybierz język, z którego chciałbyś korzystać.&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Nie znaleziono żadnych plików językowych.</translation>
-    </message>
     <message>
         <source>No translation files are installed at %1.</source>
         <translation>Żadne pliki językowe nie są zainstalowane w %1.</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Wpisz nazwę użytkownika i hasło dla &quot;%1&quot; na %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Połącz się z proxy &quot;%1&quot; używając:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - Błędy SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Błędy SSL:&lt;br/&gt;&lt;br/&gt;dla: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Czy chcesz zignorować te błędy?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Certyfikaty:&lt;br/&gt;%1&lt;br/&gt;Czy chcesz zaakceptować wszystkie certyfikaty?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Wydawca: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Nieważny przed: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Ważny do: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Alternatywne nazwy:</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1353,26 +870,6 @@ Czy chcesz zignorować te błędy?&lt;/qt&gt;</translation>
         <source>You must have at least one search engine in here.</source>
         <translation>Musisz mieć co najmniej jedną wyszukiwarkę.</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Menedżer wyszukiwarek OpenSearch</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Przywróć domyślne</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Usuń</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Dodaj</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Zamknij</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1405,26 +902,18 @@ Czy chcesz zignorować te błędy?&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Wymagane uwierzytelnienie</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>ATRAPA IKONY</translation>
-    </message>
+    <name>PermissionBar</name>
     <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>ATRAPA TEKSTU WSTĘPNEGO</translation>
+        <source>Allow</source>
+        <translation type="unfinished">Zezwól</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>Nazwa użytkownika:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Hasło:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1434,25 +923,6 @@ Czy chcesz zignorować te błędy?&lt;/qt&gt;</translation>
         <translation>Nie znaleziono</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Uwierzytelnienie proxy</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Połącz z proxy</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Nazwa użytkownika:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Hasło:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1467,399 +937,47 @@ Czy chcesz zignorować te błędy?&lt;/qt&gt;</translation>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>Plik nie jest prawidłowym plikiem OpenSearch 1.1.</translation>
     </message>
-</context>
-<context>
-    <name>SearchBanner</name>
     <message>
-        <source>Done</source>
-        <translation>Zakończono</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Podświetl wszystkie</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Szukaj</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>General</source>
-        <translation>Ogólne</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Ustaw jako obecną stronę</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Usuń elementy historii:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Po jednym dniu</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Po tygodniu</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Po dwóch tygodniach</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Po miesiącu</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Po roku</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Ręcznie</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Otwórz linki z aplikacji:</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>W nowym oknie</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Pobieranie</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Za każdym razem pytaj o miejsce do zapisu</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Użyj następującego miejsca docelowego:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Wygląd</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Standardowa czcionka:</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Wybierz...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Czcionka o stałej szerokości:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Prywatność</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Zawartość sieci</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Włącz wtyczki</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Włącz obsługę Javascript</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Ciasteczka</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Akceptuj ciasteczka:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Zawsze</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Nigdy</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Tylko ze stron, które odwiedzasz</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Wyjątki...</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>aż wygasną</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>do zamknięcia programu</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>najwyżej 90 dni</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Ciasteczka...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Typ:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Nazwa użytkownika:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Hasło:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Zaawansowane</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Arkusz stylów:</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Podczas uruchamiania:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Otwórz moją stronę domową</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Otwórz pustą stronę</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Przywróć okna i karty z poprzedniej sesji</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Przy zamykaniu aplikacji</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Karty</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Wybierz karty i okna tak jak zostały utworzone</translation>
-    </message>
-    <message>
-        <source>Preferences</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Strona domowa:</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Wyświetlaj obrazki</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Przechowuj ciastka:</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>Użyj serwera proxy</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>Host name:</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Wyświetlaj tylko jeden przycisk zamknięcia karty zamiast jednego dla każdej karty</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Blokuj wyskakujące okna</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>Otwieraj łącza</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Łącza, które chcą utworzyć nowe okno:</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>W nowej aktywnej karcie w bieżącym oknie</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>W nowej karcie w bieżącym oknie</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>W bieżącej karcie</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>Http (bezpieczny)</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (przejrzysty)</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Preferowane języki do przeglądania stron:</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translatorcomment>not sure if ClickToFlash needs to be translated at all...</translatorcomment>
-        <translation>Użyj ClickToFlash dla pluginów flash</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Odrzucaj śledzące ciastka</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Potwierdź zamknięcie wielu kart lub okien naraz</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Zamknij aplikację, gdy ostatnia karta zostanie zamknięta</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>Włącz sieciową pamięć podręczną</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>Maksymalny rozmiar:</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Szukaj w domyślnej wyszukiwarce kiedy tekst niebedący URL-em jest wprowadzony przez użytkownika</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation>Wybierz katalog...</translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation>Sesja ciasteczka kończy się:</translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation>Podczas zamykania aplikacji</translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation>1 dzień</translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation>2 dni</translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation>3 dni</translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation>7 dni</translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation>30 dni</translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation>Autouzupełnianie formularzy</translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation>Uzupełniaj formularze:</translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation>Nazwy użytkownika i hasła</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation>Edytuj...</translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Przeglądaj...</translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
-        <translation>Ponowne uruchomienie wymagane</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>Konfiguracja pamięci podręcznej została zmieniona. Aby została wzięta pod uwagę, przeglądarka musi być uruchomiona ponownie.</translation>
+        <source>Search</source>
+        <translation>Szukaj</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>Wybierz katalog</translation>
@@ -1945,18 +1063,6 @@ Czy chcesz zignorować te błędy?&lt;/qt&gt;</translation>
         <source>Recently Closed Tabs</source>
         <translation>Ostatnio zamknięte karty</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Czy na pewno chcesz zamknąć tę stronę?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Wprowadziłeś modyfikacje na tej stronie i kiedy ją zamkniesz to utracisz wszystkie zmiany.
-Czy na pewno chcesz zamknąć tę stronę?
-</translation>
-    </message>
     <message>
         <source>Untitled</source>
         <translation>Bez tytułu</translation>
@@ -1973,10 +1079,6 @@ Czy na pewno chcesz zamknąć tę stronę?
         <source>Loading...</source>
         <translation>Ładowanie...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Ładowanie %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Zakończono ładowanie</translation>
@@ -1993,6 +1095,10 @@ Czy na pewno chcesz zamknąć tę stronę?
         <source>Bookmark All Tabs</source>
         <translation>Dodaj wszystkie karty do zakładek</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2012,10 +1118,6 @@ Czy na pewno chcesz zamknąć tę stronę?
         <source>Suggestions</source>
         <translation>Sugestie</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Dodaj &apos;%1&apos;</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2036,37 +1138,6 @@ Czy na pewno chcesz zamknąć tę stronę?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Błąd podczas ładowania strony: %1</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Jeśli twój komputer lub sieć jest chroniona zaporą sieciową lub proxy, upewnij się, że przeglądarka ma uprawnienia do dostępu do sieci.</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Podczas łączenia z: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Sprawdź adres pod kątem błędów takich jak &lt;b&gt;ww&lt;/b&gt;.arora-browser.org zamiast &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Jeśli adres jest prawidłowy, sprawdź poprawność połączenia internetowego.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Ponowne wysyłanie żądania POST</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Aby wyświetlić tę stronę, żądanie razem ze wszystkimi danymi musi być ponownie wysłane, co może prowadzić do nieoczekiwanego zachowania się strony np. ta sama akcja może być wykonana jeszcze raz. Czy na pewno chcesz kontynuować?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2117,38 +1188,6 @@ Czy na pewno chcesz zamknąć tę stronę?
         <source>Search with...</source>
         <translation>Szukaj z...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Dodaj do paska wyszukiwania</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Metoda żądania nie wspierana</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>Metoda %1 jest nie wspierana.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Wyszukiwarka</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Wybierz żądaną wyszukiwarkę</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Nazwa wyszukiwarki</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Podaj nazwę dla wyszukiwarki</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Zablokuj obrazek</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/pt_BR.ts b/src/locale/pt_BR.ts
index c01d1ed3..528634e4 100644
--- a/src/locale/pt_BR.ts
+++ b/src/locale/pt_BR.ts
@@ -15,142 +15,6 @@
         <source>License</source>
         <translation>Licença</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Navegador web leve baseado no Webkit</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Fechar</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>Versão do Webkit: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Idiomas</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Idiomas: em ordem de preferência:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Para &amp;cima</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Para &amp;baixo</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Adicionar...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>Bloqueado por AdBlockRule: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Adicionar regra personalizada</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Saiba mais sobre escrevendo regras...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Atualizar subscrição</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Navegar nas subscrições...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Remover subscrição</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>Configuração do AdBlock</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>Habilitar AdBlock</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Ação</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Personalizar regras</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Regra</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Inscrever-se?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Inscrever-se nesta subscrição AdBlock?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -158,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Adicionar favorito</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Escreva um nome para o favorito, e escolha onde deseja mantê-lo.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Url</translation>
@@ -175,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Adicionar pasta</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Formulário de senhas</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Remover</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Remover todos</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Gostaria de salvar esta senha?&lt;/b&gt;&lt;br&gt;         Para rever as senhas que você salvou e removê-las, abra a aba Preenchimento automático em Ferramentas &gt; Opções.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Nunca para este site</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Não agora</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Site</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Usuário</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -246,18 +61,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nova pasta</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Favoritos</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Adicionar pasta</translation>
-    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -287,16 +90,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Abrir arquivo</translation>
     </message>
-    <message>
-        <source>XBEL</source>
-        <translation type="obsolete">XBEL</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Erro ao carregar html de favoritos: %1
-</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>Importado %1</translation>
@@ -309,10 +102,6 @@ p, li { white-space: pre-wrap; }
         <source>%1 Bookmarks.xbel</source>
         <translation>%1 Bookmarks.xbel</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Export error</source>
         <translation>Erro ao exportar</translation>
@@ -351,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>Ferramenta htmlToXBel é requerida</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>A ferramenta htmlToXBel, que é expedida com o Arora e é necessária para importar os favoritos HTML, não está instalada ou disponível nos caminhos de procura.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Carregando favoritos</translation>
@@ -365,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Erro ao carregar os favoritos em HTML: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -386,10 +175,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Favoritos</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Abrir</translation>
@@ -410,17 +195,9 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Adicionar pasta...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Favoritos</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete"> (Alteração: %1 %2)</translation>
-    </message>
     <message>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
@@ -432,12 +209,8 @@ Você quer sair de qualquer maneira?</translation>
         <translation>Falha ao restaurar</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">A sessão salva não será restaurada porque Arora fechou ao tentar restaurar esta sessão.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora fechou durante a tentativa de restaurar essa sessão. Devo tentar novamente?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -470,14 +243,6 @@ Você quer sair de qualquer maneira?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Exportar favoritos...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Visualiza&amp;r impressão...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>Im&amp;primir...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Navegação pri&amp;vada...</translation>
@@ -526,10 +291,6 @@ Você quer sair de qualquer maneira?</translation>
         <source>Find P&amp;revious</source>
         <translation>Ante&amp;rior</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Preferê&amp;ncias...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -542,10 +303,6 @@ Você quer sair de qualquer maneira?</translation>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -652,14 +409,6 @@ Você quer sair de qualquer maneira?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">Mostrar mo&amp;nitor de rede</translation>
-    </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Habilitar &amp;inspetor web</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Ajuda</translation>
@@ -705,11 +454,6 @@ Você quer sair de qualquer maneira?</translation>
         <source>Hide Bookmarks Bar</source>
         <translation>Ocultar barra de favoritos</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Abrir recursos da web</translation>
@@ -718,32 +462,14 @@ Você quer sair de qualquer maneira?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Recursos web (*.html *.htm *.svg *.png *.gif *.svgz);; Todos os arquivos (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Imprimir documento</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Tem certeza que deseja ativar a navegação privada?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Quando a navegação privada está ligada, algumas medidas relativas a sua privacidade serão desativadas:&lt;ul&gt;&lt;li&gt; As páginas web não serão adicionadas no histórico.&lt;/li&gt;&lt;li&gt; Itens serão automaticamente removidos da janela de Downloads.&lt;/li&gt;&lt;li&gt; Novos cookies não serão armazenados, cookies atuais não podem ser acessados.&lt;/li&gt;&lt;li&gt; Ícones de sites não serão armazenados, sessões não serão salvas.&lt;/li&gt;&lt;li&gt; Pesquisas não serão adicionadas para o menu popup na caixa de pesquisa.&lt;/li&gt;&lt;/ul&gt;Até você fechar a janela, você ainda pode clicar nos botões Voltar e Avançar para retornar às páginas que você tinha aberto.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Tem certeza que deseja fechar a janela? Existem %1 abas abertas</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Inspetor web</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>O inspetor web só irá trabalhar corretamente para as páginas que foram carregadas após a habilitação.
-Você deseja recarregar todas as páginas?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Interromper o carregamento da página atual</translation>
@@ -777,10 +503,6 @@ Você deseja recarregar todas as páginas?</translation>
         <source>Alt+Ctrl+B</source>
         <translation>Alt+Ctrl+B</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; No new network cache is written to disk.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Quando a navegação privada estiver ligada, algumas ações a respeito de sua privacidade serão desativadas: &lt;ul&gt;&lt;li&gt; As páginas web não serão adicionadas ao histórico.&lt;/li&gt;&lt;li&gt; Os itens serão automaticamente removidos da janela de Download.&lt;/li&gt;&lt;li&gt; Novos cookies não serão armazenados, e cookies atuais não poderão ser acessados.&lt;/li&gt;&lt;li&gt; Os ícones dos sites não serão armazenados, a sessão não será salva.&lt;/li&gt;&lt;li&gt; As pesquisas não serão adicionadas para o menu pop-up na caixa de pesquisa.&lt;/li&gt;&lt;li&gt; Nenhum novo cache de rede será escrito em disco.&lt;/li&gt;&lt;/ul&gt; Até você fechar a janela, você ainda pode clicar nos botões Voltar e Avançar para retornar às páginas que você abriu.</translation>
-    </message>
     <message>
         <source>Options...</source>
         <translation>Opções...</translation>
@@ -789,10 +511,6 @@ Você deseja recarregar todas as páginas?</translation>
         <source>Configure Search Engines...</source>
         <translation>Configurar mecanismos de pesquisa...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;Ad Block...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Quando a navegação privada estiver ligada, algumas ações a respeito de sua privacidade serão desabilitadas:</translation>
@@ -805,10 +523,6 @@ Você deseja recarregar todas as páginas?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Os itens serão automaticamente removidos da janela de Download.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Novos cookies não serão armazenados, e cookies atuais não poderão ser acessados.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Os ícones dos sites não serão armazenados.</translation>
@@ -849,6 +563,19 @@ Você deseja recarregar todas as páginas?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -879,14 +606,6 @@ Você deseja recarregar todas as páginas?</translation>
         <source>&amp;Search History</source>
         <translation>Histórico de pe&amp;squisa</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>C&amp;ache das páginas web</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Ícones de s&amp;ites</translation>
@@ -901,350 +620,149 @@ Você deseja recarregar todas as páginas?</translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation>Carregar</translation>
+        <source>Downloads</source>
+        <translation>Downloads</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>Carregar todos</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Adicionar %1 à Lista branca</translation>
+        <source>Save File</source>
+        <translation>Salvar arquivo</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>Remover da Lista branca</translation>
+        <source>Download canceled: %1</source>
+        <translation>Download cancelado: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Configurações</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Erro ao abrir o arquivo de saída: %1</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Carregar flash</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Erro ao salvar: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Sites de Lista branca</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Erro na rede: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Site</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 de %2 (%3/seg) - %4</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Regra</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Permitir</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">O diretório de download (%1) não pôde ser criado.</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Bloquear</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Permitir para sessão</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Site</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Nome</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Caminho</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Segurança</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bytes</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Expira</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Sumário</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
+</context>
+<context>
+    <name>DownloadManager</name>
     <message>
-        <source>true</source>
-        <translation>verdadeiro</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Existem %1 downloads em progresso.
+Você deseja sair de qualquer maneira?</translation>
     </message>
-    <message>
-        <source>false</source>
-        <translation>falso</translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n download</numerusform>
+            <numerusform>%n downloads</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>Cookie da sessão</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n minuto restante</numerusform>
+            <numerusform>%n minutos restantes</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n segundo restante</numerusform>
+            <numerusform>%n segundos restantes</numerusform>
+        </translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
+        <source>bytes</source>
+        <translation>bytes</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Remover &amp;todos os cookies</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>Adicionar &amp;regra</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
+    <name>HistoryDialog</name>
     <message>
-        <source>Cookie Exceptions</source>
-        <translation>Exceções do cookie</translation>
+        <source>Open</source>
+        <translation>Abrir</translation>
     </message>
     <message>
-        <source>New Exception</source>
-        <translation>Nova exceção</translation>
+        <source>Copy</source>
+        <translation>Copiar</translation>
     </message>
     <message>
-        <source>Domain:</source>
-        <translation>Domínio:</translation>
+        <source>Delete</source>
+        <translation>Excluir</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Block</source>
-        <translation>Bloquear</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Permitir para sessão</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Permitir</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Exceções</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Remover &amp;todos</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Downloads</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Limpar</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 itens</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">De</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Nome do arquivo</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Tentar novamente</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Parar</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Salvar arquivo</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Download cancelado: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Erro ao abrir o arquivo de saída: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Erro ao salvar: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Erro na rede: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 de %2 (%3/seg) - %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 de %2 - Parado</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>O diretório de download (%1) não pôde ser criado.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Existem %1 downloads em progresso.
-Você deseja sair de qualquer maneira?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n download</numerusform>
-            <numerusform>%n downloads</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minuto restante</numerusform>
-            <numerusform>%n minutos restantes</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n segundo restante</numerusform>
-            <numerusform>%n segundos restantes</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Nenhum erro</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Erro ao abrir: %1: Nenhum arquivo ou diretório encontrado</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Não foi possível ler %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Conteúdo de %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Abrir</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Copiar</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Excluir</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Histórico</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Remover &amp;todos</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Mostrar todos os históricos</translation>
+        <source>Show All History</source>
+        <translation>Mostrar todos os históricos</translation>
     </message>
     <message>
         <source>Clear History...</source>
@@ -1285,38 +803,34 @@ Você deseja sair de qualquer maneira?</translation>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translation>Bem-vindoa ao Arora!</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>Iniciar Arora</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>Pesquisar!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>Pesquisar resultados forneceidos por</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>Sobre Arora</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageManager</name>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Não estão instalados os arquivos de tradução.</translation>
-    </message>
     <message>
         <source>Choose language</source>
         <translation>Escolha o idioma</translation>
@@ -1330,87 +844,6 @@ Você deseja sair de qualquer maneira?</translation>
         <translation>Não há arquivos de tradução instalados em %1.</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Digite o nome de usuário e senha para &quot;%1&quot; em %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Conectar no proxy &quot;%1&quot; usando:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation>- Erros SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Erros SSL:&lt;br/&gt;&lt;br/&gt;para: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Você deseja ignorar esses erros?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Certificados:&lt;br/&gt;%1&lt;br/&gt;Você deseja aceitar todos esses certificados?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Expedido por: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Sem validade não antes de: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Válido até: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Nomes alternativos:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Nome</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Valor</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Monitor de rede</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Pedidos da rede</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Pedido dos cabeçalhos</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Resposta dos cabeçalhos</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Remover</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">Remover &amp;todos os pedidos</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1433,26 +866,6 @@ Você deseja ignorar esses erros?&lt;/qt&gt;</translation>
         <source>You must have at least one search engine in here.</source>
         <translation>Você deve ter pelo menos um mecanismo de pesquisa aqui.</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Gerenciar OpenSearch</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Adicionar</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Excluir</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Restaurar padrão</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Fechar</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1485,26 +898,18 @@ Você deseja ignorar esses erros?&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Requer autenticação</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>IMITAÇÃO DE ÍCONE</translation>
-    </message>
+    <name>PermissionBar</name>
     <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>IMITAÇÃO DE INTRODUÇÃO DO TEXTO</translation>
+        <source>Allow</source>
+        <translation type="unfinished">Permitir</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>Usuário:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Senha:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1514,25 +919,6 @@ Você deseja ignorar esses erros?&lt;/qt&gt;</translation>
         <translation>Não encontrado</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Autenticação no proxy</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Conectar-se no proxy</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Usuário:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Senha:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1547,51 +933,36 @@ Você deseja ignorar esses erros?&lt;/qt&gt;</translation>
         <source>Unknown title</source>
         <translation>Título desconhecido</translation>
     </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Redirecionar: %1</translation>
-    </message>
     <message>
-        <source>Method</source>
-        <translation type="obsolete">Método</translation>
+        <source>use desktop notifications</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation type="obsolete">Endereço</translation>
+        <source>use your position</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Response</source>
-        <translation type="obsolete">Resposta</translation>
+        <source>use your microphone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Length</source>
-        <translation type="obsolete">Duração</translation>
+        <source>use your camera</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Tipo do conteúdo</translation>
+        <source>use your camera and microphone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
-        <translation type="obsolete">Informação</translation>
+        <source>lock your mouse</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SearchBanner</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Form</source>
-        <translation type="obsolete">De</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Fechar</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Testacar todos</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1601,379 +972,8 @@ Você deseja ignorar esses erros?&lt;/qt&gt;</translation>
         <translation>Pesquisar</translation>
     </message>
 </context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Preferências</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Ao iniciar:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Mostrar minha página inicial</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Mostrar uma página em branco</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Restaurar janelas e abas de última hora</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Página inicial:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Usar a página atual</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Remover itens do histórico:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Depois de um dia</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Depois de uma semana</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Depois de duas semanas</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Depois de um mês</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Depois de um ano</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Manualmente</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Na saída da aplicação</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Downloads</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Perguntar para um destino de cada vez</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Usar esse destino:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Aparência</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Fonte padrão:</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Selecionar...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Fonte com largura fixa:</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Idiomas preferenciais para visualização das páginas web:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Privacidade</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Conteúdo web</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Boquear janelas instantâneas</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Habilitar plug-ins</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Utilizar Clique para Instalar nos plug-ins flash</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Habilitar javascript</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Ver imagens</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Aceitar cookies:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Sempre</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Nunca</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Somente de sites que você navega</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Exceções...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Manter cookie até:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Ele expirar</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Eu sair da aplicação</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>No máximo 90 dias</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies...</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Filtrar rastreamento de cookies</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Abas</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Selecionar abas e janelas que são criadas</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Confirmar quando fechar múltiplas abas e janelas</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Mostrar apenas um botão fechar, em vez de um para cada aba</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Sair da aplicação quando a última aba for fechada</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>Abrindo links</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Links que deseja abrir em uma nova janela:</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>Em uma nova janela</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>Em uma nova aba selecionada na janela atual</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>Em uma nova aba na janela atual</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>Na aba atual</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Abrir links de aplicações:</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>Usar servidor proxy</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Tipo:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>Http (seguro)</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (transparente)</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>Servidor:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Porta:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Usuário:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Senha:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Avançado</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Folha de estilos:</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>Habilitar cache de rede</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>Tamanho máximo:</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Utilizar o mecanismo de pesquisa padrão como retorno, quando a URL fornecida pelo usuário é inválida</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation>Escolher diretório...</translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation>Terminar uma sessão de cookie:</translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation>Quando eu sair do programa</translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation>1 dia</translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation>2 dias</translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation>3 dias</translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation>7 dias</translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation>30 dias</translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation>Preenchimento automático</translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation>Preenchimento automático de formulários web:</translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation>Usuários e senhas</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation>Editar...</translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Procurar...</translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use this external download program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose Program...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum Font size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation>Requer reinício</translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>A configuração do cache de rede foi modificada. Então, para que possa ser efetivado, o navegador deve ser reiniciado.</translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation>Escolher diretório</translation>
@@ -2001,18 +1001,6 @@ Você deseja ignorar esses erros?&lt;/qt&gt;</translation>
         <source>&amp;Find</source>
         <translation>&amp;Localizar</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Ver</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">&amp;Separador</translation>
-    </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Fonte da página</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>Fonte da página %1</translation>
@@ -2059,26 +1047,10 @@ Você deseja ignorar esses erros?&lt;/qt&gt;</translation>
         <source>Saved Tabs</source>
         <translation>Abas salvas</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Você realmente deseja fechar essa página?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Você modificou esta página e quando fechá-la, você perderá a modificação.
-Você realmente deseja fechar esta página?
-</translation>
-    </message>
     <message>
         <source>Loading...</source>
         <translation>Carregando...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Carregando %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Terminado carregamento</translation>
@@ -2119,6 +1091,10 @@ Você realmente deseja fechar esta página?
         <source>Bookmark All Tabs</source>
         <translation>Favorito de todas as abas</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2126,14 +1102,6 @@ Você realmente deseja fechar esta página?
         <source>Suggestions</source>
         <translation>Sugestões</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Adicionar &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">Configurar mecanismos de pesquisa...</translation>
-    </message>
     <message>
         <source>Clear Recent Searches</source>
         <translation>Limpar pesquisas recentes</translation>
@@ -2166,37 +1134,6 @@ Você realmente deseja fechar esta página?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Erro ao carregar página: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Ao conectar para: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Verifique o endereço se contém erros como &lt;b&gt;ww&lt;/b&gt;.arora-browser.org em vez de &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Se o endereço está correto, tente verificar a conexão de rede.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Se o seu computador ou rede estão protegidos por um firewall ou proxy, certifique-se que o navegador tem permissão para acessar a rede.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Reenviando pedido POST</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Para exibir o site, o pedido juntamente com todos os dados devem ser enviados mais uma vez, o que pode levar a alguns comportamentos inesperados do site por exemplo, a mesma ação pode ser realizada mais uma vez. Você deseja continuar mesmo assim?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2247,38 +1184,6 @@ Você realmente deseja fechar esta página?
         <source>Loading...</source>
         <translation>Carregando...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Adicionar para a barra de ferramentas de pesquisa</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Método não suportado</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>%1 método não é suportado.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Mecanismo de pesquisa</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Escolha o mecanismo de pesquisa</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Nome do mecanismo</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Escreva um nome para o mecanismo</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Bloquear imagem</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/ru_RU.ts b/src/locale/ru_RU.ts
index fde35b5c..7c502980 100644
--- a/src/locale/ru_RU.ts
+++ b/src/locale/ru_RU.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="ru_RU">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">О программе</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Авторы</translation>
@@ -15,146 +11,10 @@
         <source>License</source>
         <translation>Лицензия</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Легкий браузер на WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Закрыть</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>О %1</translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Права принадлежат © 2007-2009 Бенжамину С. Мейеру &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>Версия WebKit: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Права принадлежат © 2007-2009 Бенжамину С. Мейеру &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Языки</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Языки: в порядке предпочтения:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>&amp;Вверх</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>&amp;Вниз</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Удалить</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Добавить...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Собственные правила</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Правило</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Подписаться?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Согласиться на подписку AdBlock?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -162,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Добавить закладку</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Введите имя для закладки и выберите, где сохранить её.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Адрес</translation>
@@ -179,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Добавить папку</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Удалить</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Удалить всё</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="obsolete">&lt;b&gt;Сохранить пароль?&lt;/b&gt;&lt;br&gt;         Чтобы увидеть сохранённые пароли и удалить их, откройте панель Автозаполнение в опциях.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Никогда для этого сайта</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Не сейчас</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Веб-сайт</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Имя пользователя</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -238,18 +49,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Новая папка</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Удалить</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Добавить папку</translation>
-    </message>
     <message>
         <source>Open in New Tab</source>
         <translation>Открыть в новой вкладке</translation>
@@ -283,10 +82,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Открыть файл</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>Импортировано %1</translation>
@@ -315,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Вставить закладку</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Изменение имени</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Изменение адреса</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation>Панель закладок</translation>
@@ -331,19 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Bookmarks Menu</source>
         <translation>Меню закладок</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Ошибка при загрузке HTML закладки: %1</translation>
-    </message>
-    <message>
-        <source>XBEL</source>
-        <translation type="obsolete">XBEL</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -366,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>Требуется функция htmlToXBel</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>Функция htmlToXBel, которая включена в Arora и нужна для импорта закладок на HTML, не установлена или не доступна в путях поиска.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Загрузка закладки</translation>
@@ -380,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Ошибка при загрузке HTML закладок: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -401,10 +175,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Закладка</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Открыть</translation>
@@ -425,10 +195,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Добавить папку...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Закладки</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -443,20 +209,8 @@ Do you want to quit anyway?</source>
         <translation>Восстановление не удалось</translation>
     </message>
     <message>
-        <source>The saved session will not being restored because last time it was restored Arora crashed.</source>
-        <translation type="obsolete">Сохраненная сессия не будет восстановлена потому что во время последнего восстановления Arora упал.</translation>
-    </message>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete"> (Change: %1 %2)</translation>
-    </message>
-    <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Сохранённая сессия не будет восстановлена, так как Arora упала при попытке восстановления этой сессии.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Произошла ошибка при восстановлении сеанса. Попытаться снова?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -489,14 +243,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Экспортировать закладки...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>&amp;Предпросмотр...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>Пе&amp;чать...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Режим &amp;конфиденциальности...</translation>
@@ -541,10 +287,6 @@ Do you want to quit anyway?</source>
         <source>&amp;View</source>
         <translation>&amp;Вид</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
@@ -593,10 +335,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Закладки</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Управление закладками...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Добавить закладку...</translation>
@@ -619,10 +357,6 @@ Do you want to quit anyway?</source>
         <translatorcomment>Поиск в Интернете</translatorcomment>
         <translation>Ctrl+K</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Включить Web &amp;Inspector</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Справка</translation>
@@ -631,10 +365,6 @@ Do you want to quit anyway?</source>
         <source>About &amp;Qt</source>
         <translation>О &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">О программе &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Навигация</translation>
@@ -655,16 +385,6 @@ Do you want to quit anyway?</source>
         <source>Hide Toolbar</source>
         <translation>Скрыть панель инструментов</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translatorcomment>Заголовок страницы и имя браузера</translatorcomment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Открыть веб-ресурс</translation>
@@ -673,10 +393,6 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Веб-ресурсы (*.html *.htm *.svg *.png *.gif *.svgz);;Все файлы (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Печатать документ</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Включить режим конфиденциальности?</translation>
@@ -685,20 +401,6 @@ Do you want to quit anyway?</source>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Закрыть окно? Открыто %1 вкладок</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">Исходный код страницы %1</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Web Inspector</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Web Inspector будет правильно работать только для страниц, открытых после его включения.
-Обновить все страницы?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Остановить загрузку текущей страницы</translation>
@@ -711,11 +413,6 @@ Do you want to reload all pages?</source>
         <source>Downloads</source>
         <translation>Загрузки</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
     <message>
         <source>&amp;Clear Private Data</source>
         <translation>&amp;Очистить личные данные</translation>
@@ -725,34 +422,14 @@ Do you want to reload all pages?</source>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Find &amp;Next</source>
-        <translation type="obsolete">Найти &amp;Следующее</translation>
-    </message>
     <message>
         <source>Find P&amp;revious</source>
         <translation>Найти &amp;Предыдущее</translation>
     </message>
-    <message>
-        <source>Prefe&amp;rences</source>
-        <translation type="obsolete">&amp;Настройки</translation>
-    </message>
     <message>
         <source>&amp;Reload Page</source>
         <translation>Об&amp;новить</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">&amp;Увеличенный Размер Текста</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">&amp;Нормальный Размер Текста</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">Маленький Размер Текста</translation>
-    </message>
     <message>
         <source>Show Bookmarks Bar</source>
         <translation>Показать Панель Закладок</translation>
@@ -761,26 +438,14 @@ Do you want to reload all pages?</source>
         <source>Hide Bookmarks Bar</source>
         <translation>Скрыть Панель Закладок</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Когда включен режим приватного браузинга, некоторые действия угрожающие безопасности будут недоступны:&lt;ul&gt;&lt;li&gt; Вебстраницы не добавляются в журнал.&lt;/li&gt;&lt;li&gt; Записи автоматически удаляются из списка закачек.&lt;/li&gt;&lt;li&gt; Новые cookie не сораняются, старые cockie не доступны.&lt;/li&gt;&lt;li&gt; Иконки сайтов не сохраняются, сессии не сохраняются.&lt;/li&gt;&lt;li&gt; Поисковые запросы не добавляются во всплывающее окно при новом запросе.&lt;/li&gt;&lt;/ul&gt;Пока вы не закроете окно вы не сможете воспользоваться кнопками Вперед и Назад для перехода на ранее открытые страницы.</translation>
-    </message>
     <message>
         <source>Find Nex&amp;t</source>
         <translation>Продолжить поис&amp;к</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Настр&amp;ойки...</translation>
-    </message>
     <message>
         <source>Show Menu Bar</source>
         <translation>Показать меню</translation>
     </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">Показать &amp;Сетевой монитор</translation>
-    </message>
     <message>
         <source>Switch application language </source>
         <translation>Изменить язык приложения</translation>
@@ -818,10 +483,6 @@ Do you want to reload all pages?</source>
         <comment>About Browser</comment>
         <translation>О &amp;%1</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Когда включен режим приватного браузинга, некоторые действия угрожающие безопасности будут недоступны:&lt;ul&gt;&lt;li&gt; Вебстраницы не добавляются в журнал.&lt;/li&gt;&lt;li&gt; Записи автоматически удаляются из списка закачек.&lt;/li&gt;&lt;li&gt; Новые cookie не сораняются, старые cockie не доступны.&lt;/li&gt;&lt;li&gt; Иконки сайтов не сохраняются, сессии не сохраняются.&lt;/li&gt;&lt;li&gt; Поисковые запросы не добавляются во всплывающее окно при новом запросе.&lt;/li&gt;&lt;/ul&gt;Пока вы не закроете окно вы не сможете воспользоваться кнопками Вперед и Назад для перехода на ранее открытые страницы.</translation>
-    </message>
     <message>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
@@ -863,10 +524,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Элементы списка загрузок будут автоматически удалены из него.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Новые cookies не будут храниться, текущие окажутся недоступными.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Значки сайтов храниться не будут.</translation>
@@ -891,10 +548,6 @@ Do you want to reload all pages?</source>
         <source>Private Browsing</source>
         <translation>Конфиденциальный просмотр</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;Ad Block...</translation>
-    </message>
     <message>
         <source>User Agent</source>
         <translation type="unfinished"></translation>
@@ -911,6 +564,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -941,14 +607,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>Историю &amp;поиска</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
-    <message>
-        <source>C&amp;ache</source>
-        <translation type="obsolete">&amp;Кэш</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>З&amp;начки веб-сайтов</translation>
@@ -961,1217 +619,366 @@ Do you want to reload all pages?</source>
         <source>&amp;Cancel</source>
         <translation>&amp;Отмена</translation>
     </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>Веб-страницы, сохранённые в &amp;кэше</translation>
-    </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation>Загрузить</translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation>Загрузить все</translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Добавить %1 в список разрешённых сайтов</translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation>Удалить из списка разрешённых сайтов</translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Settings</source>
-        <translation>Параметры</translation>
+        <source>Downloads</source>
+        <translation>Загрузки</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Загрузить Flash</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlashSettings</name>
+    <name>DownloadItem</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Список разрешённых сайтов</translation>
+        <source>Save File</source>
+        <translation>Сохранить файл</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Веб-сайт</translation>
+        <source>Download canceled: %1</source>
+        <translation>Загрузка отменена: %1</translation>
     </message>
     <message>
-        <source>Status</source>
-        <translation type="obsolete">Статус</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Ошибка при сохранении: %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Разрешить</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Ошибка сети: %1</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Блокировать</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Разрешить на время сеанса</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Ошибка при открытии сохранённого файла: %1</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Правило</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 из %2 (%3/сек) - %4</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Веб-сайт</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Директория загрузки (%1) не может быть создана.</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Имя</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Путь</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Безопасность</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Истекает</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Содержимое</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>истина</translation>
+        <source>bytes</source>
+        <translation type="obsolete">байт</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>ложь</translation>
+        <source>kB</source>
+        <translation type="obsolete">кБ</translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation>Cookie сеанса</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Удалить</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Удалить &amp;все cookies</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation>Добавить &amp;правило</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Исключения cookies</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Новое исключение</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Домен:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Блокировать</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Разрешить на время сеанса</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Разрешить</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Исключения</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Удалить</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Удалить &amp;все</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Загрузки</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Очистить</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 элементов</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Save File</source>
-        <translation>Сохранить файл</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Загрузка отменена: %1</translation>
-    </message>
-    <message>
-        <source>Error opening save file: %1</source>
-        <translation type="obsolete">Ошибка при открытии сохранённого файла: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Ошибка при сохранении: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Ошибка сети: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">секунд</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 из  %2 (%3/сек) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 of %2 - Остановлено</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">байт</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">кБ</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">МБ</translation>
-    </message>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Форма</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Имя файла</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Повторить попытку</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Остановить</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Открыть</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n минут осталось</numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n секунд осталось</numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Ошибка при открытии сохранённого файла: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 из %2 (%3/сек) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Директория загрузки (%1) не может быть создана.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n Закачка</numerusform>
-            <numerusform>%n Закачки</numerusform>
-            <numerusform>%n Закачек</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>%1 закачек ещё не окончено.
-Всё равно выйти?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n минута осталась</numerusform>
-            <numerusform>%n минуты осталось</numerusform>
-            <numerusform>%n минут осталось</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n секунда осталась</numerusform>
-            <numerusform>%n секунды осталось</numerusform>
-            <numerusform>%n секунд осталось</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>байт</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>кБ</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>МБ</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>ГБ</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Без ошибок</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Ошибка при открытии %1: нет такого файла или папки</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Невозможно прочесть %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Содержимое %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 КБ</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Открыть</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Копировать</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Удалить</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Журнал</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Удалить</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Удалить &amp;все</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Показать весь журнал</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Очистить журнал</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Очистить журнал...</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Хотите очистить журнал?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Название</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адрес</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Ранее сегодня</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n запись</numerusform>
-            <numerusform>%n записи</numerusform>
-            <numerusform>%n записей</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation>Добро пожаловать в Arora!</translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation>Запуск Arora</translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation>Искать!</translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation>Результаты поика предоставлены</translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation>О Arora</translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Choose language</source>
-        <translation>Выбрать язык</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Вы можеть использовать язык браузера, отличный&lt;br&gt;от языка операционной системы.&lt;/p&gt;&lt;p&gt;Выберить подходящий язык&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Языковые файлы не установлены.</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation>Языковые файлы не установлены. в %1.</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Введите имя пользователя и пароль для &quot;%1&quot; на %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Подключиться к прокси &quot;%1&quot;, используя:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">Ошибки SSL:
-
-%1
-
-%2
-
-Желаете ли вы игнорировать эти ошибки?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Вы желаете принять все эти сертификаты?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - Ошибки SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Ошибки SSL:&lt;br/&gt;&lt;br/&gt;для: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Игнорнировать эти ошибки?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Сертификаты:&lt;br/&gt;%1&lt;br/&gt;Принять эти сертификаты?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Выдал: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Не действует до: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Действует до: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Другие имена:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Имя</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Значение</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Сетевой монитор</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Сетевые запросы</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Заголовки запроса</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Заголовки ответа</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Удалить</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">Удалите &amp;все запросы</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation>Открыть файл</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation>OpenSearch</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Ошибка</translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation>%1 не является допустимым описанием OpenSearch 1.1 или уже есть в списке.</translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation>Здесь должна быть хотя бы одна поисковая система.</translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Управление OpenSearch</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Восстановить настройки по умолчанию</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Удалить</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Добавить</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Закрыть</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation>&lt;strong&gt;Описание:&lt;/strong&gt; %1</translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation>&lt;strong&gt;Предоставляет контекстные предположения&lt;/strong&gt;</translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation>Ключевые слова</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation>Добавить следующую поисковую систему в список?&lt;br /&gt;&lt;br /&gt;Название: %1&lt;br /&gt;Ищет с помощью: %2</translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Требуется аутентификация</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Имя пользователя:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Не найдено</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Аутентификация прокси</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Подключиться к прокси</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Имя пользователя:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Файл не является файлом XBEL версии 1.0.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Неизвестный заголовок</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation>Файл не является файлом OpenSearch 1.1.</translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Перенаправить: %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Метод</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Адрес</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Ответ</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Длина</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Формат содержимого</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Информация</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Готово</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Подсветить всё</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Поиск</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Settings</source>
-        <translation type="obsolete">Параметры</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Общие</translation>
-    </message>
-    <message>
-        <source>Home:</source>
-        <translation type="obsolete">Домашняя страница:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Использовать текущую страницу</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Удалять элементы журнала:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Через день</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Через неделю</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Через две недели</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Через месяц</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Через год</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Вручную</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Открывать ссылки из приложений:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">Во вкладке в текущем окне</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>В новом окне</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Внешний вид</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Стандартный шрифт:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Выбрать...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Моноширинный шрифт:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Конфиденциальность</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Веб-содержимое</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Включить подключаемые модули</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Включить JavaScript</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Принимать cookies:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Всегда</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Никогда</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Только с посещённых сайтов</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Исключения...</translation>
-    </message>
-    <message>
-        <source>Keep until:</source>
-        <translation type="obsolete">Сохранять до:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Истечения срока</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Выхода из приложения</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Максимум 90 дней</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Прокси</translation>
-    </message>
-    <message>
-        <source>Enable proxy</source>
-        <translation type="obsolete">Включить прокси</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Тип:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host:</source>
-        <translation type="obsolete">Сервер:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Порт:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Имя пользователя:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Дополнительно</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Таблица стилей:</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Загрузки</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Каждый раз спрашивать папку назначения</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Использовать эту папку назначения:</translation>
+        <source>MB</source>
+        <translation type="obsolete">МБ</translation>
     </message>
-    <message>
-        <source>On startup:</source>
-        <translation>При запуске:</translation>
+</context>
+<context>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n Закачка</numerusform>
+            <numerusform>%n Закачки</numerusform>
+            <numerusform>%n Закачек</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Show my home page</source>
-        <translation>Показывать мою домашнюю страницу</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>%1 закачек ещё не окончено.
+Всё равно выйти?</translation>
     </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Показывать чистую страницу</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n минута осталась</numerusform>
+            <numerusform>%n минуты осталось</numerusform>
+            <numerusform>%n минут осталось</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Восстанавливать окна и вкладки прошлой сессии</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n секунда осталась</numerusform>
+            <numerusform>%n секунды осталось</numerusform>
+            <numerusform>%n секунд осталось</numerusform>
+        </translation>
     </message>
     <message>
-        <source>On application exit</source>
-        <translation>При выходе</translation>
+        <source>bytes</source>
+        <translation>байт</translation>
     </message>
     <message>
-        <source>Enable Images</source>
-        <translation type="obsolete">Включить картинки</translation>
+        <source>kB</source>
+        <translation>кБ</translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Вкладки</translation>
+        <source>MB</source>
+        <translation>МБ</translation>
     </message>
     <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Активировать вкладки и окна при их создании</translation>
+        <source>GB</source>
+        <translation>ГБ</translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Подтверждать закрытие нескольких вкладок</translation>
+        <source>Open</source>
+        <translation>Открыть</translation>
     </message>
     <message>
-        <source>Preferences</source>
-        <translation>Настройки</translation>
+        <source>Copy</source>
+        <translation>Копировать</translation>
     </message>
     <message>
-        <source>Home Page:</source>
-        <translation>Домашняя страница:</translation>
+        <source>Delete</source>
+        <translation>Удалить</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>View Images</source>
-        <translation>Посмотреть изображения</translation>
+        <source>Show All History</source>
+        <translation>Показать весь журнал</translation>
     </message>
     <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Хранить cookies до:</translation>
+        <source>Clear History</source>
+        <translation>Очистить журнал</translation>
     </message>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Не показывать кнопку закрытия на каждой вкладке</translation>
+        <source>Clear History...</source>
+        <translation>Очистить журнал...</translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation>Использовать прокси-сервер</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Хотите очистить журнал?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Host name:</source>
-        <translation>Имя хоста:</translation>
+        <source>Title</source>
+        <translation>Название</translation>
     </message>
     <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Предпочитаемые языки для просмотра веб-страниц:</translation>
+        <source>Address</source>
+        <translation>Адрес</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Block Popup Windows</source>
-        <translation>Блокировать всплывающие окна</translation>
+        <source>Earlier Today</source>
+        <translation>Ранее сегодня</translation>
     </message>
-    <message>
-        <source>Opening links</source>
-        <translation type="unfinished">Открытие ссылки</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n запись</numerusform>
+            <numerusform>%n записи</numerusform>
+            <numerusform>%n записей</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Ссылки, которые хотят открыть в новом окне:</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>В новой выбранной вкладке текущего окна</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>В новой вкладке текущего окна</translation>
+        <source>Search!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
-        <translation>В текущей вкладке</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Secure)</source>
-        <translation>Http (Защищённый)</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (Прозрачный)</translation>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Использовать ClickToFlash для flash плагинов</translation>
+        <source>Choose language</source>
+        <translation>Выбрать язык</translation>
     </message>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Фильтровать отслеживающие Cookie</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Вы можеть использовать язык браузера, отличный&lt;br&gt;от языка операционной системы.&lt;/p&gt;&lt;p&gt;Выберить подходящий язык&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Подтверждать закрытие нескольких вкладок или окон</translation>
+        <source>No translation files are installed at %1.</source>
+        <translation>Языковые файлы не установлены. в %1.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Выйти из программы при закрытии последней вкладки</translation>
+        <source>Open File</source>
+        <translation>Открыть файл</translation>
     </message>
     <message>
-        <source>Enable network cache</source>
-        <translation>Включить сетевой кэш</translation>
+        <source>OpenSearch</source>
+        <translation>OpenSearch</translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
-        <translation>Максимальный размер:</translation>
+        <source>Error</source>
+        <translation>Ошибка</translation>
     </message>
     <message>
-        <source> MB</source>
-        <translation> МБ</translation>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
+        <translation>%1 не является допустимым описанием OpenSearch 1.1 или уже есть в списке.</translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Отправлять запрос в поисковую систему по умолчанию, когда набранная пользователем ссылка неверна</translation>
+        <source>You must have at least one search engine in here.</source>
+        <translation>Здесь должна быть хотя бы одна поисковая система.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source>Choose Directory...</source>
-        <translation>Выбрать директорию...</translation>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
+        <translation>&lt;strong&gt;Описание:&lt;/strong&gt; %1</translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation>Сеанс cookie заканчивается:</translation>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
+        <translation>&lt;strong&gt;Предоставляет контекстные предположения&lt;/strong&gt;</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
-        <translation>При выходе из приложения</translation>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 day</source>
-        <translation>1 день</translation>
+        <source>Name</source>
+        <translation>Имя</translation>
     </message>
     <message>
-        <source>2 days</source>
-        <translation>2 дня</translation>
+        <source>Keywords</source>
+        <translation>Ключевые слова</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>3 days</source>
-        <translation>3 дня</translation>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
+        <translation>Добавить следующую поисковую систему в список?&lt;br /&gt;&lt;br /&gt;Название: %1&lt;br /&gt;Ищет с помощью: %2</translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>7 days</source>
-        <translation>7 дней</translation>
+        <source>Allow</source>
+        <translation type="unfinished">Разрешить</translation>
     </message>
     <message>
-        <source>30 days</source>
-        <translation>30 дней</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AutoFill</source>
-        <translation>Автозаполнение</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation>Автозаполнение веб-форм:</translation>
+        <source>Not Found</source>
+        <translation>Не найдено</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>User names and passwords</source>
-        <translation>Имена пользователей и пароли</translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Файл не является файлом XBEL версии 1.0.</translation>
     </message>
     <message>
-        <source>Edit...</source>
-        <translation>Изменить...</translation>
+        <source>Unknown title</source>
+        <translation>Неизвестный заголовок</translation>
     </message>
     <message>
-        <source>Browse...</source>
-        <translation>Обзор...</translation>
+        <source>The file is not an OpenSearch 1.1 file.</source>
+        <translation>Файл не является файлом OpenSearch 1.1.</translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
-        <translation>Требуется перезапустить браузер</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>Параметры сетевого кэша были изменены. Чтобы они вступили в силу, нужно перезапустить браузер.</translation>
+        <source>Search</source>
+        <translation>Поиск</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>Выбрать директорию</translation>
@@ -2199,18 +1006,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation>&amp;Найти</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Вид</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">Перносить &amp;строки</translation>
-    </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Исходный код страницы</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>Источник страницы %1</translation>
@@ -2218,10 +1013,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
 </context>
 <context>
     <name>TabBar</name>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Новая &amp;вкладка</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Копировать вкладку</translation>
@@ -2273,22 +1064,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Recently Closed Tabs</source>
         <translation>Недавно закрытые вкладки</translation>
     </message>
-    <message>
-        <source>(Untitled)</source>
-        <translation type="obsolete">(Безымянный)</translation>
-    </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Действительно закрыть эту страницу?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Вы изменили эту страницу, и вы потеряете изменения при её закрытии.
-Действительно закрыть эту страницу?
-</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation>Ctrl-]</translation>
@@ -2309,10 +1084,6 @@ Do you really want to close this page?
         <source>Loading...</source>
         <translation>Загрузка...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Загрузка %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Загрузка окончена</translation>
@@ -2325,13 +1096,13 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation>Закладки для всех вкладок</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
-    <message>
-        <source>Google</source>
-        <translation type="obsolete">Google</translation>
-    </message>
     <message>
         <source>No Recent Searches</source>
         <translation>Нет последних слов для поиска</translation>
@@ -2348,14 +1119,6 @@ Do you really want to close this page?
         <source>Suggestions</source>
         <translation>Предположения</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Добавить &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">Настроить поисковые системы...</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2376,37 +1139,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Ошибка при загрузке страницы: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>При подключении к: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Проверьте адрес на ошибки вроде &lt;b&gt;ww&lt;/b&gt;.arora-browser.org вместо &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Если компьютер или сеть защищены сетевым экраном или прокси-сервером, проверьте, разрешён ли браузеру доступ к сети.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Если адрес введён правильно, проверьте сетевое соединение.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Повторная отправка запроса POST</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Для того, чтобы отобразить этот сайт, запрос вместе со всеми данными должен быть послан ещё раз, что может привести к неожиданному поведению сайта, например одно действое может быть выполненно дважды. Всё равно продолжить?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2457,38 +1189,6 @@ Do you really want to close this page?
         <source>Search with...</source>
         <translation>Искать в...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Добавит в поисковую панель</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Метод не поддерживается</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>%1 метод не поддерживается.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Поисковая система</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Выберите понравившуюся поисковую систему</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Имя поисковой системы</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Введите имя поисковой системы</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Блоировать изображение</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/sk_SK.ts b/src/locale/sk_SK.ts
index ec77171a..f169528e 100644
--- a/src/locale/sk_SK.ts
+++ b/src/locale/sk_SK.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="sk">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">O prehliadači</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Autori</translation>
@@ -15,137 +11,10 @@
         <source>License</source>
         <translation>Licencia</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Jednoduchý webový prehliadač založený na WebKite</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Zavrieť</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished">&amp;Vymazať</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished">Pravidlo</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -153,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Pridať záložku</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Napíšte názov záložky a vyberte, kam ju chcete uložiť.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation type="unfinished"></translation>
@@ -170,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">Pridať zložku</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -225,18 +49,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nová zložka</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Záložky</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Vymazať</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Pridať zložku</translation>
-    </message>
     <message>
         <source>Open in New Tab</source>
         <translation>Otvoriť v novom paneli</translation>
@@ -269,10 +81,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Otvoriť súbor</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>Importované %1</translation>
@@ -301,14 +109,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Vložiť záložku</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Zmena názvu</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Zmena adresy</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation type="unfinished"></translation>
@@ -339,10 +139,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation type="unfinished"></translation>
@@ -352,6 +148,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -373,10 +173,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Záložky</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">Otvoriť</translation>
@@ -397,10 +193,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Záložky</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -415,15 +207,7 @@ Chcete ich všetky uzavrieť?</translation>
         <translation>Obnovenie zlyhalo</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Uložená relácia nebude obnovená, pretože Arora spadla pri pokuse o jej obnovenie.</translation>
-    </message>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete">(Zmena: %1 %2)</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -457,14 +241,6 @@ Chcete ich všetky uzavrieť?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Exportovať záložky ...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Ná&amp;hľad tlače ...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Tlač ...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Súkro&amp;mné prehliadanie ...</translation>
@@ -509,10 +285,6 @@ Chcete ich všetky uzavrieť?</translation>
         <source>&amp;View</source>
         <translation>&amp;Zobraziť</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
@@ -561,10 +333,6 @@ Chcete ich všetky uzavrieť?</translation>
         <source>&amp;Bookmarks</source>
         <translation>Zál&amp;ožky</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Spravovať záložky ...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Pridať záložku ...</translation>
@@ -586,10 +354,6 @@ Chcete ich všetky uzavrieť?</translation>
         <comment>Web Search</comment>
         <translation>Ctrl+K</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Povoliť Web &amp;Inspector</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>Nápo&amp;veda</translation>
@@ -598,10 +362,6 @@ Chcete ich všetky uzavrieť?</translation>
         <source>About &amp;Qt</source>
         <translation>O &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">O &amp;Arore</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Navigácia</translation>
@@ -622,15 +382,6 @@ Chcete ich všetky uzavrieť?</translation>
         <source>Hide Toolbar</source>
         <translation>Skryť panel nástrojov</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Otvoriť webovú stránku</translation>
@@ -639,10 +390,6 @@ Chcete ich všetky uzavrieť?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Webové dokumenty (*.html *.htm *.svg *.png *.gif *.svgz);;Všetky súbory (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Vytlačiť dokument</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Naozaj chcete zapnúť súkromné prehliadanie?</translation>
@@ -651,16 +398,6 @@ Chcete ich všetky uzavrieť?</translation>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Naozaj chcete zavrieť okno? Je v nom otvorených %1 panelov</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Webový inšpektor</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Webový inšpektor bude fungovať iba pre stránky načítané po jeho povoleni.
-Chcete znovu načítať všetky stránky?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Zastaví načítanie aktuálnej stránky</translation>
@@ -673,11 +410,6 @@ Chcete znovu načítať všetky stránky?</translation>
         <source>Downloads</source>
         <translation>Preberanie</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
     <message>
         <source>&amp;Clear Private Data</source>
         <translation>Zmazaž &amp;súkromné dáta</translation>
@@ -687,10 +419,6 @@ Chcete znovu načítať všetky stránky?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Ak je zapnuté súkromné prehliadanie, niektoré akcie narušujúce tvoje súkromie budú zakázané:&lt;ul&gt;&lt;li&gt; Stránky nie sú pridávané do histórie.&lt;/li&gt;&lt;li&gt; Položky sú automaticky vymazané z okna preberania.&lt;/li&gt;&lt;li&gt; Nové cookies nie sú uložené, aktuálne nebudú prístupné.&lt;/li&gt;&lt;li&gt; Ikony stránek nie sú ukládané, podobne ako relácie.&lt;/li&gt;&lt;li&gt; Hľadané výrazy nie sú pridávané do menu v políčku hľadania.&lt;/li&gt;&lt;/ul&gt;Pokiaľ nie je okno zavrené, je možné klikať Späť a Vpred pre vrátenie na skôr otvorené stránky.</translation>
-    </message>
     <message>
         <source>Show Bookmarks Bar</source>
         <translation>Zobraziť panel záložiek</translation>
@@ -707,26 +435,10 @@ Chcete znovu načítať všetky stránky?</translation>
         <source>&amp;Reload Page</source>
         <translation>O&amp;bnoviť stránku</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">Z&amp;väčšiť text</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">&amp;Normálna veľkosť textu</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">Z&amp;menšiť text</translation>
-    </message>
     <message>
         <source>Find Nex&amp;t</source>
         <translation>Náj&amp;sť dalšie</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Nasta&amp;venia ...</translation>
-    </message>
     <message>
         <source>Show Menu Bar</source>
         <translation>Ukázať menu</translation>
@@ -797,10 +509,6 @@ Chcete znovu načítať všetky stránky?</translation>
         <source>Configure Search Engines...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -813,10 +521,6 @@ Chcete znovu načítať všetky stránky?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -857,6 +561,19 @@ Chcete znovu načítať všetky stránky?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -887,10 +604,6 @@ Chcete znovu načítať všetky stránky?</translation>
         <source>&amp;Search History</source>
         <translation>História hľa&amp;dania</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookies</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Ikony stránok</translation>
@@ -903,1134 +616,357 @@ Chcete znovu načítať všetky stránky?</translation>
         <source>&amp;Cancel</source>
         <translation>&amp;Zrušiť</translation>
     </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>Stránky v &amp;cache</translation>
-    </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Downloads</source>
+        <translation>Preberanie</translation>
     </message>
     <message>
-        <source>Load Flash</source>
+        <source>Downloading %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlashSettings</name>
+    <name>DownloadItem</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation type="unfinished"></translation>
+        <source>Save File</source>
+        <translation>Uložiť súbor</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Adresa</translation>
+        <source>Download canceled: %1</source>
+        <translation>Preberanie zrušené: %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Povoliť</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Chyba pri ukladaní: %1</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Blokovať</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Chyba siete: %1</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Povoliť pre reláciu</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Pravidlo</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Chyba pri otváraní výstupného súboru: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Adresa</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Názov</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Cesta</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Zabezpečené</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Vyprší</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Obsah</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bajtov</translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>áno</translation>
+        <source>kB</source>
+        <translation type="obsolete">KiB</translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>nie</translation>
+        <source>MB</source>
+        <translation type="obsolete">MiB</translation>
     </message>
-    <message>
-        <source>Session cookie</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Vymazať</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Vymazať &amp;všetky</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Výnimky pre cookies</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Nová výnimka</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Doména:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Blokovať</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Povoliť pre reláciu</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Povoliť</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Výnimky</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Vymazať</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Vymazať &amp;všetky</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Preberanie</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Vyčistiť</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 položiek</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;OK</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Názov súboru</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Skúsiť znova</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Zastaviť</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Otvoriť</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Uložiť súbor</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Preberanie zrušené: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Chyba pri ukladaní: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Chyba siete: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">sekúnd</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 z %2 (%3/s) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 z %2 - Zastavené</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">bajtov</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">KiB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MiB</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n minúta ostáva</numerusform>
-            <numerusform>- %n minúty ostávajú</numerusform>
-            <numerusform>- %n minút ostáva</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n sekunda ostáva</numerusform>
-            <numerusform>- %n sekundy ostávajú</numerusform>
-            <numerusform>- %n sekúnd ostáva</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Chyba pri otváraní výstupného súboru: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n preberanie</numerusform>
-            <numerusform>%n preberania</numerusform>
-            <numerusform>%n preberaní</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="unfinished">bajtov</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="unfinished">KiB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="unfinished">MiB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Otvoriť</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopírovať</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Vymazať</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>História</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Vymazať</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Vymazať &amp;všetky</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Zobraziť celú históriu</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Vymazať históriu</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Vymazať históriu ...</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Chcete vymazať históriu?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Názov</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Dnes</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n položka</numerusform>
-            <numerusform>%n položky</numerusform>
-            <numerusform>%n položiek</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Default</source>
-        <translation type="obsolete">Prednastavený</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Vybrať jazyk</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Aroru je možné používať v inom jazyku ako v tom,&lt;br&gt;ktorý je prednastavený v operačnom systéme.&lt;/p&gt;&lt;p&gt;Vybete si jazyk, ktorý má byť použitý&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Zadajte užívateľské meno a heslo pre &quot;%1&quot; na %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Pripojiť sa k proxy &quot;%1&quot; použitím:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">Chyby SSL:
-
-%1
-
-%2
-
-Chcete ignorovať tieto chyby?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Chcete prijať všetky tieto certifikáty?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Názov</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Vymazať</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished">Otvoriť súbor</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">Názov</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Vyžadované prihlásenie</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Užívateľské meno:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Heslo:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Neexistuje</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Prihlásenie k proxy</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Pripojiť k proxy</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Užívateľské meno:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Heslo:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Súbor nie je XBEL verzie 1.0.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Neznámý titulok</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Adresa</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Hotovo</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Hľadať</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>General</source>
-        <translation>Hlavné</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Nastav na aktuálnu stránku</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Odstrániť položky histórie:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Po jednom dni</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Po jednom týždni</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Po dvoch týždňoch</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Po mesiaci</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Po roku</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Ručne</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Otvoriť odkazy z aplikácií:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">V paneli v aktuálnom okne</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>V novom okne</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Vzhľad</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Štandardné písmo:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Vybrať ...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Písmo s pevnou šírkou:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Súkromie</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Obsah webu</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Povoliť plug-iny</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Povoliť JavaScript</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookies</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Prijímať cookies:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Vždy</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Nikdy</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Iba z navštívených stránok</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Výnimky ...</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Vyprší</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Ukončenie aplikácie</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Maximálne 90 dní</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookies ...</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proxy</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Typ:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Uživatelské meno:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Heslo:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Rozšírené</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>CSS štýl:</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Preberanie</translation>
+</context>
+<context>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n preberanie</numerusform>
+            <numerusform>%n preberania</numerusform>
+            <numerusform>%n preberaní</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Ask for a destination each time</source>
-        <translation>Vždy sa pýtať na umiestnenie preberania</translation>
+        <source>bytes</source>
+        <translation type="unfinished">bajtov</translation>
     </message>
     <message>
-        <source>Use this destination:</source>
-        <translation>Použiť toto umiestnenie:</translation>
+        <source>kB</source>
+        <translation type="unfinished">KiB</translation>
     </message>
     <message>
-        <source>On application exit</source>
-        <translation>Pri ukončení aplikácie</translation>
+        <source>MB</source>
+        <translation type="unfinished">MiB</translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Panely</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Prepínať na okná a panely keď sú vytvorené</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Vyžadovať potvrdenie pri zatváraní viacerých panelov</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>On startup:</source>
-        <translation>Po spustení:</translation>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Show my home page</source>
-        <translation>Zobraziť moju domovskú stránku</translation>
+        <source>Open</source>
+        <translation>Otvoriť</translation>
     </message>
     <message>
-        <source>Show a blank page</source>
-        <translation>Zobraziť prázdnu stránku</translation>
+        <source>Copy</source>
+        <translation>Kopírovať</translation>
     </message>
     <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Obnoviť okná a panely z poslednej relácie</translation>
+        <source>Delete</source>
+        <translation>Vymazať</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Preferences</source>
-        <translation>Nastavenia</translation>
+        <source>Show All History</source>
+        <translation>Zobraziť celú históriu</translation>
     </message>
     <message>
-        <source>Home Page:</source>
-        <translation>Domovská stránka:</translation>
+        <source>Clear History</source>
+        <translation>Vymazať históriu</translation>
     </message>
     <message>
-        <source>View Images</source>
-        <translation>Zobraziť obrázky</translation>
+        <source>Clear History...</source>
+        <translation>Vymazať históriu ...</translation>
     </message>
     <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Ponechat cookies pokiaľ:</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Chcete vymazať históriu?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Use proxy server</source>
-        <translation>Použiť proxy server</translation>
+        <source>Title</source>
+        <translation>Názov</translation>
     </message>
     <message>
-        <source>Host name:</source>
-        <translation>Meno hostiteľa:</translation>
+        <source>Address</source>
+        <translation>Adresa</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation type="unfinished"></translation>
+        <source>Earlier Today</source>
+        <translation>Dnes</translation>
     </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n položka</numerusform>
+            <numerusform>%n položky</numerusform>
+            <numerusform>%n položiek</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Block Popup Windows</source>
+        <source>Welcome to Endorphin!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opening links</source>
+        <source>Endorphin Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
+        <source>Search!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
+        <source>Search the web with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
+        <source>Search results provided by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Http (Secure)</source>
-        <translation type="unfinished"></translation>
+        <source>Choose language</source>
+        <translation>Vybrať jazyk</translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Aroru je možné používať v inom jazyku ako v tom,&lt;br&gt;ktorý je prednastavený v operačnom systéme.&lt;/p&gt;&lt;p&gt;Vybete si jazyk, ktorý má byť použitý&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
+        <source>No translation files are installed at %1.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation type="unfinished"></translation>
+        <source>Open File</source>
+        <translation type="unfinished">Otvoriť súbor</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
+        <source>OpenSearch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable network cache</source>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
+        <source>You must have at least one search engine in here.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source> MB</source>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Directory...</source>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation type="unfinished">Názov</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>1 day</source>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>2 days</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">Povoliť</translation>
     </message>
     <message>
-        <source>3 days</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7 days</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>30 days</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation>Neexistuje</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>AutoFill</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Súbor nie je XBEL verzie 1.0.</translation>
     </message>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>Neznámý titulok</translation>
     </message>
     <message>
-        <source>User names and passwords</source>
+        <source>The file is not an OpenSearch 1.1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit...</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>Hľadať</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -2058,14 +994,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation>Ná&amp;jsť</translation>
     </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Zdrojový súbor</translation>
-    </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Zobraziť</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation type="unfinished"></translation>
@@ -2073,10 +1001,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
 </context>
 <context>
     <name>TabBar</name>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">&amp;Nový panel</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Duplikovať panel</translation>
@@ -2128,18 +1052,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Recently Closed Tabs</source>
         <translation>Zatvorené panely</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Naozaj chcete zatvoriť tento panel?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Stránka bola zmenená a pri zatvorení budu všetky zmeny stratené.
-Ste si istý, že chcete zavrieť túto stránku?
-</translation>
-    </message>
     <message>
         <source>Untitled</source>
         <translation>Nepomenovaný</translation>
@@ -2160,10 +1072,6 @@ Ste si istý, že chcete zavrieť túto stránku?
         <source>Loading...</source>
         <translation type="unfinished">Nahrávam ...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation type="unfinished"></translation>
@@ -2176,6 +1084,10 @@ Ste si istý, že chcete zavrieť túto stránku?
         <source>Bookmark All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2195,10 +1107,6 @@ Ste si istý, že chcete zavrieť túto stránku?
         <source>Suggestions</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2219,37 +1127,6 @@ Ste si istý, že chcete zavrieť túto stránku?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Chyba pri načítavaní stránky: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2300,38 +1177,6 @@ Ste si istý, že chcete zavrieť túto stránku?
         <source>Search with...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/sr_RS.ts b/src/locale/sr_RS.ts
index 23785ec7..4f023598 100644
--- a/src/locale/sr_RS.ts
+++ b/src/locale/sr_RS.ts
@@ -15,142 +15,6 @@
         <source>License</source>
         <translation>Лиценца</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Лагани веб прегледач базиран на Вебкиту</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org/&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Затвори</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>Верзија Вебкита: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Језици</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Језици према редоследу пожељности:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>&amp;Горе</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>&amp;Доле</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Уклони</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Додај...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>Заустављено Адблоковим правилом: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Додај прилагођено правило</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Научите више о писању правила...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Ажурирај претплате</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Прегледај претплате...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Уклони претплату</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>Подешавање Адблока</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>Омогући Адблок</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Радња</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Прилагођена правила</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Правило</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Претплати се?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Претпалтити се на ову Адблок претплату?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -158,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Додај маркер</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Унесите име маркера и изаберите где га сачувати.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>УРЛ</translation>
@@ -175,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Додај фасциклу</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Лозинке за обрасце</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Уклони</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Уклони све</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Желите ли да сачувате ову лозинку?&lt;/b&gt;&lt;br&gt;         Да би прегледали или уклонили сачуване лозинке користите панел самопопуњавања у подешавањима.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Никад за овај сајт</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Не сад</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Веб сајт</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Корисничко име</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -246,18 +61,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Нова фасцикла</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Маркери</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Уклони</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Додај фасциклу</translation>
-    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -337,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>Неопходна је Хтмл-У-ИксБЕЛ алатка</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>Хтмл-У-ИксБЕЛ алатка, која се деставља са Арором и неопходна је за увоз ХТМЛ маркера, није инсталирана или се не налази у претраженим путањама.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Учитавам маркер</translation>
@@ -351,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Грешка при учитавању ХТМЛ маркера: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -406,8 +209,8 @@ Do you want to quit anyway?</source>
         <translation>Повраћај није успео</translation>
     </message>
     <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Арора се срушила у покушају да поврати сесију. Покушати поново?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -440,14 +243,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Извези маркере...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>П&amp;реглед штампе...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>Ш&amp;тампа...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>&amp;Приватно прегледање...</translation>
@@ -614,10 +409,6 @@ Do you want to quit anyway?</source>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Омогући &amp;веб инспектор</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>По&amp;моћ</translation>
@@ -663,11 +454,6 @@ Do you want to quit anyway?</source>
         <source>Hide Bookmarks Bar</source>
         <translation>Сакриј траку маркера</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Aрора</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Отвори веб ресурс</translation>
@@ -676,10 +462,6 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Веб ресурси (*.html *.htm *.svg *.png *.gif *.svgz);;Сви фајлови (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Штампај документ</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Да ли сте сигурни да желите да укључите приватно прегледање?</translation>
@@ -688,16 +470,6 @@ Do you want to quit anyway?</source>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Да ли сте сигурни да желите да затворите прозор? Отворен(о) је %1 језичак(а)</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Веб инспектор</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Веб инспектор ће исправно радити само на страницама учитаним након његовог укључивања.
-Да ли желите да поново учитате све странице?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Заустави учитавање тренутне странице</translation>
@@ -739,10 +511,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation>Подеси моторе претраге...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;Адблок...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Кад је укључено приватно прегледање онемогућене су неке радње које се тичу ваше приватности:</translation>
@@ -755,10 +523,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Ставке се аутоматски уклањају из прозора пријема.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Нови колачићи се не чувају, постојећим се не може приступити.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Иконе сајтова се не чувају.</translation>
@@ -799,6 +563,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -829,14 +606,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>историјат пр&amp;етраге</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;колачиће</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>кеширане &amp;веб странице</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>&amp;иконе веб сајтова</translation>
@@ -851,379 +620,182 @@ Do you want to reload all pages?</source>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation>Учитај</translation>
+        <source>Downloads</source>
+        <translation>Преузимања</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>Учитај све</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Додај %1 на белу листу</translation>
+        <source>Save File</source>
+        <translation>Сачувај фајл</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>Уклони са беле листе</translation>
+        <source>Download canceled: %1</source>
+        <translation>Преузимање отказано: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Подешавање</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Грешка при отварању излазног фајла: %1</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Учитај флеш</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Грешка при чувању: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Сајтови на белој листи</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Грешка на мрежи: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Веб сајт</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 од %2 (%3/сек) - %4</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Правило</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Дозволи</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Фасцикла за преузимања (%1) не може бити направљена.</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Блокирај</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Дозволи у току сесије</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Веб сајт</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Име</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Путања</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Сигурно</translation>
+        <source>bytes</source>
+        <translation type="obsolete">бајтова</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Истиче</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Садржај</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
+</context>
+<context>
+    <name>DownloadManager</name>
     <message>
-        <source>true</source>
-        <translation>тачно</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>У току су %1 преузимања
+Свеједно напустити?</translation>
     </message>
-    <message>
-        <source>false</source>
-        <translation>нетачно</translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n преузимање</numerusform>
+            <numerusform>%n  преузимања</numerusform>
+            <numerusform>%n  преузимања</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>Колачић сесије</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n минут је преостао</numerusform>
+            <numerusform>%n минуте су преостале</numerusform>
+            <numerusform>%n минута је преостало</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n секунда је преостала</numerusform>
+            <numerusform>%n секунде су преостале</numerusform>
+            <numerusform>%n  секунди је преостало</numerusform>
+        </translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Колачићи</translation>
+        <source>bytes</source>
+        <translation>бајтова</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Уклони</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Уклони &amp;све колачиће</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>Додај &amp;правило</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
+    <name>HistoryDialog</name>
     <message>
-        <source>Cookie Exceptions</source>
-        <translation>Изузеци за колачиће</translation>
+        <source>Open</source>
+        <translation>Отвори</translation>
     </message>
     <message>
-        <source>New Exception</source>
-        <translation>Нови изузетак</translation>
+        <source>Copy</source>
+        <translation>Копирај</translation>
     </message>
     <message>
-        <source>Domain:</source>
-        <translation>Домен:</translation>
+        <source>Delete</source>
+        <translation>Обриши</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Block</source>
-        <translation>Блокирај</translation>
+        <source>Show All History</source>
+        <translation>Прикажи цео историјат</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Дозволи у току сесије</translation>
+        <source>Clear History...</source>
+        <translation>Очисти историјат...</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Дозволи</translation>
+        <source>Clear History</source>
+        <translation>Очисти историјат</translation>
     </message>
     <message>
-        <source>Exceptions</source>
-        <translation>Изузеци</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Желите ли да очистите историјат?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Уклони</translation>
+        <source>Title</source>
+        <translation>Назив</translation>
     </message>
     <message>
-        <source>Remove &amp;All</source>
-        <translation>Уклони &amp;све</translation>
+        <source>Address</source>
+        <translation>Адреса</translation>
     </message>
 </context>
 <context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Преузимања</translation>
-    </message>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Clean up</source>
-        <translation>Очисти</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>Нема ставки</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Ico</source>
-        <translation>Икона</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Име фајла</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Покушајте поново</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Заустави</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Отвори</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Сачувај фајл</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Преузимање отказано: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Грешка при отварању излазног фајла: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Грешка при чувању: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Грешка на мрежи: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 од %2 (%3/сек) - %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 од %2 - Заустављено</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Фасцикла за преузимања (%1) не може бити направљена.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>У току су %1 преузимања
-Свеједно напустити?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n преузимање</numerusform>
-            <numerusform>%n  преузимања</numerusform>
-            <numerusform>%n  преузимања</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n минут је преостао</numerusform>
-            <numerusform>%n минуте су преостале</numerusform>
-            <numerusform>%n минута је преостало</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n секунда је преостала</numerusform>
-            <numerusform>%n секунде су преостале</numerusform>
-            <numerusform>%n  секунди је преостало</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>бајтова</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Без грешке</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Грешка при отварању: %1: Не постоји такав фајл или фасцикла</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Немогуће читање %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Садржај %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 КБ</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Отвори</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Копирај</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Обриши</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Историјат</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Уклони</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Уклони &amp;све</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Прикажи цео историјат</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Очисти историјат...</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Очисти историјат</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Желите ли да очистите историјат?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Назив</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Раније у току дана</translation>
+        <source>Earlier Today</source>
+        <translation>Раније у току дана</translation>
     </message>
     <message numerus="yes">
         <source>%n item(s)</source>
@@ -1235,29 +807,29 @@ Do you want to quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translation>Добродошли у Арору !</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>Aрорина почетна</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>Претражи!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>Резултате претраге омогућује</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>О Арори </translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1276,48 +848,6 @@ Do you want to quit anyway?</source>
         <translation>Нема инсталираних фајлова превода у %1.</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Уреди корисничко име и лозинку за &quot;%1&quot; на  %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Повежи се на прокси &quot;%1&quot; користећи: &lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation>- SSL грешке</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Сертификати:&lt;br/&gt;%1&lt;br/&gt;Да ли желите да прихватите све ове сертификате?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL грешке:&lt;br/&gt;&lt;br/&gt;за: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-Да ли желите да занемарите ове грешке?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Издавач: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Није валидо пре: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Валидно до: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Алтернативни називи:</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1340,26 +870,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>You must have at least one search engine in here.</source>
         <translation>Мора постојати барем један мотор претраге.</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Овори управник претраге</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Подразумевано</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Обриши</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Додај</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Затвори</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1392,26 +902,18 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
+    <name>PermissionBar</name>
     <message>
-        <source>Authentication Required</source>
-        <translation>Неопходна аутентификација</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
+        <source>Allow</source>
+        <translation type="unfinished">Дозволи</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>Корисничко име:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Лозинка:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1421,25 +923,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <translation>Не постоји</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Аутентификација проксија</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Повежи се на прокси</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Корисничко име:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Лозинка:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1454,398 +937,47 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>Фајл није OpenSearch 1.1 типа.</translation>
     </message>
-</context>
-<context>
-    <name>SearchBanner</name>
     <message>
-        <source>Done</source>
-        <translation>Завршено</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Истакни све</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Претражи</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Поставке</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Опште</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>При покретању:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>прикажи домаћу страницу</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>прикажи празну страницу</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>поврати прозоре и језичке од прошлог пута</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Домаћа страница:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Постави текућу страницу</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Уклони ставке историјата:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>после једног дана</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>после једне седмице</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>после две седмице</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>после једног месеца</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>после једне године</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>ручно</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>при напуштању програма</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Преузимања</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Увек питај за одредиште</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Користи следеће одредиште:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Изглед</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Стандардни фонт:</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Изаберите...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Фиксни фонт:</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Пожељни језици за прегледање веб страница:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Приватност</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Веб садржај</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Блокирај искачуће прозоре</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Омогући прикључке</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Користи &quot;Кликни за флеш&quot; за флеш прикључке</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Омогући Јаваскрипт</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Прикажи слике</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Колачићи</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Прихвати колачиће:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>увек</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>никад</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>само са веб сајтова које посећујем</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Изузеци... </translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Задржи колачиће док не:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>истекну</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>напустим програм</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>истекне највише 90 дана</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Колачићи...</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Филтрирај колачиће пратиоце</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Језичци</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Одабери језичке и прозоре при њиховом настајању</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Потврда при затварању више прозора или језичака</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Прикажи само једно дугме за затварање уместо једног по сваком језичку</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Напусти програм кад је последњи језичак затворен</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>Отварам везе</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Везе које желе да се отворе у новом прозору:</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>у новом прозору</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>у изабраном новом језичку тренутног прозора</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>у новом језичку тренутног прозора</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>у тренутном језичку</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Отварај везе из програма:</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Прокси</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>Користи прокси сервер</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Тип:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>СОКС5</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>ХТТП (Безбедно)</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>ХТТП (Транспарентно)</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>Име домаћина:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Порт:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Корисничко име:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Лозинка:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Напредно</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Опис стила:</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>Омогући мрежни кеш</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>Максимална величина:</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Користи подразумевани мотор претраге као испомоћ уколико је УРЛ задат од стране корисника неисправан</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation>Изаберите фасциклу...</translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation>Колачић сесије истиче:</translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation>кад напустим програм</translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation>за 1 дан</translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation>за 2 дана</translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation>за 3 дана</translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation>за 7 дана</translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation>за 30 дана</translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation>Смопопуњавање</translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation>Самопопуњавање веб образаца:</translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation>Корисничка имена и лозинке</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation>Уреди...</translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Прегледај...</translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
-        <translation>Захтева се поновно покретање</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>Подешавање мрежног кеша је промењено. Да би било узето у обзир прегледач мора бити поново покренут.</translation>
+        <source>Search</source>
+        <translation>Претражи</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>Изаберите фасциклу</translation>
@@ -1919,26 +1051,10 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Saved Tabs</source>
         <translation>Сачувај језичке</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Да ли заиста желите да затворите ову страницу?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Изменили сте ову страницу и њеним затварањем ћете изгубити измене.
-Да ли заиста желите да затворите ову страницу?
-</translation>
-    </message>
     <message>
         <source>Loading...</source>
         <translation>Учитавање...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Учитавам  %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Учитавање завршено</translation>
@@ -1979,6 +1095,10 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation>Маркирај све језичке</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -1994,10 +1114,6 @@ Do you really want to close this page?
         <source>Recent Searches</source>
         <translation>Скорашње претраге</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Додај &apos;%1&apos;</translation>
-    </message>
     <message>
         <source>Clear Recent Searches</source>
         <translation>Уклони скорашње претраге</translation>
@@ -2022,37 +1138,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Грешка при учитавању странице: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>При повезивању на: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Проверите адресу за грешке попут &lt;b&gt;ww/&lt;/b&gt;.arora-browser.org/ /уместо &lt;b&gt;www/&lt;/b&gt;.arora-browser.org/ </translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Уколико је адреса исправна, покушајте провером мрежне повезаности.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Уколико су ваш рачунар или мрежа заштићени фајерволом или проксијем постарајте се да прегледач има дозволе за приступ мрежи.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Поново шаљем ПОСТ захтев</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Да би сајт био приказан, захтев заједно са свим подацима мора бити поново послат, што може довести до непредвидљивог понашања самог сајта, нпр. иста радња може бити поново изведена. Да ли свеједно желите да наставите?  </translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2103,38 +1188,6 @@ Do you really want to close this page?
         <source>Search with...</source>
         <translation>Претражи помоћу...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Додај у траку претраге</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Метод није подржан</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>%1 метод није подржан.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Мотор претраге</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Изаберите жељени мотор претраге</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Назив мотора</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Унесите назив за мотор</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Блокирај слику</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/sr_RS@latin.ts b/src/locale/sr_RS@latin.ts
index c859829c..bdab1ba1 100644
--- a/src/locale/sr_RS@latin.ts
+++ b/src/locale/sr_RS@latin.ts
@@ -15,141 +15,6 @@
         <source>License</source>
         <translation>Licenca</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Lagani web pregledač baziran na Webkit-u</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org/&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Zatvori</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>Verzija Webkit-a: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Jezici</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Jezici prema redosledu poželjnosti:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>&amp;Gore</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>&amp;Dole</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Ukloni</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Dodaj...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>Blokirano AdBlockovim pravilom: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Dodaj prilagođeno pravilo</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Naučite više o pisanju pravila...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Ažuriraj pretplatu</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Pregledaj pretplate...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Ukloni pretplatu</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>Podešavanje AdBlocka</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>Omogući AdBlock</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Radnja</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Prilagođena pravila</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Pravilo</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Pertplati se?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Pretplati se na ovu AdBlockovu pretplatu? %1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -157,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Dodaj marker</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Unesite ime markera i izaberite gde ga sačuvati.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>URL</translation>
@@ -174,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Dodaj fasciklu</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Lozinke obrazaca</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Ukloni</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Ukloni sve</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Želite li da sačuvate ovu lozinku&lt;/b&gt;&lt;br&gt;         Da bi ste pregledali ili uklonili sačuvane lozinke koristite panel samopopunjavanja u podešavanjima.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Nikad za ovaj sajt</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Ne sad</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Web sajt</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Korisničko ime</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -245,18 +61,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Nova fascikla</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Markeri</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Ukloni</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Dodaj fasciklu</translation>
-    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -336,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>Neophodna je Html-U-XBEL alatka</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>Html-U-XBEL alatka, koja se destavlja sa Arorom i neophodna je za uvoz HTML markera, nije instalirana ili se ne nalazi u pretraženim putanjama.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Učitavam marker</translation>
@@ -350,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>Greška pri učitavanju HTML markera: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -405,8 +209,8 @@ Svejedno napustiti?</translation>
         <translation>Povraćaj nije uspeo</translation>
     </message>
     <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora se srušila u pokušaju da povrati prethodnu sesiju. Pokušati ponovo?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -439,14 +243,6 @@ Svejedno napustiti?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Izvezi markere...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>P&amp;regled štampe...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>Š&amp;tampa...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>&amp;Privatno pregledanje...</translation>
@@ -613,10 +409,6 @@ Svejedno napustiti?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Omogući &amp;Web inspektor</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>Po&amp;moć</translation>
@@ -662,11 +454,6 @@ Svejedno napustiti?</translation>
         <source>Hide Bookmarks Bar</source>
         <translation>Sakrij traku markera</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Otvori web resurs</translation>
@@ -675,10 +462,6 @@ Svejedno napustiti?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Web resursi (*.html *.htm *.svg *.png *.gif *.svgz);;Svi fajlovi (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Štampaj dokument</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Da li ste sigurni da želite da uključite privatno pregledanje?</translation>
@@ -687,16 +470,6 @@ Svejedno napustiti?</translation>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Da li ste sigurni da želite da zatvorite prozor? Otvoren(o) je %1 jezičak(a)</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Web inspektor</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Web inspektor će ispravno raditi samo na stranicama učitanim nakon njegovog uključivanja.
-Da li želite da ponovo učitate sve stranice?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Zaustavi učitavanje trenutne stranice</translation>
@@ -738,10 +511,6 @@ Da li želite da ponovo učitate sve stranice?</translation>
         <source>Configure Search Engines...</source>
         <translation>Podesi motore pretrage...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;AdBlock...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Kada je uključeno privatno pregledanje onemogućene su neke radnje koje se tiču vaše privatnosti:</translation>
@@ -754,10 +523,6 @@ Da li želite da ponovo učitate sve stranice?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Stavke se automatski uklanjaju iz prozora prijema.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Novi kolačići se ne čuvaju, postojećim se ne može pristupiti.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Ikone sajtova se ne čuvaju.</translation>
@@ -798,6 +563,19 @@ Da li želite da ponovo učitate sve stranice?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -828,14 +606,6 @@ Da li želite da ponovo učitate sve stranice?</translation>
         <source>&amp;Search History</source>
         <translation>istorijat pr&amp;etrage</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;kolačiće</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>Keširane &amp;web stranice</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>&amp;ikone web sajtova</translation>
@@ -850,379 +620,182 @@ Da li želite da ponovo učitate sve stranice?</translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation>Učitaj</translation>
+        <source>Downloads</source>
+        <translation>Preuzimanja</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>Učitaj sve</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Dodaj %1 na belu listu</translation>
+        <source>Save File</source>
+        <translation>Sačuvaj fajl</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>Ukloni sa bele liste</translation>
+        <source>Download canceled: %1</source>
+        <translation>Preuzimanje otkazano: %1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>Podešavanje</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Greška pri otvaranju izlaznog fajla: %1</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>Učitaj fleš</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Greška pri čuvanju: %1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Sajtovi na beloj listi</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Greška na mreži: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>Web sajt</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 od %2 (%3/sek) - %4</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>Pravilo</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Dozvoli</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Fascikla za preuzimanja (%1) ne može biti napravljena.</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Blokiraj</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Dozvoli u toku sesije</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Web sajt</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Ime</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Putanja</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Sigurno</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bajtova</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Ističe</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Sadržaj</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
+</context>
+<context>
+    <name>DownloadManager</name>
     <message>
-        <source>true</source>
-        <translation>tačno</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>U toku su %1 preuzimanja
+Svejedno napustiti?</translation>
     </message>
-    <message>
-        <source>false</source>
-        <translation>netačno</translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n preuzimanje</numerusform>
+            <numerusform>%n  preuzimanja</numerusform>
+            <numerusform>%n  preuzimanja</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>Kolačić sesije</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>%n minut je preostao</numerusform>
+            <numerusform>%n minute su preostale</numerusform>
+            <numerusform>%n minuta je preostalo</numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>%n sekunda je preostala</numerusform>
+            <numerusform>%n sekunde su preostale</numerusform>
+            <numerusform>%n  sekundi je preostalo</numerusform>
+        </translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Kolačići</translation>
+        <source>bytes</source>
+        <translation>bajtova</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Ukloni</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Ukloni &amp;sve kolačiće</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>Dodaj &amp;pravilo</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
+    <name>HistoryDialog</name>
     <message>
-        <source>Cookie Exceptions</source>
-        <translation>Izuzeci za kolačiće</translation>
+        <source>Open</source>
+        <translation>Otvori</translation>
     </message>
     <message>
-        <source>New Exception</source>
-        <translation>Novi izuzetak</translation>
+        <source>Copy</source>
+        <translation>Kopiraj</translation>
     </message>
     <message>
-        <source>Domain:</source>
-        <translation>Domen:</translation>
+        <source>Delete</source>
+        <translation>Obriši</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Block</source>
-        <translation>Blokiraj</translation>
+        <source>Show All History</source>
+        <translation>Prikaži ceo istorijat</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Dozvoli u toku sesije</translation>
+        <source>Clear History...</source>
+        <translation>Očisti istorijat...</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>Dozvoli</translation>
+        <source>Clear History</source>
+        <translation>Očisti istorijat</translation>
     </message>
     <message>
-        <source>Exceptions</source>
-        <translation>Izuzeci</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Želite li da očistite istorijat?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Ukloni</translation>
+        <source>Title</source>
+        <translation>Naziv</translation>
     </message>
     <message>
-        <source>Remove &amp;All</source>
-        <translation>Ukloni &amp;sve</translation>
+        <source>Address</source>
+        <translation>Adresa</translation>
     </message>
 </context>
 <context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Preuzimanja</translation>
-    </message>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Clean up</source>
-        <translation>Očisti</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>Nema stavki</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Ico</source>
-        <translation>Ikona</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Ime fajla</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Pokušajte ponovo</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Zaustavi</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Otvori</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Sačuvaj fajl</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Preuzimanje otkazano: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Greška pri otvaranju izlaznog fajla: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Greška pri čuvanju: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Greška na mreži: %1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 od %2 (%3/sek) - %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 od %2 - Zaustavljeno</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Fascikla za preuzimanja (%1) ne može biti napravljena.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>U toku su %1 preuzimanja
-Svejedno napustiti?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n preuzimanje</numerusform>
-            <numerusform>%n  preuzimanja</numerusform>
-            <numerusform>%n  preuzimanja</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minut je preostao</numerusform>
-            <numerusform>%n minute su preostale</numerusform>
-            <numerusform>%n minuta je preostalo</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n sekunda je preostala</numerusform>
-            <numerusform>%n sekunde su preostale</numerusform>
-            <numerusform>%n  sekundi je preostalo</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bajtova</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Bez greške</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Greška pri otvaranju: %1: Ne postoji takav fajl ili fascikla</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Nemoguće čitanje %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Sadržaj %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Otvori</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Kopiraj</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Obriši</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Istorijat</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Ukloni</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Ukloni &amp;sve</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Prikaži ceo istorijat</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Očisti istorijat...</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Očisti istorijat</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Želite li da očistite istorijat?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Naziv</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Ranije u toku dana</translation>
+        <source>Earlier Today</source>
+        <translation>Ranije u toku dana</translation>
     </message>
     <message numerus="yes">
         <source>%n item(s)</source>
@@ -1234,29 +807,29 @@ Svejedno napustiti?</translation>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translation>Dobrodošli u Aroru !</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>Arorina početna</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>Pretraži!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>Rezultate pretrage omogućuje</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>O Arori </translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1275,48 +848,6 @@ Svejedno napustiti?</translation>
         <translation>Nema instaliranih fajlova prevoda u %1.</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Uredi korisničko ime i lozinku za &quot;%1&quot; na  %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Poveži se na proksi &quot;%1&quot; koristeći: &lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation>- SSL greške</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Sertifikati:&lt;br/&gt;%1&lt;br/&gt;Da li želite da prihvatite sve ove sertifikate?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL greške:&lt;br/&gt;&lt;br/&gt;za: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-Da li želite da zanemarite ove greške?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Izdavač: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Nije valido pre: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Validno do: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Alternativni nazivi:</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1339,26 +870,6 @@ Da li želite da zanemarite ove greške?&lt;/qt&gt;</translation>
         <source>You must have at least one search engine in here.</source>
         <translation>Mora postojati barem jedan motor pretrage.</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Ovori upravnik pretrage</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Podrazumevano</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Obriši</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Dodaj</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Zatvori</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1391,26 +902,18 @@ Da li želite da zanemarite ove greške?&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
+    <name>PermissionBar</name>
     <message>
-        <source>Authentication Required</source>
-        <translation>Neophodna autentifikacija</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
+        <source>Allow</source>
+        <translation type="unfinished">Dozvoli</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>Korisničko ime:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Lozinka:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1420,25 +923,6 @@ Da li želite da zanemarite ove greške?&lt;/qt&gt;</translation>
         <translation>Ne postoji</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Autentifikacija proksija</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Poveži se na proksi</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Korisničko ime:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Lozinka:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1453,398 +937,47 @@ Da li želite da zanemarite ove greške?&lt;/qt&gt;</translation>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>Fajl nije OpenSearch 1.1 tipa.</translation>
     </message>
-</context>
-<context>
-    <name>SearchBanner</name>
     <message>
-        <source>Done</source>
-        <translation>Završeno</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Istakni sve</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Pretraži</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Postavke</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Opšte</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Pri pokretanju:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>prikaži domaću stranicu</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>prikaži praznu stranicu</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>povrati prozore i jezičke od prošlog puta</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Domaća stranica:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Postavi tekuću stranicu</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Ukloni stavke istorijata:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>posle jednog dana</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>posle jedne sedmice</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>posle dve sedmice</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>posle jednog meseca</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>posle jedne godine</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>ručno</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>pri napuštanju programa</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Preuzimanja</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Uvek pitaj za odredište</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Koristi sledeće odredište:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Izgled</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Standardni font:</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Izaberite...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Fiksni font:</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Poželjni jezici za pregledanje web stranica:</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Privatnost</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Web sadržaj</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Blokiraj iskačuće prozore</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Omogući priključke</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Koristi &quot;Klikni za fleš&quot; za fleš priključke</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Omogući Javascript</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Prikaži slike</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Kolačići</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Prihvati kolačiće:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>uvek</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>nikad</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>samo sa veb sajtova koje posećujem</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Izuzeci... </translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Zadrži kolačiće dok ne:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>isteknu</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>napustim program</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>istekne najviše 90 dana</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Kolačići...</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Filtriraj kolačiće pratioce</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Jezičci</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Odaberi jezičke i prozore pri njihovom nastajanju</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Potvrda pri zatvaranju više prozora ili jezičaka</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Prikaži samo jedno dugme za zatvaranje umesto jednog po svakom jezičku</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Napusti program kad je poslednji jezičak zatvoren</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>Otvaram veze</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Veze koje žele da se otvore u novom prozoru:</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>u novom prozoru</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>u izabranom novom jezičku trenutnog prozora</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>u novom jezičku trenutnog prozora</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>u trenutnom jezičku</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Otvaraj veze iz programa:</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Proksi</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>Koristi proksi server</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Tip:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>Http (Bezbedno)</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (Transparentno)</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>Ime domaćina:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Korisničko ime:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Lozinka:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Napredno</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Opis stila:</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>Omogući mrežni keš</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>Maksimalna veličina:</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Koristi podrazumevani motor pretrage kao ispomoć ukoliko je URL zadat od strane korisnika neispravan</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation>Izaberite fasciklu...</translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation>Sesija kolačića ističe:</translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation>kad napustim program</translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation>za 1 dan</translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation>za 2 dana</translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation>za 3 dana</translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation>za 7 dana</translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation>za 30 dana</translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation>Samopopunjavanje</translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation>Samopopunjavanje web obrazaca:</translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation>Korisnička imena i lozinke</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation>Uredi...</translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Pregledaj...</translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
-        <translation>Zahteva se ponovno pokretanje</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>Podešavanje mrežnog keša je promenjeno. Da bi bilo uzeto u obzir pregledač mora biti ponovo pokrenut.</translation>
+        <source>Search</source>
+        <translation>Pretraži</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>Izaberite fasciklu</translation>
@@ -1918,26 +1051,10 @@ Da li želite da zanemarite ove greške?&lt;/qt&gt;</translation>
         <source>Saved Tabs</source>
         <translation>Sačuvaj jezičke</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Da li zaista želite da zatvorite ovu stranicu?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Izmenili ste ovu stranicu i njenim zatvaranjem ćete izgubiti izmene.
-Da li zaista želite da zatvorite ovu stranicu?
-</translation>
-    </message>
     <message>
         <source>Loading...</source>
         <translation>Učitavanje...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Učitavam  %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Učitavanje završeno</translation>
@@ -1978,6 +1095,10 @@ Da li zaista želite da zatvorite ovu stranicu?
         <source>Bookmark All Tabs</source>
         <translation>Markiraj sve jezičke</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -1993,10 +1114,6 @@ Da li zaista želite da zatvorite ovu stranicu?
         <source>Recent Searches</source>
         <translation>Skorašnje pretrage</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Dodaj &apos;%1&apos;</translation>
-    </message>
     <message>
         <source>Clear Recent Searches</source>
         <translation>Ukloni skorašnje pretrage</translation>
@@ -2021,37 +1138,6 @@ Da li zaista želite da zatvorite ovu stranicu?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Greška pri učitavanju stranice: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Pri povezivanju na: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Proverite adresu za greške poput &lt;b&gt;ww/&lt;/b&gt;.arora-browser.org/ /umesto &lt;b&gt;www/&lt;/b&gt;.arora-browser.org/ </translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Ukoliko je adresa ispravna, pokušajte proverom mrežne povezanosti.</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Ukoliko su vaš računar ili mreža zaštićeni fajervolom ili proksijem postarajte se da pregledač ima dozvole za pristup mreži.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Ponovo šaljem POST zahtev</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Da bi sajt bio prikazan, zahtev zajedno sa svim podacima mora biti ponovo poslat, što može dovesti do nepredvidljivog ponašanja samog sajta, npr. ista radnja može biti ponovo izvedena. Da li svejedno želite da nastavite?  </translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2102,38 +1188,6 @@ Da li zaista želite da zatvorite ovu stranicu?
         <source>Search with...</source>
         <translation>Pretraži pomoću...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Dodaj u traku pretrage</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Metod nije podržan</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>%1 metod nije podržan.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Motor pretrage</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Izaberite željeni motor pretrage</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Naziv motora</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Unesite naziv za motor</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Blokiraj sliku</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/tr_TR.ts b/src/locale/tr_TR.ts
index ad0f9e86..82eb44fc 100644
--- a/src/locale/tr_TR.ts
+++ b/src/locale/tr_TR.ts
@@ -3,22 +3,6 @@
 <TS version="2.1" language="tr_TR">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Webkit tabanlı hafif bir web tarayıcı</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;DejaVu Sans&apos;; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Yazarlar</translation>
@@ -27,150 +11,10 @@ p, li { white-space: pre-wrap; }
         <source>License</source>
         <translation>Lisans</translation>
     </message>
-    <message>
-        <source>Close</source>
-        <translation>Kapat</translation>
-    </message>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Hakkında</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>%1 Hakkında</translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>WebKit sürümü: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Diller</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Diller: tercih sırasına göre:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>&amp;Yukarı Taşı</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>&amp;Aşağı Taşı</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Kaldır</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Ekle...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>AdBlockRule: %1 tarafından engellendi</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Özel Kural Ekle</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Kural oluşturmak hakkında daha fazla bilgi...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Aboneliği Güncelle</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Aboneliklere Gözat...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Aboneliği Kaldır</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>AdBlock Tercihleri</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>AdBlock Kullan</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Eylem</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Özel Kurallar</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Kural</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Abone Ol?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Bu AdBlock aboneliğini kullan ? 
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -178,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Yer İmlerine Ekle</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Yer imi için bir ad girin ve nerede saklanacağını belirtin.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Url</translation>
@@ -195,65 +35,8 @@ p, li { white-space: pre-wrap; }
         <translation>Dizin Ekle</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Form Parolaları</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Kaldır</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Hepsini Kaldır</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Bu parolayı saklamak ister misiniz?&lt;/b&gt;&lt;br&gt;         Kayıtlı parolalarınızı düzenlemek için Otomatik Doldur seçeneklerinne gidin.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Bu site için hiç bir zaman</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Şimdi değil</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Site</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Kullanıcı Adı</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Yer İmleri</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Sil</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Dizin Ekle</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Aç</translation>
@@ -299,10 +82,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Dosya Aç</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>%1 İçe Aktarıldı</translation>
@@ -331,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Yer İmini Araya Ekle</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">İsim Değiştir</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Adres Değiştir</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation>Yerimleri Çubuğu</translation>
@@ -347,20 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Bookmarks Menu</source>
         <translation>Yerimleri Menüsü</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Html yerimlerini yüklerken hata: %1
-</translation>
-    </message>
-    <message>
-        <source>XBEL</source>
-        <translation type="obsolete">XBEL</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -383,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>htmlToXBel aracı gerekli</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>HTML yerimlerini içe aktarmak için Arora ile dağıtılan gerekli htmlToXBel aracı yüklü değil ya da bulunamadı.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Yerimleri Yükleniyor</translation>
@@ -397,6 +150,10 @@ p, li { white-space: pre-wrap; }
         <translation>HTML yerimleri yüklenirken bir hata oluştu: %1
 </translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -418,10 +175,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Yer İmi</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Aç</translation>
@@ -442,10 +195,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Dizin Ekle...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Yer İmleri</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
@@ -460,16 +209,8 @@ Yinede çıkmak istiyor musunuz?</translation>
         <translation>Geri yükleme başarısız</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Kaydolan oturum geri yüklenemeyecek çünkü Arora oturumu geri yüklerken çöktü.</translation>
-    </message>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete">(Değişim: %1 %2)</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora bu oturumu kurtarmaya çalışırken çöktü.  Tekrar denensin mi?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -502,14 +243,6 @@ Yinede çıkmak istiyor musunuz?</translation>
         <source>&amp;Export Bookmarks...</source>
         <translation>Yerimlerini Dı&amp;şa Aktar...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>Baskı &amp;Önizleme...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>Ya&amp;zdır...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>Özel Gez&amp;inme...</translation>
@@ -546,18 +279,10 @@ Yinede çıkmak istiyor musunuz?</translation>
         <source>&amp;Find</source>
         <translation>&amp;Bul</translation>
     </message>
-    <message>
-        <source>Find &amp;Next</source>
-        <translation type="obsolete">&amp;Sonrakini Bul</translation>
-    </message>
     <message>
         <source>Find P&amp;revious</source>
         <translation>&amp;Öncekini Bul</translation>
     </message>
-    <message>
-        <source>Prefe&amp;rences</source>
-        <translation type="obsolete">Te&amp;rcihler</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -570,10 +295,6 @@ Yinede çıkmak istiyor musunuz?</translation>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -586,18 +307,6 @@ Yinede çıkmak istiyor musunuz?</translation>
         <source>&amp;Reload Page</source>
         <translation>&amp;Sayfayı Yeniden Yükle</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">&amp;Yazıyı Büyüt</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">Yazıyı &amp;Normal Yap</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">Yazıyı K&amp;üçült</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>Sayfa Kayna&amp;ğı</translation>
@@ -634,10 +343,6 @@ Yinede çıkmak istiyor musunuz?</translation>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Yer İmleri</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Yer İmlerini Düzenle...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Yer İmi Ekle...</translation>
@@ -668,10 +373,6 @@ Yinede çıkmak istiyor musunuz?</translation>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Ağ Denet&amp;çisini Aktif Et</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>Yard&amp;ım</translation>
@@ -680,10 +381,6 @@ Yinede çıkmak istiyor musunuz?</translation>
         <source>About &amp;Qt</source>
         <translation>&amp;Qt Hakkında</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">&amp;Arora Hakkında</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Gezinme</translation>
@@ -712,15 +409,6 @@ Yinede çıkmak istiyor musunuz?</translation>
         <source>Hide Bookmarks Bar</source>
         <translation>Yerimi Araç Çubuğunu Gizle</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Ağ Kaynağını Aç</translation>
@@ -729,36 +417,14 @@ Yinede çıkmak istiyor musunuz?</translation>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Sayfa Kaynakları (*.html *.htm *.svg *.png *.gif *.svgz);;Tüm Dosyalar (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Belgeyi Yazdır</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Gizli gezinmeyi açmak istediğinizden emin misiniz?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Gizli gezinme aktifken, sizin gizliliğinizle bağlantılı olan bazı davranışlar iptal edilecektir:&lt;ul&gt;&lt;li&gt; Web sayfaları geçmişe eklenmeyecekler.&lt;/li&gt;&lt;li&gt; İndirme penceresindeki öğeler otomatik olarak silinecekler.&lt;/li&gt;&lt;li&gt; Yeni çerezler saklanmayacak, mevcut çerezlere erişim sağlanmayacaktır.&lt;/li&gt;&lt;li&gt; Sayfa ikonları saklanmayacak, oturum kaydedilmeyecektir.&lt;/li&gt;&lt;li&gt; Aramalar, arama kutusundaki açılır menüye eklenmeyecektir.&lt;/li&gt;&lt;/ul&gt;Siz pencereyi kapatana kadar, açtığınız web sayfasına geri dönmek için İleri ve Geri düğmelerine tıklayabileceksiniz.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Pencereyi kapatmak istediğinizden emin misiniz? %1 sekme açık</translation>
     </message>
-    <message>
-        <source>Page Source of %1</source>
-        <translation type="obsolete">%1&apos;in Sayfa Kaynağı</translation>
-    </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Ağ Denetçisi</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Ağ Denetçisi sadece aktif edildikten sonra yüklenen sayfalarda düzgün çalışacaktır.
-Tüm sayfaları yenilemeyi istiyor musunuz?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Mevcut sayfayı yüklemeyi durdur</translation>
@@ -771,19 +437,10 @@ Tüm sayfaları yenilemeyi istiyor musunuz?</translation>
         <source>Downloads</source>
         <translation>İndirilenler</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
     <message>
         <source>Find Nex&amp;t</source>
         <translation>Sonra&amp;kini Bul</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">Se&amp;çenekler...</translation>
-    </message>
     <message>
         <source>Show Menu Bar</source>
         <translation>Menü Çubuğunu Göster</translation>
@@ -792,10 +449,6 @@ Tüm sayfaları yenilemeyi istiyor musunuz?</translation>
         <source>Switch application language </source>
         <translation>Uygulama dilini değiştir</translation>
     </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">A&amp;ğ İzleyicisini Göster</translation>
-    </message>
     <message>
         <source>Close Window</source>
         <translation>Pencereyi Kapat</translation>
@@ -829,10 +482,6 @@ Tüm sayfaları yenilemeyi istiyor musunuz?</translation>
         <comment>About Browser</comment>
         <translation>&amp;%1 Hakkında</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Özel gezinme aktif olduğunda, gizliliğinizle ilgili bazı eylemler etkisizleştirilecek:&lt;ul&gt;&lt;li&gt; Web sayfaları geçmişe eklenmeyecek.&lt;/li&gt;&lt;li&gt; İndirme penceresindeki öğeler otomatik olarak kaldırılacak.&lt;/li&gt;&lt;li&gt; Yeni çerezler saklanmayacak, mevcut çerezlere erişilemeyecek.&lt;/li&gt;&lt;li&gt; Sayfa simgeleri saklanmayacak, oturum kaydedilmeyecek.&lt;/li&gt;&lt;li&gt; Aramalarınız arama kutusundaki açılır menüye eklenmeyecek.&lt;/li&gt;&lt;/ul&gt;Siz pencereyi kapatana kadar, açmış olduğunu web sayfalarına Geri ve İleri düğmelerine tıklayarak geri dönebileceksiniz.</translation>
-    </message>
     <message>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
@@ -862,10 +511,6 @@ Tüm sayfaları yenilemeyi istiyor musunuz?</translation>
         <source>Configure Search Engines...</source>
         <translation>Arama Motorlarını Yapılandır...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;Ad Block...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Özel gezinme açıkken gizliliğinizle ilgili bazı eylemler kaydedilmeyecektir:</translation>
@@ -878,10 +523,6 @@ Tüm sayfaları yenilemeyi istiyor musunuz?</translation>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>İndirilen öğeler otomatik olarak kaldırılacak.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Yeni çerezler kaydedilmeyecek, mevcut çerezler kullanılmayacak.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Site ikonları kaydedilmeyecek.</translation>
@@ -922,6 +563,19 @@ Tüm sayfaları yenilemeyi istiyor musunuz?</translation>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -952,14 +606,6 @@ Tüm sayfaları yenilemeyi istiyor musunuz?</translation>
         <source>&amp;Search History</source>
         <translation>&amp;Arama Geçmişi</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Çerezler</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>&amp;Önbelleğe alınmış Web Sayfaları</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>Web Sayfası S&amp;imgeleri</translation>
@@ -974,279 +620,81 @@ Tüm sayfaları yenilemeyi istiyor musunuz?</translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation>Yükle</translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation>Hepsini Yükle</translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>%1 i aklisteye ekle</translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation>Aklisteden kaldır</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Ayarlar</translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load Flash</source>
-        <translation>Flash Yükle</translation>
+        <source>Downloads</source>
+        <translation>İndirilenler</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Akliste siteleri</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CookieExceptionsModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Web Sayfası</translation>
-    </message>
-    <message>
-        <source>Rule</source>
-        <translation>Kural</translation>
-    </message>
+    <name>DownloadItem</name>
     <message>
-        <source>Allow</source>
-        <translation>İzin Ver</translation>
+        <source>Save File</source>
+        <translation>Dosyayı Kaydet</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Kısıtla</translation>
+        <source>Download canceled: %1</source>
+        <translation>İndirme iptal edildi: %1</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Bu Oturum İçin İzin Ver</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Çıktı dosyası açılırken hata oluştu: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Web Sayfası</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Kaydederken hata oluştu: %1</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>İsim</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Ağ Hatası: %1</translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Yol</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Güvenli</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 / %2 (%3/sn) - %4</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Sonlanma</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">İndirilenler klasörü (%1) oluşturulamadı.</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>İçerik</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>doğru</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>yanlış</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation>Oturum çerezi</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Çerezler</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Kaldır</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bytes</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Tüm Çerezleri Kaldı&amp;r</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>&amp;Kural Ekle</translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Çerez İstisnaları</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Yeni İstisna</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Etki Alanı:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Blok</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Bu Oturuma İzin Ver</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>İzin Ver</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>İstisnalar</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Kaldır</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Hepsini Kaldı&amp;r</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>İndirilenler</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Temizle</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 Öğe</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Tamam</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Dosyaadı</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Yeniden Dene</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Dur</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Aç</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Dosyayı Kaydet</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>İndirme iptal edildi: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Çıktı dosyası açılırken hata oluştu: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Kaydederken hata oluştu: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Ağ Hatası: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">saniye</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%2&apos;nin %1&apos;i (%3/sn) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%2&apos;nin %1&apos;i - Durdu</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">byte</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">MB</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n dakika kaldı</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- %n saniye kaldı</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 / %2 (%3/sn) - %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>İndirilenler klasörü (%1) oluşturulamadı.</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
 </context>
 <context>
@@ -1292,47 +740,8 @@ Yine de çıkmak istiyor musunuz?</translation>
         <translation>GB</translation>
     </message>
 </context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Hata Yok</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Hata ! Böyle bir dosya ya da dizin bulunamadı: %1</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>%1 Okunamıyor</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>%1 İçeriği</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>HistoryDialog</name>
-    <message>
-        <source>History</source>
-        <translation>Geçmiş</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Kaldır</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>&amp;Hepsini Kaldır</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Aç</translation>
@@ -1390,38 +799,34 @@ Yine de çıkmak istiyor musunuz?</translation>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
-        <translation>Arora&apos;ya Hoş Geldiniz!</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
-        <translation>Arora Başlangıç</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Search!</source>
-        <translation>Ara!</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
-        <translation>Arama sonuçlarını sağlayan</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
-        <translation>Arora Hakkında</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageManager</name>
-    <message>
-        <source>System locale (%1) %2</source>
-        <translation type="obsolete">Sistem yereli (%1) %2</translation>
-    </message>
     <message>
         <source>Choose language</source>
         <translation>Dil Seçiniz</translation>
@@ -1430,120 +835,11 @@ Yine de çıkmak istiyor musunuz?</translation>
         <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
         <translation>&lt;p&gt;İşletim sisteminin varsayılan dilinden&lt;br&gt;başka bir dil seçebilirsiniz.&lt;/p&gt;&lt;p&gt;Lütfen kullanılacak dili seçini&lt;/p&gt;</translation>
     </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Hiç çeviri dosyası yüklenmemiş.</translation>
-    </message>
     <message>
         <source>No translation files are installed at %1.</source>
         <translation>%1 konumunda herhangi bir dil dosyası bulunamadı.</translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;%2 deki %1 için kullanıcı adı ve parola girin&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Vekil &quot;%1&quot; &apos;e bunu kullanarak bağlan:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">SSL Hataları:
-
-%1
-
-%2
-
-Bu hataları gözardı etmek istiyor musunuz?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Tüm bu sertifikaları kabul etmek istiyor musunuz?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - SSL Hataları</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL Hataları:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Bu hataları görmezden gelmek istiyor musunuz?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Sertifikalar:&lt;br/&gt;%1&lt;br/&gt;Tüm bu sertifikaları kabul etmek istiyor musunuz?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Sertifikalar:&lt;br/&gt;%1&lt;br/&gt;Tüm bu sertifikaları kabul etmek istiyor musunuz?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Hata: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Şundan önce geçersiz: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Şuna kadar geçerli: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Alternatif İsimler:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">İsim</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Değer</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Ağ İzleyici</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Ağ İstekleri</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">İstek Başlıkları</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Yanıt Başlıkları</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Kaldır</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">&amp;Tüm İstekleri Kaldır</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1566,26 +862,6 @@ Bu hataları görmezden gelmek istiyor musunuz?&lt;/qt&gt;</translation>
         <source>You must have at least one search engine in here.</source>
         <translation>Burada en az bir arama motoru olmalı.</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>OpenSearch Yöneticisi</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Öntanımlıları Geri Yükle</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>&amp;Sil</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Ekle</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Kapat</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1618,26 +894,18 @@ Bu hataları görmezden gelmek istiyor musunuz?&lt;/qt&gt;</translation>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Kimlik Denetimi Gerekli</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
+    <name>PermissionBar</name>
     <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
+        <source>Allow</source>
+        <translation type="unfinished">İzin Ver</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>Kullanıcı Adı:</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Parola:</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1647,29 +915,6 @@ Bu hataları görmezden gelmek istiyor musunuz?&lt;/qt&gt;</translation>
         <translation>Bulunamadı</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Vekil Kimlik Denetimi</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>Proxy&apos;e bağlan</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Kullanıcı adı:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Parola:</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1684,63 +929,36 @@ Bu hataları görmezden gelmek istiyor musunuz?&lt;/qt&gt;</translation>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>Bu dosya bir OpenSearch 1.1 dosyası değil.</translation>
     </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Yönlendir: %1</translation>
-    </message>
     <message>
-        <source>Method</source>
-        <translation type="obsolete">Metod</translation>
+        <source>use desktop notifications</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Address</source>
-        <translation type="obsolete">Adres</translation>
+        <source>use your position</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Response</source>
-        <translation type="obsolete">Yanıt</translation>
+        <source>use your microphone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Length</source>
-        <translation type="obsolete">Uzunluk</translation>
+        <source>use your camera</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Content Type</source>
-        <translation type="obsolete">İçerik Türü</translation>
+        <source>use your camera and microphone</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Info</source>
-        <translation type="obsolete">Bilgi</translation>
+        <source>lock your mouse</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Form</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">TextLabel</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
+    <name>SavePageDialog</name>
     <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Bitti</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Hepsini Vurgula</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1750,399 +968,8 @@ Bu hataları görmezden gelmek istiyor musunuz?&lt;/qt&gt;</translation>
         <translation>Ara</translation>
     </message>
 </context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Tercihler</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Genel</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>Açılışta:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Giriş sayfamı göster</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Boş bir sayfa göster</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>En son açık olan pencere ve sekmeleri geri yükle</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Giriş Sayfası:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Mevcut sayfayı ayarla</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Geçmiş öğeleri kaldır:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Bir gün sonra</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Bir hafta sonra</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>İki hafta sonra</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Bir ay sonra</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Bir yıl sonra</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Elle</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>Uygulama kapanırken</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Uygulamalardaki bağlantıları aç:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">Mevcut penceredeki bir sekmede</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>Yeni pencerede</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>İndirilenler</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Her seferinde hedefi sor</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Bu hedefi kullan:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Görünüm</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Standart yazıtipi:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Seç...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Sabit-genişlikli yazıtipi:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Gizlilik</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Web İçeriği</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Eklentileri Aktif Et</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Javascript&apos;i Aktif Et</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Görüntüleri Göster</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Çerezler</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Çerezleri Kabul Et:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Herzaman</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Asla</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Sadece şu sayfalarda gezinirken</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>İstisnalar...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Çerezleri Tut:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Süresi dolunca</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Uygulamadan çıkarken</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>En fazla 90 gün</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Çerezler...</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>Sekmeler</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Pencere ve sekmeleri oluşturulduklarında seç</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Çoklu sekmeleri kapatırken onay iste</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>Vekil Sunucu</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>Vekil sunucu kullan</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>Tür:</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>Sunucu adı:</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>Port:</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>Kullanıcı Adı:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Parola:</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>Gelişmiş</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>Style Sheet:</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Her sekmede göstermek yerine tek bir kapatma düğmesi göster</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Web sayfalarını gezinirken tercih edilecek dil:</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>Açılır Pencereleri Engelle</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>Bağlantıların açılması</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Yeni pencerede açılması istenilen bağlantılar:</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>Mevcut pencerede seçilmiş yeni bir sekmede</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>Mevcut pencerede yeni bir sekmede</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>Mevcut sekmede</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>Http (Güvenli)</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (Transparent)</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Flash eklentilerinde ClickToFlash kullan</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Çerezleri Filtrele</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Birden çok pencere ve sekme kapatılırken doğrula</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Son sekme kapatıldığında uygulamayı kapat</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>Ağ önbelleğini etkinleştir</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>Azami Boyut:</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation> MB</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Girilen adres geçersizse varsayılan arama motoru ile arama yap</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation>Dizin Seç...</translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
-        <translation>Çerez Oturumlarını Sil:</translation>
-    </message>
-    <message>
-        <source>When I exit the application</source>
-        <translation>Uygulama kapanınca</translation>
-    </message>
-    <message>
-        <source>1 day</source>
-        <translation>1 gün sonra</translation>
-    </message>
-    <message>
-        <source>2 days</source>
-        <translation>2 gün sonra</translation>
-    </message>
-    <message>
-        <source>3 days</source>
-        <translation>3 gün sonra</translation>
-    </message>
-    <message>
-        <source>7 days</source>
-        <translation>7 gün sonra</translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation>30 gün sonra</translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation>Otomatik Doldur</translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation>Formları Otomatik Doldur:</translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation>Kullanıcı adları ve parolalar</translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation>Düzenle...</translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation>Gözat...</translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use this external download program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose Program...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum Font size:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation>Yeniden başlatmak gerekiyor</translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>Ağ önbelleği yapılandırması değişti. İşleme alınması için tarayıcının yeniden başlatılması gerekiyor.</translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation>Dizin Seç</translation>
@@ -2170,18 +997,6 @@ Bu hataları görmezden gelmek istiyor musunuz?&lt;/qt&gt;</translation>
         <source>&amp;Find</source>
         <translation>&amp;Bul</translation>
     </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Sayfanın Kaynağı</translation>
-    </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Görünüm</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">Satırları &amp;kaydır</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>%1 Sayfasının Kaynağı</translation>
@@ -2197,10 +1012,6 @@ Bu hataları görmezden gelmek istiyor musunuz?&lt;/qt&gt;</translation>
         <source>Hide Tab Bar</source>
         <translation>Sekme Çubuğunu Gizle</translation>
     </message>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Yeni Se&amp;kme</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Sekmeyi Kopyala</translation>
@@ -2244,22 +1055,6 @@ Bu hataları görmezden gelmek istiyor musunuz?&lt;/qt&gt;</translation>
         <source>Recently Closed Tabs</source>
         <translation>Yeni Kapatılan Sekmeler</translation>
     </message>
-    <message>
-        <source>(Untitled)</source>
-        <translation type="obsolete">(Başlıksız)</translation>
-    </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Bu sayfayı gerçekten kapatmayı istiyor musunuz?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Bu sayfada düzenleme yaptınız ve eğer kapatırsanız tüm düzenlemelerinizi kaybedeceksiniz.
-Bu sayfayı gerçekten kapatmayı istiyor musunuz?
-</translation>
-    </message>
     <message>
         <source>Untitled</source>
         <translation>Başlıksız</translation>
@@ -2280,10 +1075,6 @@ Bu sayfayı gerçekten kapatmayı istiyor musunuz?
         <source>Loading...</source>
         <translation>Yükleniyor...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Yükleniyor %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Yükleme bitti</translation>
@@ -2296,6 +1087,10 @@ Bu sayfayı gerçekten kapatmayı istiyor musunuz?
         <source>Bookmark All Tabs</source>
         <translation>Tüm Sekmeleri Yerimlerine Ekle</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2315,14 +1110,6 @@ Bu sayfayı gerçekten kapatmayı istiyor musunuz?
         <source>Suggestions</source>
         <translation>Öneriler</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>%1 Ekle</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">Arama Motorlarını Yapılandır...</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2343,37 +1130,6 @@ Bu sayfayı gerçekten kapatmayı istiyor musunuz?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Sayfayı yüklerken hata: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Bağlanırken: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>&lt;b&gt;www&lt;/b&gt;.arora-browser.org yerine &lt;b&gt;ww&lt;/b&gt;.arora-browser.org şeklindeki adres hatalarını kontrol edin</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Ağınız ya da bilgisayarınız güvenlik duvarı veya vekil sunucu ile korunuyorsa, tarayıcınızın ağ erişimine izin verildiğinden emin olunuz.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Adres doğruysa, ağ bağlantınızı kontrol etmeyi deneyin.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>POST isteği yeniden gönderiliyor</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Bu sayfayı göstermek için daha önce gerçekleştirilen eylemler (ör. arama emri ) tekrarlanacak ve bilgiler yeniden gönderilecek. Devam etmek istiyor musunuz ?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2424,38 +1180,6 @@ Bu sayfayı gerçekten kapatmayı istiyor musunuz?
         <source>Search with...</source>
         <translation>Şununla ara...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Araç çubuğu aramasına ekle</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Metod desteklenmiyor</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>method desteklenmiyor: %1 .</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Arama motoru</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Kullanmak istediğiniz arama motorunu seçin</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Arama motoru adı</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Arama motoru için bir ad belirtin</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Resimleri Engelle</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/uk.ts b/src/locale/uk.ts
index 47ce2159..73598b23 100644
--- a/src/locale/uk.ts
+++ b/src/locale/uk.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="uk">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">Про програму</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>Автори</translation>
@@ -15,150 +11,10 @@
         <source>License</source>
         <translation>Ліцензія</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>Легкий переглядач тенет, оснований на WebKit</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="obsolete">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2008 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>Закрити</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation>Про %1</translation>
     </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation>Версія WebKit: %1</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;p, li { white-space: pre-wrap; }&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>Мови</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>Мови: в порядку застосування:</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>Перемістити &amp;вище</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>Перемістити &amp;нижче</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Вилучити</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>Додати...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation>AdBlockRule заборонив: %1</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation>Додати спеціальне правило</translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation>Дізнатись детальніше щодо написання правил...</translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation>Оновити підписку</translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation>Переглянути підписки...</translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation>Вилучити підписку</translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation>Налаштування AdBlock</translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation>Увімкнути AdBlock</translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation>Дія</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation>Спеціальні правила</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation>Правило</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation>Підписатись?</translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation>Підписатись до цієї підписки AdBlock?
-%1</translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -166,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>Закласти</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>Введіть назву закладки та виберіть куди її додати.</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation>Посилання</translation>
@@ -183,51 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation>Додати теку</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation>Форма паролів</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation>Вилучити</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation>Вилучити всі</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill pane of preferences.</source>
-        <translation type="vanished">&lt;b&gt;Бажаєте зберегти цей пароль?&lt;/b&gt;&lt;br&gt;         Щоб переглядати і вилучати збережені паролі, відкрийте налаштування автоматичного заповнення.</translation>
-    </message>
-    <message>
-        <source>Never for this site</source>
-        <translation>Ніколи для цього сайта</translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation>Не зараз</translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation>Сайт</translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation>Ім&apos;я користувача</translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -246,18 +53,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>Нова тека</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>Закладки</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Вилучити</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>Додати теку</translation>
-    </message>
     <message>
         <source>Edit Name</source>
         <translation>Редагувати назву</translation>
@@ -287,10 +82,6 @@ p, li { white-space: pre-wrap; }
         <source>Open File</source>
         <translation>Відкрити файл</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml)</translation>
-    </message>
     <message>
         <source>Imported %1</source>
         <translation>%1 імпортована</translation>
@@ -319,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>Вставити закладку</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">Зміна назви</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">Зміна адреси</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation>Панель закладок</translation>
@@ -335,19 +118,6 @@ p, li { white-space: pre-wrap; }
         <source>Bookmarks Menu</source>
         <translation>Меню закладок</translation>
     </message>
-    <message>
-        <source>XBEL (*.xbel *.xml *.html)</source>
-        <translation type="obsolete">XBEL (*.xbel *.xml *.html)</translation>
-    </message>
-    <message>
-        <source>Error when loading html bookmarks: %1
-</source>
-        <translation type="obsolete">Помилка під час завантаження закладки html: %1</translation>
-    </message>
-    <message>
-        <source>XBEL</source>
-        <translation type="obsolete">XBEL</translation>
-    </message>
     <message>
         <source>Name Change</source>
         <comment>Undo bookmark title change</comment>
@@ -370,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>Інструмент запиту htmlToXBel</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>Інструмент htmlToXBel, який поставляється з Arora і потрібний для імпорту закладок у HTML, не встановлено або недоступний в шляхах пошуку.</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>Завантаження закладки</translation>
@@ -383,6 +149,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation>Помилка при завантажені закладок HTML: %1</translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -404,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Закладка</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>Відкрити</translation>
@@ -428,17 +194,9 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation>Додати теку...</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">Закладки</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete"> (Змінити: %1 %2)</translation>
-    </message>
     <message>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
@@ -450,12 +208,8 @@ Do you want to quit anyway?</source>
         <translation>Невдале відновлення</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">Збережений сеанс не буде відновлена, оскільки Arora аварійно завершується при спробі відновити її.</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
-        <translation>Arora зазнала краху протягом відновлення цього сеансу.  Спробувати ще раз?</translation>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -488,14 +242,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>&amp;Експортувати закладки...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>&amp;Попередній перегляд друку...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>&amp;Друк...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>П&amp;риватне переглядання...</translation>
@@ -540,10 +286,6 @@ Do you want to quit anyway?</source>
         <source>Find P&amp;revious</source>
         <translation>&amp;Знайти попереднє</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">&amp;Налаштування...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -560,10 +302,6 @@ Do you want to quit anyway?</source>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -576,18 +314,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Reload Page</source>
         <translation>&amp;Перезавантажити сторінку</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">З&amp;більшити шрифт</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">&amp;Звичайний шрифт</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">З&amp;меншити шрифт</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>&amp;Код сторінки</translation>
@@ -624,10 +350,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Bookmarks</source>
         <translation>&amp;Закладки</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">Впорядкувати закладинки...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>Закласти...</translation>
@@ -658,10 +380,6 @@ Do you want to quit anyway?</source>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>Ввімкнути Web &amp;Inspector</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>&amp;Довідка</translation>
@@ -674,10 +392,6 @@ Do you want to quit anyway?</source>
         <source>About &amp;Qt</source>
         <translation>Про &amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">Про &amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>Навігація</translation>
@@ -706,15 +420,6 @@ Do you want to quit anyway?</source>
         <source>Hide Bookmarks Bar</source>
         <translation>Сховати панель закладок</translation>
     </message>
-    <message>
-        <source>Arora</source>
-        <translation type="obsolete">Arora</translation>
-    </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 — Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>Відкрити ресурс тенет</translation>
@@ -723,32 +428,14 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Ресурс тенет (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>Надрукувати документ</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>Ви впевнені, що бажаєте ввімкнути приватне переглядання?</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Коли приватне переглядання ввімкнене, деякі дії, що стосуються вашої приватності, будуть вимкнені:&lt;ul&gt;&lt;li&gt; Сторінки тенет не додаються до журналу.&lt;/li&gt;&lt;li&gt; Елементи автоматично видаляються з вікна звантажень.&lt;/li&gt;&lt;li&gt; Нові коржики не зберігаються, поточні недоступні.&lt;/li&gt;&lt;li&gt; Піктограми сайтів не зберігаються, сесії не можуть бути збережені.&lt;/li&gt;&lt;li&gt; Пошуки не додаються до виринаючого меню в панелі пошуку.&lt;/li&gt;&lt;/ul&gt;Поки ви не закриєте вікно, можете все ще напискати кнопки &quot;Вперід&quot; та &quot;Назад&quot;, щоб повернутися до відкритих сторінок.</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>Ви впевнені, що бажаєте закрити вікно? Відкрито %1 вкладок</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>Інспектор тенет</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>Інспектор тенет буде працювати правильно лише для сторінок, які завантажені після його вмикання.
-Ви бажаєте перезавантажити всі сторінки?</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>Зупинити завантаження поточної сторінки</translation>
@@ -761,15 +448,6 @@ Do you want to reload all pages?</source>
         <source>Downloads</source>
         <translation>Звантаження</translation>
     </message>
-    <message>
-        <source>Alt+Ctrl+L</source>
-        <comment>Download Manager</comment>
-        <translation type="obsolete">Alt+Ctrl+L</translation>
-    </message>
-    <message>
-        <source>Show &amp;Network Monitor</source>
-        <translation type="obsolete">Показати &amp;монітор мережі</translation>
-    </message>
     <message>
         <source>Close Window</source>
         <translation>Закрити вікно</translation>
@@ -803,10 +481,6 @@ Do you want to reload all pages?</source>
         <comment>About Browser</comment>
         <translation>Про &amp;%1</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Якщо приватний перегляд увімкнено, деякі дії, що стосуються вашої приватності, будуть вимкнені:&lt;ul&gt;&lt;li&gt; Сторінки тенет не додаються до історії.&lt;/li&gt;&lt;li&gt; Елементи автоматично вилучаються з вікна звантажень&lt;/li&gt;&lt;li&gt; Нові куки не зберігаються, до поточних немає доступу.&lt;/li&gt;&lt;li&gt; Піктограми сайтів не зберігатимуться, сесії не будуть збережені.&lt;/li&gt;&lt;li&gt; Пошуки не додані до виринаючого меню в панелі пошуку.&lt;/li&gt;&lt;/ul&gt;Поки не закриєте вікно, ви все ще можете натискати кнопки „Назад“ та „Вперед“, щоб повернутись до сторінок, які ви відкривали.</translation>
-    </message>
     <message>
         <source>Ctrl+Y</source>
         <comment>Download Manager</comment>
@@ -820,10 +494,6 @@ Do you want to reload all pages?</source>
         <source>Text Encoding</source>
         <translation>Кодування тексту</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; Network cache is disabled.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Коли увімкнуто приватне переглядання, деякі дії стосовно вашої приватності будуть вимкнуті:&lt;ul&gt;&lt;li&gt; Сторінки не реєструються в журналі.&lt;/li&gt;&lt;li&gt; Звантаження автоматично вилучатимуться зі списку.&lt;/li&gt;&lt;li&gt; Нові куки не зберігатимуться, поточні куки будуть недоступні.&lt;/li&gt;&lt;li&gt; Піктограми сайтів не зберігатимуться, сеанси також.&lt;/li&gt;&lt;li&gt; Пошуки не додаватимуться до виринного меню в коробці пошуку.&lt;/li&gt;&lt;li&gt; Мережевий кеш буде вимкнено.&lt;/li&gt;&lt;/ul&gt;Допоки не закриті вікна, ви можете продовжувати натискати кнопки Назад і Вперед, щоб повертатись до сторінок, які ви повідкивали.</translation>
-    </message>
     <message>
         <source>Select &amp;All</source>
         <translation>Вибрати в&amp;се</translation>
@@ -832,10 +502,6 @@ Do you want to reload all pages?</source>
         <source>Alt+Ctrl+B</source>
         <translation>Alt+Ctrl+B</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; No new network cache is written to disk.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;Коли увімкнуто приватне переглядання, деякі дії стосовно вашої приватності будуть вимкнуті:&lt;ul&gt;&lt;li&gt; Сторінки не реєструються в журналі.&lt;/li&gt;&lt;li&gt; Звантаження автоматично вилучатимуться зі списку.&lt;/li&gt;&lt;li&gt; Нові куки не зберігатимуться, поточні куки будуть недоступні.&lt;/li&gt;&lt;li&gt; Піктограми сайтів не зберігатимуться, сеанси також.&lt;/li&gt;&lt;li&gt; Пошуки не додаватимуться до виринного меню в коробці пошуку.&lt;/li&gt;&lt;li&gt; Мережевий кеш буде вимкнено.&lt;/li&gt;&lt;/ul&gt;Допоки не закриті вікна, ви можете продовжувати натискати кнопки Назад і Вперед, щоб повертатись до сторінок, які ви повідкривали.</translation>
-    </message>
     <message>
         <source>Options...</source>
         <translation>Варіанти...</translation>
@@ -844,10 +510,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation>Налаштувати рушії пошуку...</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation>&amp;Ad Block...</translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation>Коли приватне переглядання ввімкнуто, деякі дії, стосовно ваших приватних вподобань, буде вимкнуто:</translation>
@@ -860,10 +522,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation>Пункти звантажень автоматично вилучаються з вікна звантажень.</translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation>Нові куки не зберігаються, і їх неможливо дозволити.</translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation>Піктограми сайтів не будуть зберігатись.</translation>
@@ -904,6 +562,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -934,14 +605,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>Журнал п&amp;ошуку</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Куки</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>За&amp;кешовані сторінки</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>&amp;Піктограми сайтів</translation>
@@ -956,1258 +619,364 @@ Do you want to reload all pages?</source>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation>Завантажити</translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation>Завантажити все</translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>Долучити %1 до рекомендаційного списку</translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation>Вилучити з рекомендаційного списку</translation>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Налаштування</translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load Flash</source>
-        <translation>Завантажити Flash</translation>
+        <source>Downloads</source>
+        <translation>Звантаження</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>Сайти, які рекомендовано до списку</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>CookieExceptionsModel</name>
-    <message>
-        <source>Website</source>
-        <translation>Сайт</translation>
-    </message>
-    <message>
-        <source>Rule</source>
-        <translation>Правило</translation>
-    </message>
+    <name>DownloadItem</name>
     <message>
-        <source>Allow</source>
-        <translation>Дозволити</translation>
+        <source>Save File</source>
+        <translation>Зберегти файл</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>Заборонити</translation>
+        <source>Download canceled: %1</source>
+        <translation>Звантаження скасовано: %1</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>Дозволити для сеансу</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">Помилка відкриття вихідного файла: %1</translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>Сайт</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">Помилка збереження: %1</translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>Назва</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">Помилка мережі: %1</translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>Шлях</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>Безпечно</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">%1 з %2 (%3/с) — %4</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>Спливає</translation>
+        <source>Download directory (%1) couldn&apos;t be created.</source>
+        <translation type="vanished">Неможливо створити теку звантаження (%1).</translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>Вміст</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>true</source>
-        <translation>так</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>false</source>
-        <translation>ні</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Session cookie</source>
-        <translation>Сеанс куки</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Куки</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Вилучити</translation>
+        <source>bytes</source>
+        <translation type="obsolete">байт</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>Вилучити &amp;всі куки</translation>
+        <source>kB</source>
+        <translation type="obsolete">кБ</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>Додати &amp;правило</translation>
+        <source>MB</source>
+        <translation type="obsolete">МБ</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Винятки куки</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>Новий виняток</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>Домен:</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>Заборонити</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>Дозволити для сеансу</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>Дозволити</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>Винятки</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Вилучити</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Вилучити &amp;все</translation>
-    </message>
-</context>
-<context>
-    <name>Dialog</name>
-    <message>
-        <source>Dialog</source>
-        <translation type="obsolete">Діалог</translation>
-    </message>
-    <message>
-        <source>Left:</source>
-        <translation type="obsolete">Ліворуч:</translation>
-    </message>
-    <message>
-        <source>Foo Bar Baz Arora LineEdit Manual Test This is the end</source>
-        <translation type="obsolete">Foo Bar Baz Arora LineEdit Manual Test This is the end</translation>
-    </message>
-    <message>
-        <source>Right:</source>
-        <translation type="obsolete">Праворуч:</translation>
-    </message>
-    <message>
-        <source>Empty:</source>
-        <translation type="obsolete">Порожньо:</translation>
-    </message>
-    <message>
-        <source>Foo Bar Baz Arora LineEdit Manual Test</source>
-        <translation type="obsolete">Foo Bar Baz Arora LineEdit Manual Test</translation>
-    </message>
-    <message>
-        <source>Widget</source>
-        <translation type="obsolete">Віджет</translation>
-    </message>
-    <message>
-        <source>Site Icon</source>
-        <translation type="obsolete">Піктограма сайту</translation>
-    </message>
-    <message>
-        <source>RSS</source>
-        <translation type="obsolete">RSS</translation>
-    </message>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">Закладинки</translation>
-    </message>
-    <message>
-        <source>Position</source>
-        <translation type="obsolete">Розміщення</translation>
-    </message>
-    <message>
-        <source>Left</source>
-        <translation type="obsolete">Ліворуч</translation>
-    </message>
-    <message>
-        <source>Right</source>
-        <translation type="obsolete">Праворуч</translation>
-    </message>
-    <message>
-        <source>Add</source>
-        <translation type="obsolete">Додати</translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="obsolete">Вилучити</translation>
-    </message>
-    <message>
-        <source>Swap Visibility</source>
-        <translation type="obsolete">Перемкнути видимість</translation>
-    </message>
-    <message>
-        <source>Add ToolButton</source>
-        <translation type="obsolete">Додати кнопку інструмента</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>Звантаження</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>Очистити</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 пунктів</translation>
-    </message>
-    <message>
-        <source>&amp;OK</source>
-        <translation type="obsolete">&amp;Гаразд</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Форма</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation>Піктограма</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>Назва файла</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>Спробувати знову</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Зупинити</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>Відкрити</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>Зберегти файл</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>Звантаження скасовано: %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>Помилка відкриття вихідного файла: %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>Помилка збереження: %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>Помилка мережі: %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">с</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- залишилась %n хвилина</numerusform>
-            <numerusform>- залишилось %n хвилини</numerusform>
-            <numerusform>- залишилось %n хвилин</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- залишилась %n секунда</numerusform>
-            <numerusform>- залишилось %n секунди</numerusform>
-            <numerusform>- залишилось %n секунд</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 з %2 (%3/с) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 з %2 — Зупинено</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">байт</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="obsolete">кбайт</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="obsolete">Мбайт</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>%1 з %2 (%3/с) — %4</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation>Неможливо створити теку звантаження (%1).</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n звантаження</numerusform>
-            <numerusform>%n звантаження</numerusform>
-            <numerusform>%n звантажень</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>Звантажень в поступі: %1
-Бажаєте вийти попри все?</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>Залишилась %n хвилина</numerusform>
-            <numerusform>Залишилось %n хвилини</numerusform>
-            <numerusform>Залишилась %n хвилин</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>Залишилась %n секунда</numerusform>
-            <numerusform>Залишилось %n секунди</numerusform>
-            <numerusform>Залишилось %n секунд</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>байт</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>кБ</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>МБ</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>ГБ</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>Без помилок</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>Помилка відкриття: %1: Немає такого файла або теки</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>Неможливо прочитати %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>Зміст %1</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 КБ</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>Відкрити</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>Копіювати</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>Вилучити</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>Журнал</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>&amp;Вилучити</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>Вилучити &amp;все</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>Показати всю історію</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>Очистити історію...</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>Очистити історію</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>Ви бажаєте очистити історію?</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>Заголовок</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Адреса</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>Раніше сьогодні</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n елемент</numerusform>
-            <numerusform>%n елемента</numerusform>
-            <numerusform>%n елементів</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation>Ласкаво просимо до Arora!</translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation>Запуск Arora</translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation>Пошук!</translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation>Результати пошуку надаються</translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation>Про Arora</translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>System locale (%1) %2</source>
-        <translation type="obsolete">Системна локаль (%1) %2</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>Вибрати мову</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;Ви можете працювати з іншою мовою,&lt;br&gt;що типово не є системною.&lt;/p&gt;&lt;p&gt;Будь ласка, виберіть мову, яку слід використовувати&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">Не встановлено файли перекладів.</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation>Немає файлів перекладів у %1.</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Введіть ім&apos;я користувача та пароль для &quot;%1&quot; на %2&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;З&apos;єднатись зі проксі &quot;%1&quot;, використовуючи:&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">Помилки SSL:
-
-%1
-
-%2
-
-Ви хочете нехтувати ці помилки?</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">Ви хочете прийняти всі ці сертифікати?</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> — помилки SSL</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Помилки SSL:&lt;br/&gt;&lt;br/&gt;для: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Ви бажаєте нехтувати цими помилками?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certifactes:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="obsolete">&lt;qt&gt;Сертифікати:&lt;br/&gt;%1&lt;br/&gt;Ви хочете прийняти всі ці сертифікати?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;Сертифікати:&lt;br/&gt;%1&lt;br/&gt;Ви бажаєте дозволити всі оці сертифікати?&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>Видавець: %1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>Неправильно перед: %1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>Правильно допоки: %1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>Альтернативні назви:</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">Назва</translation>
-    </message>
-    <message>
-        <source>Value</source>
-        <translation type="obsolete">Значення</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>Network Monitor</source>
-        <translation type="obsolete">Монітор мережі</translation>
-    </message>
-    <message>
-        <source>Network Requests</source>
-        <translation type="obsolete">Запити мережі</translation>
-    </message>
-    <message>
-        <source>Request Headers</source>
-        <translation type="obsolete">Заголовки запитів</translation>
-    </message>
-    <message>
-        <source>Response Headers</source>
-        <translation type="obsolete">Заголовки відповідей</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">&amp;Вилучити</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Requests</source>
-        <translation type="obsolete">Вилучити &amp;всі запити</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation>Відкрити файл</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation>OpenSearch</translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation>Помилка</translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation>%1 — не OpenSearch 1.1 або він вже є у вашому списку.</translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation>Ви змушені мати тут щонайменше один рушій пошуку.</translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>Керування OpenSearch</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>&amp;Відновити до типових</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>В&amp;илучити</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>&amp;Додати</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>&amp;Закрити</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation>&lt;strong&gt;Опис:&lt;/strong&gt; %1</translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation>&lt;strong&gt;Забезпечує контекстові поради&lt;/strong&gt;</translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation>Список відокремлених комами ключових слів, які можна ввести для пошуку термінів з цим рушієм</translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation>Назва</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation>Ключові слова</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation>Ви бажаєте додати такий рушій пошуку до вашого списку?&lt;br /&gt;&lt;br /&gt;Назва: %1&lt;br /&gt;Шукає в: %2</translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>Необхідне засвідчення</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMMY</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Ім&apos;я користувача:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>Не знайдено</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>Засвідчення на проксі</translation>
-    </message>
-    <message>
-        <source>ICON</source>
-        <translation type="obsolete">ICON</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>З&apos;єднання з проксі</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>Ім&apos;я користувача:</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>Це не файл XBEL версії 1.0.</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>Невідомий заголовок</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation>Це не файл OpenSearch 1.1.</translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Redirect: %1</source>
-        <translation type="obsolete">Перенаправлення: %1</translation>
-    </message>
-    <message>
-        <source>Method</source>
-        <translation type="obsolete">Спосіб</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">Адреса</translation>
-    </message>
-    <message>
-        <source>Response</source>
-        <translation type="obsolete">Відповідь</translation>
-    </message>
-    <message>
-        <source>Length</source>
-        <translation type="obsolete">Довжина</translation>
-    </message>
-    <message>
-        <source>Content Type</source>
-        <translation type="obsolete">Тип вмісту</translation>
-    </message>
-    <message>
-        <source>Info</source>
-        <translation type="obsolete">Інформація</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">Форма</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">ТекстоваМітка</translation>
-    </message>
-    <message>
-        <source>&lt;</source>
-        <translation type="obsolete">&lt;</translation>
-    </message>
-    <message>
-        <source>&gt;</source>
-        <translation type="obsolete">&gt;</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>Виконано</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation>Виділити все</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>Пошук</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>Налаштування</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>Загальні</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>При запуску:</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>Показувати мою домашню сторінку</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>Показувати порожню сторінку</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>Відновлювати попередні вікна і вкладки</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>Домашня сторінка:</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>Встановити поточну сторінку</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>Вилучати з журналу:</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>Після однієї доби</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>Після одного тижня</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>Після двох тижнів</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>Після одного місяця</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>Після одного року</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>Вручну</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>При виході з програми</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>Відкривати посилання з програм:</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">У вкладці в поточному вікні</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>У новому вікні</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>Звантаження</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>Запитувати кожного разу, куди зберігати</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>Використовувати це місце:</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>Зовнішній вигляд</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>Звичайний шрифт:</translation>
-    </message>
-    <message>
-        <source>Times 16</source>
-        <translation type="obsolete">Times 16</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>Вибрати...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>Шрифт фіксованої ширини:</translation>
-    </message>
-    <message>
-        <source>Courier 13</source>
-        <translation type="obsolete">Courier 13</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>Приватність</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Зміст тенет</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>Ввімкнути модулі</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>Ввімкнути Javascript</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>Переглянути зображення</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Куки</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>Дозволяти куки:</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>Завжди</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>Ніколи</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>Тільки для сайтів, які ви переглядаєте</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>Винятки...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>Зберігати куки допоки:</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>Вони не застаріють</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>Я не вийду з програми</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>Не більше 90 діб</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Куки...</translation>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n звантаження</numerusform>
+            <numerusform>%n звантаження</numerusform>
+            <numerusform>%n звантажень</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Tabs</source>
-        <translation>Вкладки</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>Звантажень в поступі: %1
+Бажаєте вийти попри все?</translation>
     </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>Вибрати вкладки та вікна щойно вони створені</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>Залишилась %n хвилина</numerusform>
+            <numerusform>Залишилось %n хвилини</numerusform>
+            <numerusform>Залишилась %n хвилин</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">Запитувати перед закриттям багатьох вкладок</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>Залишилась %n секунда</numerusform>
+            <numerusform>Залишилось %n секунди</numerusform>
+            <numerusform>Залишилось %n секунд</numerusform>
+        </translation>
     </message>
     <message>
-        <source>Proxy</source>
-        <translation>Проксі</translation>
+        <source>bytes</source>
+        <translation>байт</translation>
     </message>
     <message>
-        <source>Use proxy server</source>
-        <translation>Використовувати проксі-сервер</translation>
+        <source>kB</source>
+        <translation>кБ</translation>
     </message>
     <message>
-        <source>Type:</source>
-        <translation>Тип:</translation>
+        <source>MB</source>
+        <translation>МБ</translation>
     </message>
     <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
+        <source>GB</source>
+        <translation>ГБ</translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Http</source>
-        <translation type="obsolete">Http</translation>
+        <source>Open</source>
+        <translation>Відкрити</translation>
     </message>
     <message>
-        <source>Host name:</source>
-        <translation>Назва хосту:</translation>
+        <source>Copy</source>
+        <translation>Копіювати</translation>
     </message>
     <message>
-        <source>Port:</source>
-        <translation>Порт:</translation>
+        <source>Delete</source>
+        <translation>Вилучити</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>User Name:</source>
-        <translation>Ім&apos;я користувача:</translation>
+        <source>Show All History</source>
+        <translation>Показати всю історію</translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>Пароль:</translation>
+        <source>Clear History...</source>
+        <translation>Очистити історію...</translation>
     </message>
     <message>
-        <source>Advanced</source>
-        <translation>Додатково</translation>
+        <source>Clear History</source>
+        <translation>Очистити історію</translation>
     </message>
     <message>
-        <source>Style Sheet:</source>
-        <translation>Шаблон стилю:</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>Ви бажаєте очистити історію?</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>Показувати тільки одну кнопку для закривання, замість по одній на кожній вкладці</translation>
+        <source>Title</source>
+        <translation>Заголовок</translation>
     </message>
     <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>Бажана мова для перегляду сторінок тенет у:</translation>
+        <source>Address</source>
+        <translation>Адреса</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Block Popup Windows</source>
-        <translation>Заборонити виринні вікна</translation>
+        <source>Earlier Today</source>
+        <translation>Раніше сьогодні</translation>
     </message>
-    <message>
-        <source>Opening links</source>
-        <translation>Відкриття посилань</translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n елемент</numerusform>
+            <numerusform>%n елемента</numerusform>
+            <numerusform>%n елементів</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>Посилання, які бажаєте відкрити у новому вікні:</translation>
+        <source>Welcome to Endorphin!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>У новій вибраній вкладці поточного вікна</translation>
+        <source>Endorphin Start</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
-        <translation>У новій вкладці поточного вікна</translation>
+        <source>Search!</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
-        <translation>У поточній вкладці</translation>
+        <source>Search the web with</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Secure)</source>
-        <translation>Http (безпечне)</translation>
+        <source>Search results provided by</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation>Http (прозоре)</translation>
+        <source>About Endorphin</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>Використовувати ClickToFlash для модулів Flash</translation>
+        <source>Choose language</source>
+        <translation>Вибрати мову</translation>
     </message>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>Фільтр відстежування кук</translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;Ви можете працювати з іншою мовою,&lt;br&gt;що типово не є системною.&lt;/p&gt;&lt;p&gt;Будь ласка, виберіть мову, яку слід використовувати&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>Запитувати перед закриттям багатьох вкладок і вікон</translation>
+        <source>No translation files are installed at %1.</source>
+        <translation>Немає файлів перекладів у %1.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>Вимкнути програму, коли остання вкладка закрита</translation>
+        <source>Open File</source>
+        <translation>Відкрити файл</translation>
     </message>
     <message>
-        <source>Enable network cache</source>
-        <translation>Увімкнути мережевий кеш</translation>
+        <source>OpenSearch</source>
+        <translation>OpenSearch</translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
-        <translation>Максимальний розмір:</translation>
+        <source>Error</source>
+        <translation>Помилка</translation>
     </message>
     <message>
-        <source> MB</source>
-        <translation>МБ</translation>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
+        <translation>%1 — не OpenSearch 1.1 або він вже є у вашому списку.</translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>Використовувати типовий рушій пошуку для помилкових посилань, котрі вводить користувач</translation>
+        <source>You must have at least one search engine in here.</source>
+        <translation>Ви змушені мати тут щонайменше один рушій пошуку.</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source>Choose Directory...</source>
-        <translation>Вибрати теку...</translation>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
+        <translation>&lt;strong&gt;Опис:&lt;/strong&gt; %1</translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation>Сеанс куки закінчився:</translation>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
+        <translation>&lt;strong&gt;Забезпечує контекстові поради&lt;/strong&gt;</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
-        <translation>Коли я виходжу з програми</translation>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
+        <translation>Список відокремлених комами ключових слів, які можна ввести для пошуку термінів з цим рушієм</translation>
     </message>
     <message>
-        <source>1 day</source>
-        <translation>1 день</translation>
+        <source>Name</source>
+        <translation>Назва</translation>
     </message>
     <message>
-        <source>2 days</source>
-        <translation>2 дні</translation>
+        <source>Keywords</source>
+        <translation>Ключові слова</translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>3 days</source>
-        <translation>3 дні</translation>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
+        <translation>Ви бажаєте додати такий рушій пошуку до вашого списку?&lt;br /&gt;&lt;br /&gt;Назва: %1&lt;br /&gt;Шукає в: %2</translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>7 days</source>
-        <translation>7 днів</translation>
+        <source>Allow</source>
+        <translation type="unfinished">Дозволити</translation>
     </message>
     <message>
-        <source>30 days</source>
-        <translation>30 днів</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>AutoFill</source>
-        <translation>Автоматичне заповнення</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation>Автоматичне заповнення форм у тенетах:</translation>
+        <source>Not Found</source>
+        <translation>Не знайдено</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>User names and passwords</source>
-        <translation>Псевдоніми і паролі користувача</translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>Це не файл XBEL версії 1.0.</translation>
     </message>
     <message>
-        <source>Edit...</source>
-        <translation>Правка...</translation>
+        <source>Unknown title</source>
+        <translation>Невідомий заголовок</translation>
     </message>
     <message>
-        <source>Browse...</source>
-        <translation>Огляд...</translation>
+        <source>The file is not an OpenSearch 1.1 file.</source>
+        <translation>Це не файл OpenSearch 1.1.</translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Persistent Data Storage</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>SettingsDialog</name>
+    <name>SavePageDialog</name>
     <message>
-        <source>Restart required</source>
-        <translation>Потрібно перезапустити</translation>
+        <source>Save Page As</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>Налаштування мережевого кеша змінено. Але переглядач потрібно перезапустити, щоб налаштування набрали чинності.</translation>
+        <source>Search</source>
+        <translation>Пошук</translation>
     </message>
+</context>
+<context>
+    <name>SettingsDialog</name>
     <message>
         <source>Choose Directory</source>
         <translation>Вибрати теку</translation>
@@ -2235,18 +1004,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation>&amp;Знайти</translation>
     </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">Код сторінки</translation>
-    </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">&amp;Переглянути</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">&amp;Перенести рядки</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>Код сторінки %1</translation>
@@ -2262,10 +1019,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Hide Tab Bar</source>
         <translation>Сховати панель вкладок</translation>
     </message>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">Нова &amp;вкладка</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>Дублювати вкладку</translation>
@@ -2313,18 +1066,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Untitled</source>
         <translation>Без назви</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>Ви справді бажаєте закрити цю сторінку?</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>Ви змінили цю сторінку і коли закриєте її, втратите зміни.
-Ви справді бажаєте закрити цю сторінку?
-</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation>Ctrl-]</translation>
@@ -2341,10 +1082,6 @@ Do you really want to close this page?
         <source>Loading...</source>
         <translation>Завантажується...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>Завантажується %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>Завантаження закінчилось</translation>
@@ -2357,6 +1094,10 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation>Закласти всі вкладки</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2376,14 +1117,6 @@ Do you really want to close this page?
         <source>Suggestions</source>
         <translation>Поради</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>Додати &apos;%1&apos;</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">Налаштувати рушії пошуку...</translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2404,37 +1137,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>Помилка під час завантаження сторінки: %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>Коли з&apos;єднуємся з: %1.</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>Перевірте адресу на помилки такі, як &lt;b&gt;ww&lt;/b&gt;.arora-browser.org замість &lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>Якщо ваш комп&apos;ютер або мережа захищена вогняною стінкою(firewall) або проксі, впевніться, що переглядачеві дозволений доступ до мережі.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>Якщо адреса правильна, спробуйте перевірити з&apos;єднання з мережею.</translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation>Повторне передавання запиту POST</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>Для того, щоб показати сайт, запит всіх даних потрібно відправити ще раз, що може призвести до несподіваної поведінки сайта, наприклад, ті самі дії виконаються ще раз.Бажаєте продовжити попри все?</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2485,38 +1187,6 @@ Do you really want to close this page?
         <source>Search with...</source>
         <translation>Шукати з...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>Додати до панелі інструментів пошуку</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>Спосіб не підтримується</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>Спосіб %1 не підтримується.</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>Рушій пошуку</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>Вибрати потрібний рушій пошуку</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>Назва рушія</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>Введіть назву для рушія</translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation>Заборонити зображення</translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
@@ -2525,11 +1195,4 @@ Do you really want to close this page?
         <translation>Не знайдено</translation>
     </message>
 </context>
-<context>
-    <name>tst_SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation type="obsolete">Пошук</translation>
-    </message>
-</context>
 </TS>
diff --git a/src/locale/zh_CN.ts b/src/locale/zh_CN.ts
index cf414a89..14274492 100644
--- a/src/locale/zh_CN.ts
+++ b/src/locale/zh_CN.ts
@@ -3,10 +3,6 @@
 <TS version="2.1" language="zh_CN">
 <context>
     <name>AboutDialog</name>
-    <message>
-        <source>About</source>
-        <translation type="obsolete">关于</translation>
-    </message>
     <message>
         <source>Authors</source>
         <translation>作者</translation>
@@ -15,129 +11,10 @@
         <source>License</source>
         <translation>许可证</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>轻快的浏览器-基于Webkit</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>关闭</translation>
-    </message>
     <message>
         <source>About %1</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="unfinished">移除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished">规则</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -145,10 +22,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>添加书签</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>请输入书签名，并选择保存位置</translation>
-    </message>
     <message>
         <source>Url</source>
         <translation type="unfinished"></translation>
@@ -162,47 +35,6 @@ p, li { white-space: pre-wrap; }
         <translation type="unfinished">添加文件夹</translation>
     </message>
 </context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>BookmarksDialog</name>
     <message>
@@ -221,18 +53,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>新建文件夹</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>书签</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>移除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>添加文件夹</translation>
-    </message>
     <message>
         <source>Edit Name</source>
         <translation type="unfinished"></translation>
@@ -290,14 +110,6 @@ p, li { white-space: pre-wrap; }
         <source>Insert Bookmark</source>
         <translation>插入书签</translation>
     </message>
-    <message>
-        <source>Name Change</source>
-        <translation type="obsolete">名字变更</translation>
-    </message>
-    <message>
-        <source>Address Change</source>
-        <translation type="obsolete">地址变更</translation>
-    </message>
     <message>
         <source>Bookmarks Bar</source>
         <translation type="unfinished"></translation>
@@ -328,10 +140,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation type="unfinished"></translation>
@@ -341,6 +149,10 @@ p, li { white-space: pre-wrap; }
 </source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -362,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmark</source>
-        <translation type="obsolete">书签</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation type="unfinished">打开</translation>
@@ -386,17 +194,9 @@ p, li { white-space: pre-wrap; }
         <source>Add Folder...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">书签</translation>
-    </message>
 </context>
 <context>
     <name>BrowserApplication</name>
-    <message>
-        <source> (Change: %1 %2)</source>
-        <translation type="obsolete">(变更： %1 %2)</translation>
-    </message>
     <message>
         <source>There are %1 windows and %2 tabs open
 Do you want to quit anyway?</source>
@@ -408,11 +208,7 @@ Do you want to quit anyway?</source>
         <translation>恢复失败</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">保存的会话不会恢复，因为Arora在尝试恢复该会话时已崩溃。</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -446,14 +242,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>导出书签(&amp;E)...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>打印预览(&amp;P)...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>打印(&amp;P)...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>隐私浏览(&amp;B)...</translation>
@@ -498,10 +286,6 @@ Do you want to quit anyway?</source>
         <source>Find P&amp;revious</source>
         <translation>查找前一个(&amp;r)</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">选项(&amp;r)...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation></translation>
@@ -530,18 +314,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Reload Page</source>
         <translation>重新加载页面(&amp;R)</translation>
     </message>
-    <message>
-        <source>Make Text &amp;Bigger</source>
-        <translation type="obsolete">字体放大(&amp;B)</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Normal</source>
-        <translation type="obsolete">普通字体(&amp;N)</translation>
-    </message>
-    <message>
-        <source>Make Text &amp;Smaller</source>
-        <translation type="obsolete">字体缩小(&amp;S)</translation>
-    </message>
     <message>
         <source>Page S&amp;ource</source>
         <translation>页面源码(&amp;o)</translation>
@@ -578,10 +350,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Bookmarks</source>
         <translation>标签(&amp;B)</translation>
     </message>
-    <message>
-        <source>Manage Bookmarks...</source>
-        <translation type="obsolete">管理标签...</translation>
-    </message>
     <message>
         <source>Add Bookmark...</source>
         <translation>添加标签...</translation>
@@ -612,10 +380,6 @@ Do you want to quit anyway?</source>
         <comment>Clear Private Data</comment>
         <translation></translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>允许Web &amp;Inspector</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>帮助(&amp;H)</translation>
@@ -628,10 +392,6 @@ Do you want to quit anyway?</source>
         <source>About &amp;Qt</source>
         <translation>关于&amp;Qt</translation>
     </message>
-    <message>
-        <source>About &amp;Arora</source>
-        <translation type="obsolete">关于&amp;Arora</translation>
-    </message>
     <message>
         <source>Navigation</source>
         <translation>导航</translation>
@@ -660,11 +420,6 @@ Do you want to quit anyway?</source>
         <source>Hide Bookmarks Bar</source>
         <translation>隐藏标签栏</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>打开Web资源</translation>
@@ -673,32 +428,14 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>Web资源 (*.html *.htm *.svg *.png *.gif *.svgz);;所有文件 (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>打印文档</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>是否确认打开隐私浏览？</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not addded to the pop-up menu in the search box.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;当开启隐私浏览时，关于你的某些隐私动作不会被记录：&lt;ul&gt;&lt;li&gt; 页面不会被添加到历史中。&lt;/li&gt;&lt;li&gt;下载项会自动从下载窗口移除。 &lt;/li&gt;&lt;li&gt; 新的cookies不会被存储，当前的cookies也不会被访问。&lt;/li&gt;&lt;li&gt;站点图标不会被存储，会话也不会被保存。 &lt;/li&gt;&lt;li&gt;搜索动作不会被添加到搜索框的弹出菜单中。&lt;/li&gt;&lt;/ul&gt;在关闭窗口之前，你可以一直通过点击后退和前进按钮来浏览已打开过的页面。</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>是否确认关闭窗口？还有%1个标签打开着</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>web inspector只在页面被允许且被加载后才能正常运行。
-希望重新加载所有页面吗？</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>停止加载当前页面</translation>
@@ -773,10 +510,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -789,10 +522,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -833,6 +562,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -863,14 +605,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>搜索历史(&amp;S)</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>缓存的页面(&amp;a)</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>网站图标(&amp;I)</translation>
@@ -885,1074 +619,339 @@ Do you want to reload all pages?</source>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
-    <message>
-        <source>Load</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Load All</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add %1 to Whitelist</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove from Whitelist</source>
-        <translation type="unfinished"></translation>
-    </message>
+    <name>DownloadDialog</name>
     <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <source>Downloads</source>
+        <translation>下载</translation>
     </message>
     <message>
-        <source>Load Flash</source>
+        <source>Downloading %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ClickToFlashSettings</name>
+    <name>DownloadItem</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation type="unfinished"></translation>
+        <source>Save File</source>
+        <translation>保存文件</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>网站</translation>
+        <source>Download canceled: %1</source>
+        <translation>下载取消： %1</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>规则</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">打开输出文件出错： %1</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>允许</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">保存出错： %1</translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>阻挡</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">网络出错： %1</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>会话中允许</translation>
+        <source>?</source>
+        <translation></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>网站</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>名字</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>路径</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>安全</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>失效</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Contents</source>
-        <translation>内容</translation>
+        <source>bytes</source>
+        <translation type="obsolete">字节</translation>
     </message>
-    <message>
-        <source>true</source>
-        <translation></translation>
+</context>
+<context>
+    <name>DownloadManager</name>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n 下载</numerusform>
+        </translation>
     </message>
     <message>
-        <source>false</source>
-        <translation></translation>
+        <source>bytes</source>
+        <translation type="unfinished">字节</translation>
     </message>
     <message>
-        <source>Session cookie</source>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
-    <message>
-        <source>Cookies</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>移除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>移除所有Cookies(&amp;A)</translation>
-    </message>
-    <message>
-        <source>Add &amp;Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>CookiesExceptionsDialog</name>
-    <message>
-        <source>Cookie Exceptions</source>
-        <translation>Cookie例外</translation>
-    </message>
-    <message>
-        <source>New Exception</source>
-        <translation>新建例外</translation>
-    </message>
-    <message>
-        <source>Domain:</source>
-        <translation>域：</translation>
-    </message>
-    <message>
-        <source>Block</source>
-        <translation>阻挡</translation>
-    </message>
-    <message>
-        <source>Allow For Session</source>
-        <translation>会话中允许</translation>
-    </message>
-    <message>
-        <source>Allow</source>
-        <translation>允许</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>例外</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>移除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>移除所有(&amp;A)</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>下载</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>清除</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0项</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">表单</translation>
-    </message>
-    <message>
-        <source>Ico</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>文件名</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>重新尝试</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>停止</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>打开</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>保存文件</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>下载取消： %1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>打开输出文件出错： %1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>保存出错： %1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>网络出错： %1</translation>
-    </message>
-    <message>
-        <source>seconds</source>
-        <translation type="obsolete">秒</translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n minutes remaining</source>
-        <translation type="obsolete">
-            <numerusform>- 还有 %n 分钟</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>- %n seconds remaining</source>
-        <translation type="obsolete">
-            <numerusform>- 还有 %n 秒</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) %4</source>
-        <translation type="obsolete">%1 of %2 (%3/秒) %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">%1 of %2 - 停止</translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="obsolete">字节</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n 下载</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation type="unfinished">字节</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>打开</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>复制</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>删除</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>历史</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>移除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>移除所有(&amp;A)</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>显示所有历史</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>清除历史...</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>清除历史</translation>
-    </message>
-    <message>
-        <source>Do you want to clear the history?</source>
-        <translation>希望清除历史吗？</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryModel</name>
-    <message>
-        <source>Title</source>
-        <translation>标题</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>地址</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryTreeModel</name>
-    <message>
-        <source>Earlier Today</source>
-        <translation>早些时候</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n item(s)</source>
-        <translation>
-            <numerusform>%n 项</numerusform>
-        </translation>
-    </message>
-</context>
-<context>
-    <name>JavaScriptAroraObject</name>
-    <message>
-        <source>Welcome to Arora!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Arora Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search results provided by</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>About Arora</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search the web with</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>LanguageManager</name>
-    <message>
-        <source>Default</source>
-        <translation type="obsolete">缺省</translation>
-    </message>
-    <message>
-        <source>Choose language</source>
-        <translation>选择语言</translation>
-    </message>
-    <message>
-        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
-        <translation>&lt;p&gt;你可以运行在其它语言环境下&lt;br&gt;而不采用操作系统所缺省的语言环境&lt;/p&gt;&lt;p&gt;请选择应该使用的语言环境&lt;/p&gt;</translation>
-    </message>
-    <message>
-        <source>No translation files are installed at %1.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;为 &quot;%1&quot; 在 %2 输入用户名和密码&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;连接到代理 &quot;%1&quot; 使用：&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>SSL Errors:
-
-%1
-
-%2
-
-Do you want to ignore these errors?</source>
-        <translation type="obsolete">SSL 错误：%1%2希望忽略该错误吗？</translation>
-    </message>
-    <message>
-        <source>Do you want to accept all these certificates?</source>
-        <translation type="obsolete">确认接受所有证书吗？</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitor</name>
-    <message>
-        <source>Name</source>
-        <translation type="obsolete">名字</translation>
-    </message>
-</context>
-<context>
-    <name>NetworkMonitorDialog</name>
-    <message>
-        <source>&amp;Remove</source>
-        <translation type="obsolete">移除(&amp;R)</translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchDialog</name>
-    <message>
-        <source>Open File</source>
-        <translation type="unfinished">打开文件</translation>
-    </message>
-    <message>
-        <source>OpenSearch</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>You must have at least one search engine in here.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchEngineModel</name>
-    <message>
-        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Name</source>
-        <translation type="unfinished">名字</translation>
-    </message>
-    <message>
-        <source>Keywords</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>OpenSearchManager</name>
-    <message>
-        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>PasswordDialog</name>
-    <message>
-        <source>Authentication Required</source>
-        <translation>需要验证</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>用户名：</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>密码：</translation>
-    </message>
-</context>
-<context>
-    <name>PlainTextEditSearch</name>
-    <message>
-        <source>Not Found</source>
-        <translation>未找到</translation>
-    </message>
-</context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>代理验证</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>连接到代理</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>用户名：</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>密码：</translation>
-    </message>
-</context>
-<context>
-    <name>QObject</name>
-    <message>
-        <source>The file is not an XBEL version 1.0 file.</source>
-        <translation>该文件不是版本为1.0的XBEL文件</translation>
-    </message>
-    <message>
-        <source>Unknown title</source>
-        <translation>未知文件</translation>
-    </message>
-    <message>
-        <source>The file is not an OpenSearch 1.1 file.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>RequestModel</name>
-    <message>
-        <source>Address</source>
-        <translation type="obsolete">地址</translation>
-    </message>
-</context>
-<context>
-    <name>SearchBanner</name>
-    <message>
-        <source>Form</source>
-        <translation type="obsolete">表单</translation>
-    </message>
-    <message>
-        <source>TextLabel</source>
-        <translation type="obsolete">文本标签</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>完成</translation>
-    </message>
-    <message>
-        <source>Highlight All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>搜索</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>选项</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>常规</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>启动时：</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>显示我的主页</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>显示空白页</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>恢复最后一次的窗口和标签</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>主页：</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>设置为当前页面</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>移除历史项：</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>一天后</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>一周后</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>两周后</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>一个月后</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>一年后</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>手工</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>应用退出</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>从应用程序打开链接：</translation>
-    </message>
-    <message>
-        <source>In a tab in the current window</source>
-        <translation type="obsolete">在当前窗口的标签中</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>在新窗口中</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>下载</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>每次均询问目的地</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>使用该目的地：</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>外观</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>标准字体：</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>选择...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>定宽字体：</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>隐私</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>Web内容</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>允许插件</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>允许Javascript</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>查看图片</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation></translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>接受Cookies：</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>总是</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>从不</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>只允许从浏览过的站点</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>例外...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>保持Cookies直到：</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>它们失效</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>退出应用程序</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>最多90天</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation></translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Tabs</source>
-        <translation>标签</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>在标签和窗口被创建后选择它们</translation>
+        <source>kB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs</source>
-        <translation type="obsolete">关闭多个标签时进行确认</translation>
+        <source>MB</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Proxy</source>
-        <translation>代理</translation>
+        <source>GB</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>HistoryDialog</name>
     <message>
-        <source>Use proxy server</source>
-        <translation>使用代理服务器</translation>
+        <source>Open</source>
+        <translation>打开</translation>
     </message>
     <message>
-        <source>Type:</source>
-        <translation>类型：</translation>
+        <source>Copy</source>
+        <translation>复制</translation>
     </message>
     <message>
-        <source>Socks5</source>
-        <translation></translation>
+        <source>Delete</source>
+        <translation>删除</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Host name:</source>
-        <translation>主机名：</translation>
+        <source>Show All History</source>
+        <translation>显示所有历史</translation>
     </message>
     <message>
-        <source>Port:</source>
-        <translation>端口：</translation>
+        <source>Clear History...</source>
+        <translation>清除历史...</translation>
     </message>
     <message>
-        <source>User Name:</source>
-        <translation>用户名：</translation>
+        <source>Clear History</source>
+        <translation>清除历史</translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>密码：</translation>
+        <source>Do you want to clear the history?</source>
+        <translation>希望清除历史吗？</translation>
     </message>
+</context>
+<context>
+    <name>HistoryModel</name>
     <message>
-        <source>Advanced</source>
-        <translation>高级</translation>
+        <source>Title</source>
+        <translation>标题</translation>
     </message>
     <message>
-        <source>Style Sheet:</source>
-        <translation>样式表：</translation>
+        <source>Address</source>
+        <translation>地址</translation>
     </message>
+</context>
+<context>
+    <name>HistoryTreeModel</name>
     <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>只显示一个关闭按钮，而不是在每个标签上都显示一个关闭按钮</translation>
+        <source>Earlier Today</source>
+        <translation>早些时候</translation>
     </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation type="unfinished"></translation>
+    <message numerus="yes">
+        <source>%n item(s)</source>
+        <translation>
+            <numerusform>%n 项</numerusform>
+        </translation>
     </message>
+</context>
+<context>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Block Popup Windows</source>
+        <source>Welcome to Endorphin!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Opening links</source>
+        <source>Endorphin Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Links that want to open in a new window:</source>
+        <source>Search!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new selected tab in the current window</source>
+        <source>Search the web with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In a new tab in the current window</source>
+        <source>Search results provided by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>In the current tab</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>LanguageManager</name>
     <message>
-        <source>Http (Secure)</source>
-        <translation type="unfinished"></translation>
+        <source>Choose language</source>
+        <translation>选择语言</translation>
     </message>
     <message>
-        <source>Http (Transparent)</source>
-        <translation type="unfinished"></translation>
+        <source>&lt;p&gt;You can run with a different language than&lt;br&gt;the operating system default.&lt;/p&gt;&lt;p&gt;Please choose the language which should be used&lt;/p&gt;</source>
+        <translation>&lt;p&gt;你可以运行在其它语言环境下&lt;br&gt;而不采用操作系统所缺省的语言环境&lt;/p&gt;&lt;p&gt;请选择应该使用的语言环境&lt;/p&gt;</translation>
     </message>
     <message>
-        <source>Use ClickToFlash on flash plugins</source>
+        <source>No translation files are installed at %1.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchDialog</name>
     <message>
-        <source>Filter Tracking Cookies</source>
-        <translation type="unfinished"></translation>
+        <source>Open File</source>
+        <translation type="unfinished">打开文件</translation>
     </message>
     <message>
-        <source>Confirm when closing multiple tabs or windows</source>
+        <source>OpenSearch</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Quit the application when last tab is closed</source>
+        <source>Error</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable network cache</source>
+        <source>%1 is not a valid OpenSearch 1.1 description or is already on your list.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Maximum Size:</source>
+        <source>You must have at least one search engine in here.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchEngineModel</name>
     <message>
-        <source> MB</source>
+        <source>&lt;strong&gt;Description:&lt;/strong&gt; %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
+        <source>&lt;strong&gt;Provides contextual suggestions&lt;/strong&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Directory...</source>
+        <source>Comma-separated list of keywords that may be entered in the location barfollowed by search terms to search with this engine</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>A cookie session ends:</source>
-        <translation type="unfinished"></translation>
+        <source>Name</source>
+        <translation type="unfinished">名字</translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>Keywords</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>OpenSearchManager</name>
     <message>
-        <source>1 day</source>
+        <source>Do you want to add the following engine to your list of search engines?&lt;br /&gt;&lt;br /&gt;Name: %1&lt;br /&gt;Searches on: %2</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PermissionBar</name>
     <message>
-        <source>2 days</source>
-        <translation type="unfinished"></translation>
+        <source>Allow</source>
+        <translation type="unfinished">允许</translation>
     </message>
     <message>
-        <source>3 days</source>
+        <source>Deny</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7 days</source>
+        <source>%1 wants to %2.</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>PlainTextEditSearch</name>
     <message>
-        <source>30 days</source>
-        <translation type="unfinished"></translation>
+        <source>Not Found</source>
+        <translation>未找到</translation>
     </message>
+</context>
+<context>
+    <name>QObject</name>
     <message>
-        <source>AutoFill</source>
-        <translation type="unfinished"></translation>
+        <source>The file is not an XBEL version 1.0 file.</source>
+        <translation>该文件不是版本为1.0的XBEL文件</translation>
     </message>
     <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
+        <source>Unknown title</source>
+        <translation>未知文件</translation>
     </message>
     <message>
-        <source>User names and passwords</source>
+        <source>The file is not an OpenSearch 1.1 file.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Edit...</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Browse...</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Enable access keys</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Use this external download program:</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Choose Program...</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Minimum Font size:</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>搜索</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -1980,18 +979,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation>查找(&amp;F)</translation>
     </message>
-    <message>
-        <source>Source of Page </source>
-        <translation type="obsolete">页面源码</translation>
-    </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">查看(&amp;V)</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">折叠行(&amp;W)</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation type="unfinished"></translation>
@@ -2007,10 +994,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Hide Tab Bar</source>
         <translation>隐藏标签栏</translation>
     </message>
-    <message>
-        <source>New &amp;Tab</source>
-        <translation type="obsolete">新标签页(&amp;T)</translation>
-    </message>
     <message>
         <source>Duplicate Tab</source>
         <translation>复制标签</translation>
@@ -2058,16 +1041,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Untitled</source>
         <translation>无标题</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>确认关闭该页面？</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>页面已被修改，如果关闭，将丢失所有修改。确认关闭该页面？</translation>
-    </message>
     <message>
         <source>Ctrl-]</source>
         <translation type="unfinished"></translation>
@@ -2084,10 +1057,6 @@ Do you really want to close this page?
         <source>Loading...</source>
         <translation type="unfinished">加载...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation type="unfinished"></translation>
@@ -2100,6 +1069,10 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2119,10 +1092,6 @@ Do you really want to close this page?
         <source>Suggestions</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>UserAgentMenu</name>
@@ -2143,45 +1112,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>加载页面出错： %1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>当连接至：%1</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.trolltech.com instead of &lt;b&gt;www&lt;/b&gt;.trolltech.com.</source>
-        <translation type="obsolete">检查地址是否错误，比如输入的是 &lt;b&gt;ww&lt;/b&gt;.trolltech.com 而不是 &lt;b&gt;www&lt;/b&gt;.trolltech.com.</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try to check the network connection.</source>
-        <translation type="obsolete">如果地址正确，那么请检查网络是否连接。</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>如果计算机或网络被防火墙或代理所保护，请确认浏览器被允许访问网络。</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Resending POST request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2232,38 +1162,6 @@ Do you really want to close this page?
         <source>Search with...</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locale/zh_TW.ts b/src/locale/zh_TW.ts
index 54c79020..52f8b936 100644
--- a/src/locale/zh_TW.ts
+++ b/src/locale/zh_TW.ts
@@ -15,141 +15,6 @@
         <source>License</source>
         <translation>授權書</translation>
     </message>
-    <message>
-        <source>Lightweight WebKit-based web browser</source>
-        <translation>基於 WebKit 的輕量級瀏覽器</translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="vanished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;版權所有 © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</source>
-        <translation>&lt;a href=&quot;http://arora-browser.org&quot;&gt;http://arora-browser.org&lt;/a&gt;</translation>
-    </message>
-    <message>
-        <source>Close</source>
-        <translation>關閉</translation>
-    </message>
-    <message>
-        <source>WebKit version: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Copyright © 2007-2010 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished">&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot;font-size:9pt;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;版權所有 © 2007-2009 Aaron Dewes &amp;lt;&lt;a href=&quot;mailto:aaron.dewes@web.de&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;aaron.dewes@web.de&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt; {3C?} {4.0/?} {3.?} {40/?} {1&quot;?} {9p?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {2007-2010 ?} {0057a?}</translation>
-    </message>
-</context>
-<context>
-    <name>AcceptLanguage</name>
-    <message>
-        <source>Languages</source>
-        <translation>語言</translation>
-    </message>
-    <message>
-        <source>Languages: in order of preference:</source>
-        <translation>語言：偏好順序：</translation>
-    </message>
-    <message>
-        <source>Move &amp;Up</source>
-        <translation>移上(&amp;U)</translation>
-    </message>
-    <message>
-        <source>Move &amp;Down</source>
-        <translation>移下(&amp;D)</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>移除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Add...</source>
-        <translation>加入...</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockBlockedNetworkReply</name>
-    <message>
-        <source>Blocked by AdBlockRule: %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Add Custom Rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Learn more about writing rules...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse Subscriptions...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove Subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AdBlock Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable AdBlock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Action</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockManager</name>
-    <message>
-        <source>Custom Rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockModel</name>
-    <message>
-        <source>Rule</source>
-        <translation type="unfinished">規則</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSchemeAccessHandler</name>
-    <message>
-        <source>Subscribe?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Subscribe to this AdBlock subscription?
-%1</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AddBookmarkDialog</name>
@@ -169,51 +34,6 @@ p, li { white-space: pre-wrap; }
         <source>Add Bookmark</source>
         <translation>加入書籤</translation>
     </message>
-    <message>
-        <source>Type a name for the bookmark, and choose where to keep it.</source>
-        <translation>輸入書籤的名稱，或是選擇它要放在那裡。</translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillDialog</name>
-    <message>
-        <source>Form Passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove</source>
-        <translation type="unfinished">移除</translation>
-    </message>
-    <message>
-        <source>Remove All</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillManager</name>
-    <message>
-        <source>Never for this site</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Not now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&lt;b&gt;Would you like to save this password?&lt;/b&gt;&lt;br&gt;         To review passwords you have saved and remove them, open the AutoFill panel of preferences.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AutoFillModel</name>
-    <message>
-        <source>WebSite</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User Name</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>BookmarksDialog</name>
@@ -241,18 +61,6 @@ p, li { white-space: pre-wrap; }
         <source>New Folder</source>
         <translation>新增資料夾</translation>
     </message>
-    <message>
-        <source>Bookmarks</source>
-        <translation>書籤</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>移除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Add Folder</source>
-        <translation>加入資料夾</translation>
-    </message>
 </context>
 <context>
     <name>BookmarksManager</name>
@@ -294,10 +102,6 @@ p, li { white-space: pre-wrap; }
         <source>htmlToXBel tool required</source>
         <translation>需要 htmlToXBel 工具</translation>
     </message>
-    <message>
-        <source>htmlToXBel tool, which is shipped with Arora and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
-        <translation>htmlToXBel 工具，附於 Arora 中，用作匯入 HTML 書籤，但是卻沒有安裝或是在路徑中找不到。</translation>
-    </message>
     <message>
         <source>Loading Bookmark</source>
         <translation>正在載入書籤</translation>
@@ -345,6 +149,10 @@ p, li { white-space: pre-wrap; }
         <comment>Undo bookmark url change</comment>
         <translation>網址變更</translation>
     </message>
+    <message>
+        <source>htmlToXBel tool, which is shipped with Endorphin and is needed to import HTML bookmarks, is not installed or not available in the search paths.</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>BookmarksMenu</name>
@@ -366,10 +174,6 @@ p, li { white-space: pre-wrap; }
 </context>
 <context>
     <name>BookmarksToolBar</name>
-    <message>
-        <source>Bookmarks</source>
-        <translation type="obsolete">書籤</translation>
-    </message>
     <message>
         <source>Open</source>
         <translation>開啟</translation>
@@ -404,11 +208,7 @@ Do you want to quit anyway?</source>
         <translation>回復失敗</translation>
     </message>
     <message>
-        <source>The saved session will not be restored because Arora crashed while trying to restore this session.</source>
-        <translation type="obsolete">已儲存的階段不能回復；因為當 Arora 嘗試回復該階段時發生錯誤。</translation>
-    </message>
-    <message>
-        <source>Arora crashed while trying to restore this session.  Should I try again?</source>
+        <source>Endorphin crashed while trying to restore this session.  Should I try again?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -446,14 +246,6 @@ Do you want to quit anyway?</source>
         <source>&amp;Export Bookmarks...</source>
         <translation>匯出書籤(&amp;E)...</translation>
     </message>
-    <message>
-        <source>P&amp;rint Preview...</source>
-        <translation>預覽列印(&amp;R)...</translation>
-    </message>
-    <message>
-        <source>&amp;Print...</source>
-        <translation>列印(&amp;P)...</translation>
-    </message>
     <message>
         <source>Private &amp;Browsing...</source>
         <translation>私密瀏覽(&amp;B)...</translation>
@@ -502,10 +294,6 @@ Do you want to quit anyway?</source>
         <source>Find P&amp;revious</source>
         <translation>找上一個(&amp;R)</translation>
     </message>
-    <message>
-        <source>Prefere&amp;nces...</source>
-        <translation type="obsolete">偏好設定(&amp;N)...</translation>
-    </message>
     <message>
         <source>Ctrl+,</source>
         <translation>Ctrl+,</translation>
@@ -518,10 +306,6 @@ Do you want to quit anyway?</source>
         <source>Ctrl+|</source>
         <translation>Ctrl+|</translation>
     </message>
-    <message>
-        <source>Shift+Ctrl+B</source>
-        <translation type="obsolete">Shift+Ctrl+B</translation>
-    </message>
     <message>
         <source>Ctrl+/</source>
         <translation>Ctrl+/</translation>
@@ -632,10 +416,6 @@ Do you want to quit anyway?</source>
         <comment>Clear Private Data</comment>
         <translation>Ctrl+Shift+Delete</translation>
     </message>
-    <message>
-        <source>Enable Web &amp;Inspector</source>
-        <translation>啟用網頁檢閱器(&amp;I)</translation>
-    </message>
     <message>
         <source>&amp;Help</source>
         <translation>說明(&amp;H)</translation>
@@ -681,11 +461,6 @@ Do you want to quit anyway?</source>
         <source>Hide Bookmarks Bar</source>
         <translation>隱藏書籤列</translation>
     </message>
-    <message>
-        <source>%1 - Arora</source>
-        <comment>Page title and Browser name</comment>
-        <translation>%1 - Arora</translation>
-    </message>
     <message>
         <source>Open Web Resource</source>
         <translation>開啟網頁資源</translation>
@@ -694,32 +469,14 @@ Do you want to quit anyway?</source>
         <source>Web Resources (*.html *.htm *.svg *.png *.gif *.svgz);;All files (*.*)</source>
         <translation>開啟網頁資源 (*.html *.htm *.svg *.png *.gif *.svgz);;所有檔案 (*.*)</translation>
     </message>
-    <message>
-        <source>Print Document</source>
-        <translation>列印文件</translation>
-    </message>
     <message>
         <source>Are you sure you want to turn on private browsing?</source>
         <translation>您確定要啟用私密瀏覽？</translation>
     </message>
-    <message>
-        <source>&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;When private browsing is turned on, some actions concerning your privacy will be disabled:&lt;ul&gt;&lt;li&gt; Webpages are not added to the history.&lt;/li&gt;&lt;li&gt; Items are automatically removed from the Downloads window.&lt;/li&gt;&lt;li&gt; New cookies are not stored, current cookies can&apos;t be accessed.&lt;/li&gt;&lt;li&gt; Site icons won&apos;t be stored, session won&apos;t be saved.&lt;/li&gt;&lt;li&gt; Searches are not added to the pop-up menu in the search box.&lt;/li&gt;&lt;li&gt; Network cache is disabled.&lt;/li&gt;&lt;/ul&gt;Until you close the window, you can still click the Back and Forward buttons to return to the webpages you have opened.</source>
-        <translation type="obsolete">&lt;b&gt;%1&lt;/b&gt;&lt;br&gt;&lt;br&gt;當啟用私密瀏覽後，一些關於私隱的功能將會被停用：&lt;ul&gt;&lt;li&gt; 網頁不會加入歷史記錄中。&lt;/li&gt;&lt;li&gt; 項目會自動從下載視窗中移除。&lt;/li&gt;&lt;li&gt; 不會儲存新的 cookie，亦不會存取目前的 cookie。&lt;/li&gt;&lt;li&gt; 網站的圖示不會儲存，階段不會儲存。&lt;/li&gt;&lt;li&gt;搜尋不會加入到搜尋方塊中的彈出式選單。&lt;/li&gt;&lt;li&gt; 網路快取已被停用。&lt;/li&gt;&lt;/ul&gt;當你關閉視窗時，您仍可按上一頁及下一頁來回到您剛才開啟的網頁。</translation>
-    </message>
     <message>
         <source>Are you sure you want to close the window?  There are %1 tabs open</source>
         <translation>您確定要關閉視窗？還有 %1 個分頁正在開啟</translation>
     </message>
-    <message>
-        <source>Web Inspector</source>
-        <translation>網頁檢閱器</translation>
-    </message>
-    <message>
-        <source>The web inspector will only work correctly for pages that were loaded after enabling.
-Do you want to reload all pages?</source>
-        <translation>網頁檢閱器只會在啟用後載入的網頁才會生效。
-您要重新載入全部網頁嗎？</translation>
-    </message>
     <message>
         <source>Stop loading the current page</source>
         <translation>停止載入目前的網頁</translation>
@@ -753,10 +510,6 @@ Do you want to reload all pages?</source>
         <source>Configure Search Engines...</source>
         <translation type="unfinished">設定搜索引擎</translation>
     </message>
-    <message>
-        <source>&amp;Ad Block...</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>When private browsing is turned on, some actions concerning your privacy will be disabled:</source>
         <translation type="unfinished"></translation>
@@ -769,10 +522,6 @@ Do you want to reload all pages?</source>
         <source>Items are automatically removed from the Downloads window.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>New cookies are not stored, current cookies can&apos;t be accessed.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Site icons won&apos;t be stored.</source>
         <translation type="unfinished"></translation>
@@ -813,6 +562,19 @@ Do you want to reload all pages?</source>
         <source>Reload</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>%1 - Endorphin</source>
+        <comment>Page title and Browser name</comment>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>P&amp;rint Preview...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Print...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ClearButton</name>
@@ -843,14 +605,6 @@ Do you want to reload all pages?</source>
         <source>&amp;Search History</source>
         <translation>搜尋記錄(&amp;S)</translation>
     </message>
-    <message>
-        <source>&amp;Cookies</source>
-        <translation>&amp;Cookie</translation>
-    </message>
-    <message>
-        <source>C&amp;ached Web Pages</source>
-        <translation>網頁快取(&amp;A)</translation>
-    </message>
     <message>
         <source>Website &amp;Icons</source>
         <translation>網站圖示(&amp;I)</translation>
@@ -865,351 +619,150 @@ Do you want to reload all pages?</source>
     </message>
 </context>
 <context>
-    <name>ClickToFlash</name>
+    <name>DownloadDialog</name>
     <message>
-        <source>Load</source>
-        <translation>載入</translation>
+        <source>Downloads</source>
+        <translation>下載</translation>
     </message>
     <message>
-        <source>Load All</source>
-        <translation>全部載入</translation>
+        <source>Downloading %1</source>
+        <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>DownloadItem</name>
     <message>
-        <source>Add %1 to Whitelist</source>
-        <translation>加入 %1 至白名單</translation>
+        <source>Save File</source>
+        <translation>儲存檔案</translation>
     </message>
     <message>
-        <source>Remove from Whitelist</source>
-        <translation>從白名單中移除</translation>
+        <source>Download canceled: %1</source>
+        <translation>下載已取消：%1</translation>
     </message>
     <message>
-        <source>Settings</source>
-        <translation>設定</translation>
+        <source>Error opening output file: %1</source>
+        <translation type="vanished">開啟輸出檔案時發生錯誤：%1</translation>
     </message>
     <message>
-        <source>Load Flash</source>
-        <translation>載入 Flash</translation>
+        <source>Error saving: %1</source>
+        <translation type="vanished">儲存時發生錯誤：%1</translation>
     </message>
-</context>
-<context>
-    <name>ClickToFlashSettings</name>
     <message>
-        <source>Whitelist sites</source>
-        <translation>白名單網站</translation>
+        <source>Network Error: %1</source>
+        <translation type="vanished">網路錯誤：%1</translation>
     </message>
-</context>
-<context>
-    <name>CookieExceptionsModel</name>
     <message>
-        <source>Website</source>
-        <translation>網站</translation>
+        <source>%1 of %2 (%3/sec) - %4</source>
+        <translation type="vanished">已下載%1，共有 %2（%3/秒） - %4</translation>
     </message>
     <message>
-        <source>Rule</source>
-        <translation>規則</translation>
+        <source>?</source>
+        <translation>?</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>允許</translation>
+        <source>seconds</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Block</source>
-        <translation>禁止</translation>
+        <source>minutes</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>在此階段中允許</translation>
+        <source>- %4 %5 remaining</source>
+        <translation type="unfinished"></translation>
     </message>
-</context>
-<context>
-    <name>CookieModel</name>
     <message>
-        <source>Website</source>
-        <translation>網站</translation>
+        <source>%1 of %2 (%3/sec) %4</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Name</source>
-        <translation>名稱</translation>
+        <source>%1 of %2 - Stopped</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Path</source>
-        <translation>路徑</translation>
+        <source>bytes</source>
+        <translation type="obsolete">bytes</translation>
     </message>
     <message>
-        <source>Secure</source>
-        <translation>安全</translation>
+        <source>kB</source>
+        <translation type="obsolete">kB</translation>
     </message>
     <message>
-        <source>Expires</source>
-        <translation>有效期限</translation>
+        <source>MB</source>
+        <translation type="obsolete">MB</translation>
     </message>
+</context>
+<context>
+    <name>DownloadManager</name>
     <message>
-        <source>Contents</source>
-        <translation>內容</translation>
+        <source>There are %1 downloads in progress
+Do you want to quit anyway?</source>
+        <translation>還在 %1 個下載正在進行中
+您還是要離開嗎？</translation>
     </message>
-    <message>
-        <source>true</source>
-        <translation>是</translation>
+    <message numerus="yes">
+        <source>%n Download(s)</source>
+        <translation>
+            <numerusform>%n 個下載</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>false</source>
-        <translation>否</translation>
+    <message numerus="yes">
+        <source>%n minutes remaining</source>
+        <translation>
+            <numerusform>還剩餘 %n 分鐘</numerusform>
+        </translation>
     </message>
-    <message>
-        <source>Session cookie</source>
-        <translation>階段 cookie</translation>
+    <message numerus="yes">
+        <source>%n seconds remaining</source>
+        <translation>
+            <numerusform>還剩餘 %n 秒</numerusform>
+        </translation>
     </message>
-</context>
-<context>
-    <name>CookiesDialog</name>
     <message>
-        <source>Cookies</source>
-        <translation>Cookie</translation>
+        <source>bytes</source>
+        <translation>bytes</translation>
     </message>
     <message>
-        <source>&amp;Remove</source>
-        <translation>移除(&amp;R)</translation>
+        <source>kB</source>
+        <translation>kB</translation>
     </message>
     <message>
-        <source>Remove &amp;All Cookies</source>
-        <translation>移除所有 Cookie (&amp;A)</translation>
+        <source>MB</source>
+        <translation>MB</translation>
     </message>
     <message>
-        <source>Add &amp;Rule</source>
-        <translation>加入規則(&amp;R)</translation>
+        <source>GB</source>
+        <translation>GB</translation>
     </message>
 </context>
 <context>
-    <name>CookiesExceptionsDialog</name>
+    <name>HistoryDialog</name>
     <message>
-        <source>Cookie Exceptions</source>
-        <translation>Cookie 例外</translation>
+        <source>Open</source>
+        <translation>開啟</translation>
     </message>
     <message>
-        <source>New Exception</source>
-        <translation>新增例外</translation>
+        <source>Copy</source>
+        <translation>複製</translation>
     </message>
     <message>
-        <source>Domain:</source>
-        <translation>網域：</translation>
+        <source>Delete</source>
+        <translation>刪除</translation>
     </message>
+</context>
+<context>
+    <name>HistoryMenu</name>
     <message>
-        <source>Block</source>
-        <translation>禁止</translation>
+        <source>Show All History</source>
+        <translation>顯示所有歷史記錄</translation>
     </message>
     <message>
-        <source>Allow For Session</source>
-        <translation>在此階段中允許</translation>
+        <source>Clear History...</source>
+        <translation>清除歷史記錄...</translation>
     </message>
     <message>
-        <source>Allow</source>
-        <translation>允許</translation>
-    </message>
-    <message>
-        <source>Exceptions</source>
-        <translation>例外</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>移除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>全部移除(&amp;A)</translation>
-    </message>
-</context>
-<context>
-    <name>DownloadDialog</name>
-    <message>
-        <source>Downloads</source>
-        <translation>下載</translation>
-    </message>
-    <message>
-        <source>Clean up</source>
-        <translation>清除</translation>
-    </message>
-    <message>
-        <source>0 Items</source>
-        <translation>0 個項目</translation>
-    </message>
-    <message>
-        <source>Downloading %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadItem</name>
-    <message>
-        <source>Ico</source>
-        <translation>Ico</translation>
-    </message>
-    <message>
-        <source>Filename</source>
-        <translation>檔案名稱</translation>
-    </message>
-    <message>
-        <source>Try Again</source>
-        <translation>再試</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>停止</translation>
-    </message>
-    <message>
-        <source>Open</source>
-        <translation>開啟</translation>
-    </message>
-    <message>
-        <source>Save File</source>
-        <translation>儲存檔案</translation>
-    </message>
-    <message>
-        <source>Download canceled: %1</source>
-        <translation>下載已取消：%1</translation>
-    </message>
-    <message>
-        <source>Error opening output file: %1</source>
-        <translation>開啟輸出檔案時發生錯誤：%1</translation>
-    </message>
-    <message>
-        <source>Error saving: %1</source>
-        <translation>儲存時發生錯誤：%1</translation>
-    </message>
-    <message>
-        <source>Network Error: %1</source>
-        <translation>網路錯誤：%1</translation>
-    </message>
-    <message>
-        <source>%1 of %2 (%3/sec) - %4</source>
-        <translation>已下載%1，共有 %2（%3/秒） - %4</translation>
-    </message>
-    <message>
-        <source>?</source>
-        <translation>?</translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Stopped</source>
-        <translation type="vanished">已下載%1，共有 %2 - 已停止</translation>
-    </message>
-    <message>
-        <source>Download directory (%1) couldn&apos;t be created.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 of %2 - Download Complete</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>DownloadManager</name>
-    <message>
-        <source>There are %1 downloads in progress
-Do you want to quit anyway?</source>
-        <translation>還在 %1 個下載正在進行中
-您還是要離開嗎？</translation>
-    </message>
-    <message numerus="yes">
-        <source>%n Download(s)</source>
-        <translation>
-            <numerusform>%n 個下載</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>還剩餘 %n 分鐘</numerusform>
-        </translation>
-    </message>
-    <message numerus="yes">
-        <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>還剩餘 %n 秒</numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>bytes</source>
-        <translation>bytes</translation>
-    </message>
-    <message>
-        <source>kB</source>
-        <translation>kB</translation>
-    </message>
-    <message>
-        <source>MB</source>
-        <translation>MB</translation>
-    </message>
-    <message>
-        <source>GB</source>
-        <translation>GB</translation>
-    </message>
-</context>
-<context>
-    <name>FileAccessReply</name>
-    <message>
-        <source>No Error</source>
-        <translation>沒有錯誤</translation>
-    </message>
-    <message>
-        <source>Error opening: %1: No such file or directory</source>
-        <translation>開啟錯誤：%1：沒有該檔案或目錄</translation>
-    </message>
-    <message>
-        <source>Unable to read %1</source>
-        <translation>無法讀取 %1</translation>
-    </message>
-    <message>
-        <source>Contents of %1</source>
-        <translation>%1 的內容</translation>
-    </message>
-    <message>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <source>Show Hidden Files</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>HistoryDialog</name>
-    <message>
-        <source>Open</source>
-        <translation>開啟</translation>
-    </message>
-    <message>
-        <source>Copy</source>
-        <translation>複製</translation>
-    </message>
-    <message>
-        <source>Delete</source>
-        <translation>刪除</translation>
-    </message>
-    <message>
-        <source>History</source>
-        <translation>歷史記錄</translation>
-    </message>
-    <message>
-        <source>&amp;Remove</source>
-        <translation>移除(&amp;R)</translation>
-    </message>
-    <message>
-        <source>Remove &amp;All</source>
-        <translation>全部移除(&amp;A)</translation>
-    </message>
-</context>
-<context>
-    <name>HistoryMenu</name>
-    <message>
-        <source>Show All History</source>
-        <translation>顯示所有歷史記錄</translation>
-    </message>
-    <message>
-        <source>Clear History...</source>
-        <translation>清除歷史記錄...</translation>
-    </message>
-    <message>
-        <source>Clear History</source>
-        <translation>清除歷史記錄</translation>
+        <source>Clear History</source>
+        <translation>清除歷史記錄</translation>
     </message>
     <message>
         <source>Do you want to clear the history?</source>
@@ -1241,13 +794,13 @@ Do you want to quit anyway?</source>
     </message>
 </context>
 <context>
-    <name>JavaScriptAroraObject</name>
+    <name>JavaScriptEndorphinObject</name>
     <message>
-        <source>Welcome to Arora!</source>
+        <source>Welcome to Endorphin!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Arora Start</source>
+        <source>Endorphin Start</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1255,24 +808,20 @@ Do you want to quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search results provided by</source>
+        <source>Search the web with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>About Arora</source>
+        <source>Search results provided by</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Search the web with</source>
+        <source>About Endorphin</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>LanguageManager</name>
-    <message>
-        <source>No translation files are installed.</source>
-        <translation type="obsolete">沒有安裝任何翻譯檔。</translation>
-    </message>
     <message>
         <source>Choose language</source>
         <translation>選擇語言</translation>
@@ -1286,49 +835,6 @@ Do you want to quit anyway?</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>NetworkAccessManager</name>
-    <message>
-        <source>&lt;qt&gt;Enter username and password for &quot;%1&quot; at %2&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;於%2 輸入“%1”的使用者名稱及密碼&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Connect to proxy &quot;%1&quot; using:&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;連接代理伺服器“%1”使用：&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>Issuer: %1</source>
-        <translation>簽發者：%1</translation>
-    </message>
-    <message>
-        <source>Not valid before: %1</source>
-        <translation>在此日期前無效：%1</translation>
-    </message>
-    <message>
-        <source>Valid until: %1</source>
-        <translation>有效期至：%1</translation>
-    </message>
-    <message>
-        <source>Alternate Names:</source>
-        <translation>其它名稱：</translation>
-    </message>
-    <message>
-        <source> - SSL Errors</source>
-        <translation> - SSL 錯誤</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;SSL Errors:&lt;br/&gt;&lt;br/&gt;for: &lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-Do you want to ignore these errors?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;SSL 錯誤：&lt;br/&gt;&lt;br/&gt;因為：&lt;tt&gt;%1&lt;/tt&gt;&lt;ul&gt;&lt;li&gt;%2&lt;/li&gt;&lt;/ul&gt;
-
-您要忽略此錯誤嗎？&lt;/qt&gt;</translation>
-    </message>
-    <message>
-        <source>&lt;qt&gt;Certificates:&lt;br/&gt;%1&lt;br/&gt;Do you want to accept all these certificates?&lt;/qt&gt;</source>
-        <translation>&lt;qt&gt;憑證：&lt;br/&gt;%1&lt;br/&gt;您要接受全部憑證？&lt;/qt&gt;</translation>
-    </message>
-</context>
 <context>
     <name>OpenSearchDialog</name>
     <message>
@@ -1351,26 +857,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>You must have at least one search engine in here.</source>
         <translation>在這裡最少要有一個搜索引擎。</translation>
     </message>
-    <message>
-        <source>OpenSearch Manager</source>
-        <translation>OpenSearch 管理員</translation>
-    </message>
-    <message>
-        <source>&amp;Add</source>
-        <translation>加入(&amp;A)</translation>
-    </message>
-    <message>
-        <source>&amp;Delete</source>
-        <translation>刪除(&amp;D)</translation>
-    </message>
-    <message>
-        <source>&amp;Restore Defaults</source>
-        <translation>回復預設(&amp;R)</translation>
-    </message>
-    <message>
-        <source>&amp;Close</source>
-        <translation>關閉(&amp;C)</translation>
-    </message>
 </context>
 <context>
     <name>OpenSearchEngineModel</name>
@@ -1403,26 +889,18 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
     </message>
 </context>
 <context>
-    <name>PasswordDialog</name>
+    <name>PermissionBar</name>
     <message>
-        <source>Authentication Required</source>
-        <translation>需要認證</translation>
-    </message>
-    <message>
-        <source>DUMMY ICON</source>
-        <translation>DUMMY ICON</translation>
-    </message>
-    <message>
-        <source>INTRO TEXT DUMMY</source>
-        <translation>INTRO TEXT DUMM</translation>
+        <source>Allow</source>
+        <translation type="unfinished">允許</translation>
     </message>
     <message>
-        <source>Username:</source>
-        <translation>使用者名稱：</translation>
+        <source>Deny</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Password:</source>
-        <translation>密碼：</translation>
+        <source>%1 wants to %2.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1432,25 +910,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <translation>找不到</translation>
     </message>
 </context>
-<context>
-    <name>ProxyDialog</name>
-    <message>
-        <source>Proxy Authentication</source>
-        <translation>代理伺服器認證</translation>
-    </message>
-    <message>
-        <source>Connect to proxy</source>
-        <translation>連接代理伺服器</translation>
-    </message>
-    <message>
-        <source>Username:</source>
-        <translation>使用者名稱：</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>密碼：</translation>
-    </message>
-</context>
 <context>
     <name>QObject</name>
     <message>
@@ -1465,398 +924,47 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>The file is not an OpenSearch 1.1 file.</source>
         <translation>檔案不是 OpenSearch 1.1 檔案。</translation>
     </message>
-</context>
-<context>
-    <name>SearchBanner</name>
     <message>
-        <source>Highlight All</source>
-        <translation>全部標示</translation>
-    </message>
-    <message>
-        <source>Done</source>
-        <translation>完成</translation>
-    </message>
-</context>
-<context>
-    <name>SearchLineEdit</name>
-    <message>
-        <source>Search</source>
-        <translation>搜尋</translation>
-    </message>
-</context>
-<context>
-    <name>Settings</name>
-    <message>
-        <source>Preferences</source>
-        <translation>偏好設定</translation>
-    </message>
-    <message>
-        <source>General</source>
-        <translation>一般</translation>
-    </message>
-    <message>
-        <source>On startup:</source>
-        <translation>於啟動時：</translation>
-    </message>
-    <message>
-        <source>Show my home page</source>
-        <translation>顯示我的首頁</translation>
-    </message>
-    <message>
-        <source>Show a blank page</source>
-        <translation>顯示空白頁</translation>
-    </message>
-    <message>
-        <source>Restore windows and tabs from last time</source>
-        <translation>回復上次的視窗及分頁</translation>
-    </message>
-    <message>
-        <source>Home Page:</source>
-        <translation>首頁：</translation>
-    </message>
-    <message>
-        <source>Set to current page</source>
-        <translation>設定為目前的網頁</translation>
-    </message>
-    <message>
-        <source>Remove history items:</source>
-        <translation>移除歷史記錄項目：</translation>
-    </message>
-    <message>
-        <source>After one day</source>
-        <translation>一天後</translation>
-    </message>
-    <message>
-        <source>After one week</source>
-        <translation>一星期後</translation>
-    </message>
-    <message>
-        <source>After two weeks</source>
-        <translation>兩星期後</translation>
-    </message>
-    <message>
-        <source>After one month</source>
-        <translation>一個月後</translation>
-    </message>
-    <message>
-        <source>After one year</source>
-        <translation>一年後</translation>
-    </message>
-    <message>
-        <source>Manually</source>
-        <translation>手動</translation>
-    </message>
-    <message>
-        <source>On application exit</source>
-        <translation>程式離開時</translation>
-    </message>
-    <message>
-        <source>Use the default search engine as fallback when the URL given by the user is invalid</source>
-        <translation>當使用者輸入的網址無效時，以預設的搜索引擎作為後備</translation>
-    </message>
-    <message>
-        <source>Downloads</source>
-        <translation>下載</translation>
-    </message>
-    <message>
-        <source>Ask for a destination each time</source>
-        <translation>每次都詢問目的地</translation>
-    </message>
-    <message>
-        <source>Use this destination:</source>
-        <translation>使用此目的地</translation>
-    </message>
-    <message>
-        <source>Appearance</source>
-        <translation>顯示</translation>
-    </message>
-    <message>
-        <source>Standard font:</source>
-        <translation>標準字型：</translation>
-    </message>
-    <message>
-        <source>Select...</source>
-        <translation>選擇...</translation>
-    </message>
-    <message>
-        <source>Fixed-width font:</source>
-        <translation>固定寬度字型：</translation>
-    </message>
-    <message>
-        <source>Preferred languages for viewing webpages in:</source>
-        <translation>在網頁中偏好使用的語言：</translation>
-    </message>
-    <message>
-        <source>Privacy</source>
-        <translation>私隱</translation>
-    </message>
-    <message>
-        <source>Web Content</source>
-        <translation>網頁內容</translation>
-    </message>
-    <message>
-        <source>Block Popup Windows</source>
-        <translation>禁止彈出式視窗</translation>
-    </message>
-    <message>
-        <source>Enable Plugins</source>
-        <translation>啟用外掛程式</translation>
-    </message>
-    <message>
-        <source>Use ClickToFlash on flash plugins</source>
-        <translation>在 Flash 加上「載入 flash」按鈕</translation>
-    </message>
-    <message>
-        <source>Enable Javascript</source>
-        <translation>啟用 Javascript</translation>
-    </message>
-    <message>
-        <source>View Images</source>
-        <translation>顯示圖片</translation>
-    </message>
-    <message>
-        <source>Cookies</source>
-        <translation>Cookie</translation>
-    </message>
-    <message>
-        <source>Accept Cookies:</source>
-        <translation>接受 Cookie</translation>
-    </message>
-    <message>
-        <source>Always</source>
-        <translation>總是</translation>
-    </message>
-    <message>
-        <source>Never</source>
-        <translation>永不</translation>
-    </message>
-    <message>
-        <source>Only from sites you navigate to</source>
-        <translation>只有您瀏覽過的網站</translation>
-    </message>
-    <message>
-        <source>Exceptions...</source>
-        <translation>例外...</translation>
-    </message>
-    <message>
-        <source>Keep Cookies Until:</source>
-        <translation>保留 Cookie 直至：</translation>
-    </message>
-    <message>
-        <source>They expire</source>
-        <translation>它們過期</translation>
-    </message>
-    <message>
-        <source>I exit the application</source>
-        <translation>我離開程式</translation>
-    </message>
-    <message>
-        <source>At most 90 days</source>
-        <translation>最多 90 日</translation>
-    </message>
-    <message>
-        <source>Cookies...</source>
-        <translation>Cookie...</translation>
-    </message>
-    <message>
-        <source>Filter Tracking Cookies</source>
-        <translation>過濾追蹤 Cookie</translation>
-    </message>
-    <message>
-        <source>Tabs</source>
-        <translation>分頁</translation>
-    </message>
-    <message>
-        <source>Select tabs and windows as they are created</source>
-        <translation>當分頁及視窗建立後才選擇它們</translation>
-    </message>
-    <message>
-        <source>Confirm when closing multiple tabs or windows</source>
-        <translation>關閉多個分頁或視窗時需要確認</translation>
-    </message>
-    <message>
-        <source>Show only one close button instead of one for each tab</source>
-        <translation>只顯示一個關閉按鈕，而非每個分頁都顯示</translation>
-    </message>
-    <message>
-        <source>Quit the application when last tab is closed</source>
-        <translation>關閉最後一個分頁時離開程式</translation>
-    </message>
-    <message>
-        <source>Opening links</source>
-        <translation>開啟連結</translation>
-    </message>
-    <message>
-        <source>Links that want to open in a new window:</source>
-        <translation>要在新的視窗中開啟的連結：</translation>
-    </message>
-    <message>
-        <source>In a new window</source>
-        <translation>在新的視窗</translation>
-    </message>
-    <message>
-        <source>In a new selected tab in the current window</source>
-        <translation>在目前視窗中已選的分頁</translation>
-    </message>
-    <message>
-        <source>In a new tab in the current window</source>
-        <translation>在目前視窗中新的分頁</translation>
-    </message>
-    <message>
-        <source>In the current tab</source>
-        <translation>在目前的分頁</translation>
-    </message>
-    <message>
-        <source>Open links from applications:</source>
-        <translation>以其它程式開啟連結：</translation>
-    </message>
-    <message>
-        <source>Proxy</source>
-        <translation>代理伺服器</translation>
-    </message>
-    <message>
-        <source>Use proxy server</source>
-        <translation>使用代理伺服器</translation>
-    </message>
-    <message>
-        <source>Type:</source>
-        <translation>類型：</translation>
-    </message>
-    <message>
-        <source>Socks5</source>
-        <translation>Socks5</translation>
-    </message>
-    <message>
-        <source>Http (Secure)</source>
-        <translation>Http（安全）</translation>
-    </message>
-    <message>
-        <source>Http (Transparent)</source>
-        <translation>Http（透明）</translation>
-    </message>
-    <message>
-        <source>Host name:</source>
-        <translation>主機名稱：</translation>
-    </message>
-    <message>
-        <source>Port:</source>
-        <translation>連接埠：</translation>
-    </message>
-    <message>
-        <source>User Name:</source>
-        <translation>使用者名稱：</translation>
-    </message>
-    <message>
-        <source>Password:</source>
-        <translation>密碼：</translation>
-    </message>
-    <message>
-        <source>Advanced</source>
-        <translation>進階</translation>
-    </message>
-    <message>
-        <source>Style Sheet:</source>
-        <translation>樣式表：</translation>
-    </message>
-    <message>
-        <source>Enable network cache</source>
-        <translation>啟用網路快取</translation>
-    </message>
-    <message>
-        <source>Maximum Size:</source>
-        <translation>大小上限：</translation>
-    </message>
-    <message>
-        <source> MB</source>
-        <translation> MB</translation>
-    </message>
-    <message>
-        <source>Choose Directory...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>A cookie session ends:</source>
+        <source>use desktop notifications</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>When I exit the application</source>
+        <source>use your position</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>1 day</source>
+        <source>use your microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>2 days</source>
+        <source>use your camera</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>3 days</source>
+        <source>use your camera and microphone</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>7 days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>30 days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AutoFill</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>AutoFill web forms:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>User names and passwords</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Edit...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Browse...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable access keys</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use this external download program:</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Choose Program...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Minimum Font size:</source>
+        <source>lock your mouse</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SavePageDialog</name>
     <message>
-        <source>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </source>
+        <source>Save Page As</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>SearchLineEdit</name>
     <message>
-        <source>Persistent Data Storage</source>
-        <translation type="unfinished"></translation>
+        <source>Search</source>
+        <translation>搜尋</translation>
     </message>
 </context>
 <context>
     <name>SettingsDialog</name>
-    <message>
-        <source>Restart required</source>
-        <translation>須要重新啟動</translation>
-    </message>
-    <message>
-        <source>The network cache configuration has changed. So that it can be taken into account, the browser has to be restarted.</source>
-        <translation>網路快取設定已經修改。瀏覽器需要重新啟動才能使其生效。</translation>
-    </message>
     <message>
         <source>Choose Directory</source>
         <translation type="unfinished"></translation>
@@ -1884,14 +992,6 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>&amp;Find</source>
         <translation>尋找(&amp;F)</translation>
     </message>
-    <message>
-        <source>&amp;View</source>
-        <translation type="obsolete">檢視(&amp;V)</translation>
-    </message>
-    <message>
-        <source>&amp;Wrap lines</source>
-        <translation type="obsolete">自動斷行</translation>
-    </message>
     <message>
         <source>Source of Page %1</source>
         <translation>%1 的原始碼</translation>
@@ -1938,25 +1038,10 @@ Do you want to ignore these errors?&lt;/qt&gt;</source>
         <source>Saved Tabs</source>
         <translation>儲存分頁</translation>
     </message>
-    <message>
-        <source>Do you really want to close this page?</source>
-        <translation>您真的要關閉此網頁嗎？</translation>
-    </message>
-    <message>
-        <source>You have modified this page and when closing it you would lose the modification.
-Do you really want to close this page?
-</source>
-        <translation>您已經修改此網頁及如果關閉它將會失去所有已作的修改。
-您真的要關閉此網頁？</translation>
-    </message>
     <message>
         <source>Loading...</source>
         <translation>正在載入...</translation>
     </message>
-    <message>
-        <source>Loading %1% (%2 %3)...</source>
-        <translation>正在載入  %1% (%2 %3)...</translation>
-    </message>
     <message>
         <source>Finished loading</source>
         <translation>載入完成</translation>
@@ -1997,6 +1082,10 @@ Do you really want to close this page?
         <source>Bookmark All Tabs</source>
         <translation>將所有分頁加入書籤</translation>
     </message>
+    <message>
+        <source>Loading ...</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>ToolbarSearch</name>
@@ -2004,14 +1093,6 @@ Do you really want to close this page?
         <source>Suggestions</source>
         <translation>建議</translation>
     </message>
-    <message>
-        <source>Add &apos;%1&apos;</source>
-        <translation>加入‘%1’</translation>
-    </message>
-    <message>
-        <source>Configure Search Engines...</source>
-        <translation type="obsolete">設定搜索引擎</translation>
-    </message>
     <message>
         <source>Clear Recent Searches</source>
         <translation>清除最近搜尋</translation>
@@ -2044,37 +1125,6 @@ Do you really want to close this page?
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebPage</name>
-    <message>
-        <source>Resending POST request</source>
-        <translation>再送出 POST 要求</translation>
-    </message>
-    <message>
-        <source>In order to display the site, the request along with all the data must be sent once again, which may lead to some unexpected behaviour of the site e.g. the same action might be performed once again. Do you want to continue anyway?</source>
-        <translation>要顯示此網站，所有的請求都要重新送出，這可能會導致一些無法預料的行為，例如某些會再做一次。您要繼續嗎？</translation>
-    </message>
-    <message>
-        <source>Error loading page: %1</source>
-        <translation>載入網頁發生錯誤：%1</translation>
-    </message>
-    <message>
-        <source>When connecting to: %1.</source>
-        <translation>當連線到：%1。</translation>
-    </message>
-    <message>
-        <source>Check the address for errors such as &lt;b&gt;ww&lt;/b&gt;.arora-browser.org instead of &lt;b&gt;www&lt;/b&gt;.arora-browser.org</source>
-        <translation>檢查網址錯誤，例如是&lt;b&gt;ww&lt;/b&gt;.arora-browser.org，而不是&lt;b&gt;www&lt;/b&gt;.arora-browser.org</translation>
-    </message>
-    <message>
-        <source>If the address is correct, try checking the network connection.</source>
-        <translation>如果網址正確，請檢查網路連線。</translation>
-    </message>
-    <message>
-        <source>If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network.</source>
-        <translation>如果您的電腦受防火牆或代理伺服器保護，請確定您的瀏覽器允許存取網路。</translation>
-    </message>
-</context>
 <context>
     <name>WebView</name>
     <message>
@@ -2121,42 +1171,10 @@ Do you really want to close this page?
         <source>Search with...</source>
         <translation>搜尋於...</translation>
     </message>
-    <message>
-        <source>Add to the toolbar search</source>
-        <translation>加入至工具列搜尋</translation>
-    </message>
-    <message>
-        <source>Method not supported</source>
-        <translation>方法不支援</translation>
-    </message>
-    <message>
-        <source>%1 method is not supported.</source>
-        <translation>% 的方法不支援。</translation>
-    </message>
-    <message>
-        <source>Search engine</source>
-        <translation>搜索引擎</translation>
-    </message>
-    <message>
-        <source>Choose the desired search engine</source>
-        <translation>選擇搜索引擎</translation>
-    </message>
-    <message>
-        <source>Engine name</source>
-        <translation>引擎名稱</translation>
-    </message>
-    <message>
-        <source>Type in a name for the engine</source>
-        <translation>輸入搜索引擎的名稱</translation>
-    </message>
     <message>
         <source>Loading...</source>
         <translation>正在載入...</translation>
     </message>
-    <message>
-        <source>Block Image</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>WebViewSearch</name>
diff --git a/src/locationbar/locationbar.cpp b/src/locationbar/locationbar.cpp
index d422f906..88dc05ab 100644
--- a/src/locationbar/locationbar.cpp
+++ b/src/locationbar/locationbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,19 +26,21 @@
 #include "searchlineedit.h"
 #include "webview.h"
 
-#include <qdrag.h>
-#include <qevent.h>
-#include <qpainter.h>
-#include <qstyleoption.h>
+#include <QDrag>
+#include <QEvent>
+#include <QPainter>
+#include <QStyleOption>
 #include <QMimeData>
 
-#include <qdebug.h>
+#include <QDebug>
+
+bool LocationBar::s_firstSelectAll = false;
 
 LocationBar::LocationBar(QWidget *parent)
     : LineEdit(parent)
-    , m_webView(0)
-    , m_siteIcon(0)
-    , m_privacyIndicator(0)
+    , m_webView(nullptr)
+    , m_siteIcon(nullptr)
+    , m_privacyIndicator(nullptr)
 {
     // Urls are always LeftToRight
     setLayoutDirection(Qt::LeftToRight);
@@ -62,6 +64,7 @@ LocationBar::LocationBar(QWidget *parent)
 
     updateTextMargins();
     setUpdatesEnabled(true);
+    LocationBar::resetFirstSelectAll();
 }
 
 void LocationBar::setWebView(WebView *webView)
@@ -84,14 +87,14 @@ void LocationBar::webViewUrlChanged(const QUrl &url)
 {
     if (hasFocus())
         return;
-    if(!url.toString().startsWith(QString("qrc:/"))) {
+    if(!url.toString().startsWith(QStringLiteral("qrc:/"))) {
         setText(QString::fromUtf8(url.toEncoded()));
     } else {
         QUrl newurl = QUrl(url.toString());
         QString url_tmp = newurl.toString().mid(5);
-        newurl = QUrl(QLatin1String("endorphin://") + url_tmp);
+        newurl = QUrl(QStringLiteral("endorphin://") + url_tmp);
         QString urlstr = newurl.toString();
-        if(urlstr.endsWith(QLatin1String(".html"))) {
+        if(urlstr.endsWith(QStringLiteral(".html"))) {
             urlstr.chop(5);
             newurl = QUrl(urlstr);
         }
@@ -105,8 +108,8 @@ void LocationBar::paintEvent(QPaintEvent *event)
     QPalette p = palette();
     QColor defaultBaseColor = QApplication::palette().color(QPalette::Base);
     QColor backgroundColor = defaultBaseColor;
-    if (m_webView && m_webView->url().scheme() == QLatin1String("https")
-        && p.color(QPalette::Text).value() < 128) {
+    if (m_webView && m_webView->url().scheme() == QStringLiteral("https")
+            && p.color(QPalette::Text).value() < 128) {
         QColor lightYellow(248, 248, 210);
         backgroundColor = lightYellow;
     }
@@ -139,6 +142,23 @@ void LocationBar::focusOutEvent(QFocusEvent *event)
     QLineEdit::focusOutEvent(event);
 }
 
+void LocationBar::mouseReleaseEvent(QMouseEvent *event)
+{
+    if (event->button() == Qt::LeftButton){
+        if(!hasSelectedText() && !LocationBar::s_firstSelectAll){
+            LocationBar::s_firstSelectAll = true;
+            selectAll();
+        }
+    }else{
+        QLineEdit::mouseReleaseEvent(event);
+    }
+}
+
+void LocationBar::resetFirstSelectAll()
+{
+    LocationBar::s_firstSelectAll = false;
+}
+
 void LocationBar::mouseDoubleClickEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton)
@@ -157,15 +177,15 @@ void LocationBar::keyPressEvent(QKeyEvent *event)
 
     QString currentText = text().trimmed();
     if ((event->key() == Qt::Key_Enter || event->key() == Qt::Key_Return)
-        && !currentText.startsWith(QLatin1String("http://"), Qt::CaseInsensitive)) {
+            && !currentText.startsWith(QStringLiteral("http://"), Qt::CaseInsensitive)) {
         QString append;
         if (event->modifiers() == Qt::ControlModifier)
-            append = QLatin1String(".com");
+            append = QStringLiteral(".com");
         else if (event->modifiers() == (Qt::ControlModifier | Qt::ShiftModifier))
-            append = QLatin1String(".org");
+            append = QStringLiteral(".org");
         else if (event->modifiers() == Qt::ShiftModifier)
-            append = QLatin1String(".net");
-        QUrl url(QLatin1String("http://") + currentText);
+            append = QStringLiteral(".net");
+        QUrl url(QStringLiteral("http://") + currentText);
         QString host = url.host();
         if (!host.endsWith(append, Qt::CaseInsensitive)) {
             host += append;
diff --git a/src/locationbar/locationbar.h b/src/locationbar/locationbar.h
index 77fc1ca8..7b751e4e 100644
--- a/src/locationbar/locationbar.h
+++ b/src/locationbar/locationbar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,7 +23,7 @@
 #include "lineedit.h"
 
 #include <qpointer.h>
-#include <qurl.h>
+#include <QUrl>
 
 class WebView;
 class LocationBarSiteIcon;
@@ -33,22 +33,28 @@ class LocationBar : public LineEdit
     Q_OBJECT
 
 public:
-    LocationBar(QWidget *parent = 0);
+    LocationBar(QWidget *parent = nullptr);
     void setWebView(WebView *webView);
     WebView *webView() const;
+    static void resetFirstSelectAll();
 
 protected:
     void paintEvent(QPaintEvent *event);
     void focusOutEvent(QFocusEvent *event);
+    void mouseReleaseEvent (QMouseEvent *event);
     void mouseDoubleClickEvent(QMouseEvent *event);
     void keyPressEvent(QKeyEvent *event);
     void dragEnterEvent(QDragEnterEvent *event);
     void dropEvent(QDropEvent *event);
 
-private slots:
+private Q_SLOTS:
     void webViewUrlChanged(const QUrl &url);
 
 private:
+    /**
+     * Guard to imitate Chrome select all on first click
+     */
+    static bool s_firstSelectAll;
     QPointer<WebView> m_webView;
 
     LocationBarSiteIcon *m_siteIcon;
diff --git a/src/locationbar/locationbar.pri b/src/locationbar/locationbar.pri
deleted file mode 100644
index 0e833656..00000000
--- a/src/locationbar/locationbar.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += \
-  locationbar.h \
-  locationbarsiteicon.h \
-  privacyindicator.h
-
-SOURCES += \
-  locationbar.cpp \
-  locationbarsiteicon.cpp \
-  privacyindicator.cpp
diff --git a/src/locationbar/locationbarsiteicon.cpp b/src/locationbar/locationbarsiteicon.cpp
index de40a7ea..3cd90cbd 100644
--- a/src/locationbar/locationbarsiteicon.cpp
+++ b/src/locationbar/locationbarsiteicon.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,8 +19,8 @@
 
 #include "locationbarsiteicon.h"
 
-#include <qevent.h>
-#include <qurl.h>
+#include <QEvent>
+#include <QUrl>
 #include <QDrag>
 #include <QMimeData>
 
@@ -29,7 +29,7 @@
 
 LocationBarSiteIcon::LocationBarSiteIcon(QWidget *parent)
     : QLabel(parent)
-    , m_webView(0)
+    , m_webView(nullptr)
 {
     resize(QSize(16, 16));
     webViewSiteIconChanged();
@@ -42,7 +42,7 @@ void LocationBarSiteIcon::setWebView(WebView *webView)
     m_webView = webView;
     connect(webView, SIGNAL(loadFinished(bool)),
             this, SLOT(webViewSiteIconChanged()));
-    connect(webView, SIGNAL(iconChanged()),
+    connect(webView, SIGNAL(iconChanged(QIcon)),
             this, SLOT(webViewSiteIconChanged()));
 }
 
@@ -64,8 +64,8 @@ void LocationBarSiteIcon::mousePressEvent(QMouseEvent *event)
 void LocationBarSiteIcon::mouseMoveEvent(QMouseEvent *event)
 {
     if (event->buttons() == Qt::LeftButton
-        && (event->pos() - m_dragStartPos).manhattanLength() > QApplication::startDragDistance()
-        && m_webView) {
+            && (event->pos() - m_dragStartPos).manhattanLength() > QApplication::startDragDistance()
+            && m_webView) {
         QDrag *drag = new QDrag(this);
         QMimeData *mimeData = new QMimeData;
         QString title = m_webView->title();
@@ -75,9 +75,10 @@ void LocationBarSiteIcon::mouseMoveEvent(QMouseEvent *event)
         QList<QUrl> urls;
         urls.append(m_webView->url());
         mimeData->setUrls(urls);
-        const QPixmap *p = pixmap();
-        if (p)
-            drag->setPixmap(*p);
+        QPixmap p = pixmap(Qt::ReturnByValue);
+        if (!pixmap(Qt::ReturnByValue)) {} else {
+            drag->setPixmap(p);
+        }
         drag->setMimeData(mimeData);
         drag->exec();
     }
diff --git a/src/locationbar/locationbarsiteicon.h b/src/locationbar/locationbarsiteicon.h
index 6b5d3df8..bcf42f7b 100644
--- a/src/locationbar/locationbarsiteicon.h
+++ b/src/locationbar/locationbarsiteicon.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #ifndef LOCATIONBARSITEICON_H
 #define LOCATIONBARSITEICON_H
 
-#include <qlabel.h>
+#include <QLabel>
 
 class WebView;
 class LocationBarSiteIcon : public QLabel
@@ -28,14 +28,14 @@ class LocationBarSiteIcon : public QLabel
     Q_OBJECT
 
 public:
-    LocationBarSiteIcon(QWidget *parent = 0);
+    LocationBarSiteIcon(QWidget *parent = nullptr);
     void setWebView(WebView *webView);
 
 protected:
     void mousePressEvent(QMouseEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
 
-private slots:
+private Q_SLOTS:
     void webViewSiteIconChanged();
 
 private:
diff --git a/src/locationbar/privacyindicator.cpp b/src/locationbar/privacyindicator.cpp
index bb4905d9..c353e192 100644
--- a/src/locationbar/privacyindicator.cpp
+++ b/src/locationbar/privacyindicator.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@ PrivacyIndicator::PrivacyIndicator(QWidget *parent)
     connect(BrowserApplication::instance(), SIGNAL(privacyChanged(bool)),
             this, SLOT(setVisible(bool)));
     setCursor(Qt::ArrowCursor);
-    setVisible(BrowserApplication::isPrivate());
+    setVisible(BrowserApplication::instance()->isPrivate());
 }
 
 void PrivacyIndicator::mousePressEvent(QMouseEvent *event)
diff --git a/src/locationbar/privacyindicator.h b/src/locationbar/privacyindicator.h
index 58e5c183..56df0eaf 100644
--- a/src/locationbar/privacyindicator.h
+++ b/src/locationbar/privacyindicator.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2010 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,14 +20,14 @@
 #ifndef PRIVACYINDICATOR_H
 #define PRIVACYINDICATOR_H
 
-#include <qlabel.h>
+#include <QLabel>
 
 class PrivacyIndicator : public QLabel
 {
     Q_OBJECT
 
 public:
-    PrivacyIndicator(QWidget *parent = 0);
+    PrivacyIndicator(QWidget *parent = nullptr);
 
 protected:
     void mousePressEvent(QMouseEvent *event);
diff --git a/src/history/historycompleter.cpp b/src/locationcompleter.cpp
similarity index 77%
rename from src/history/historycompleter.cpp
rename to src/locationcompleter.cpp
index 06bb3f51..227a2890 100644
--- a/src/history/historycompleter.cpp
+++ b/src/locationcompleter.cpp
@@ -17,13 +17,19 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include "historycompleter.h"
+#include "locationcompleter.h"
 
-#include <qevent.h>
-#include <qfontmetrics.h>
-#include <qheaderview.h>
+#include <QEvent>
+#include <QMouseEvent>
+#include <QFontMetrics>
+#include <QHeaderView>
+#include <QTcpSocket>
+#include <QByteArray>
 
-HistoryCompletionView::HistoryCompletionView(QWidget *parent)
+#include <QDebug>
+
+
+LocationCompletionView::LocationCompletionView(QWidget *parent)
     : QTableView(parent)
 {
     horizontalHeader()->hide();
@@ -42,7 +48,7 @@ HistoryCompletionView::HistoryCompletionView(QWidget *parent)
     setLayoutDirection(Qt::LeftToRight);
 }
 
-void HistoryCompletionView::resizeEvent(QResizeEvent *event)
+void LocationCompletionView::resizeEvent(QResizeEvent *event)
 {
     horizontalHeader()->resizeSection(0, 0.65 * width());
     horizontalHeader()->setStretchLastSection(true);
@@ -50,14 +56,14 @@ void HistoryCompletionView::resizeEvent(QResizeEvent *event)
     QTableView::resizeEvent(event);
 }
 
-int HistoryCompletionView::sizeHintForRow(int row) const
+int LocationCompletionView::sizeHintForRow(int row) const
 {
     Q_UNUSED(row)
     QFontMetrics metrics = fontMetrics();
     return metrics.height();
 }
 
-HistoryCompletionModel::HistoryCompletionModel(QObject *parent)
+LocationCompletionModel::LocationCompletionModel(QObject *parent)
     : QSortFilterProxyModel(parent)
     , m_searchMatcher(QString(), Qt::CaseInsensitive, QRegExp::FixedString)
     , m_wordMatcher(QString(), Qt::CaseInsensitive)
@@ -66,15 +72,15 @@ HistoryCompletionModel::HistoryCompletionModel(QObject *parent)
     setDynamicSortFilter(true);
 }
 
-QVariant HistoryCompletionModel::data(const QModelIndex &index, int role) const
+QVariant LocationCompletionModel::data(const QModelIndex &index, int role) const
 {
     // if we are valid, tell QCompleter that everything we have filtered matches
     // what the user typed; if not, nothing matches
-    if (role == HistoryCompletionRole && index.isValid()) {
+    if (role == LocationCompletionRole && index.isValid()) {
         if (isValid())
-            return QLatin1String("a");
+            return QStringLiteral("a");
         else
-            return QLatin1String("b");
+            return QStringLiteral("b");
     }
 
     if (role == Qt::FontRole && index.column() == 1) {
@@ -89,39 +95,39 @@ QVariant HistoryCompletionModel::data(const QModelIndex &index, int role) const
     return QSortFilterProxyModel::data(index, role);
 }
 
-QString HistoryCompletionModel::searchString() const
+QString LocationCompletionModel::searchString() const
 {
     return m_searchString;
 }
 
-void HistoryCompletionModel::setSearchString(const QString &str)
+void LocationCompletionModel::setSearchString(const QString &str)
 {
     if (str == m_searchString)
         return;
 
     m_searchString = str;
     m_searchMatcher.setPattern(str);
-    m_wordMatcher.setPattern(QLatin1String("\\b") + QRegExp::escape(str));
+    m_wordMatcher.setPattern(QStringLiteral("\\b") + QRegExp::escape(str));
     invalidateFilter();
 }
 
-bool HistoryCompletionModel::isValid() const
+bool LocationCompletionModel::isValid() const
 {
     return m_isValid;
 }
 
-void HistoryCompletionModel::setValid(bool b)
+void LocationCompletionModel::setValid(bool b)
 {
     if (b == m_isValid)
         return;
 
     m_isValid = b;
 
-    // tell the HistoryCompleter that we've changed
-    emit dataChanged(index(0, 0), index(0, rowCount() - 1));
+    // tell the LocationCompleter that we've changed
+    Q_EMIT dataChanged(index(0, 0), index(0, rowCount() - 1));
 }
 
-bool HistoryCompletionModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
+bool LocationCompletionModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
 {
     // do a case-insensitive substring match against both the url and title;
     // we have also made sure that the user doesn't accidentally use regexp
@@ -140,7 +146,7 @@ bool HistoryCompletionModel::filterAcceptsRow(int source_row, const QModelIndex
     return false;
 }
 
-bool HistoryCompletionModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
+bool LocationCompletionModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
 {
     // We give a bonus to hits that match on a word boundary so that e.g. "dot.kde.org"
     // is a better result for typing "dot" than "slashdot.org". However, we only look
@@ -164,24 +170,24 @@ bool HistoryCompletionModel::lessThan(const QModelIndex &left, const QModelIndex
     return (frecency_r < frecency_l);
 }
 
-HistoryCompleter::HistoryCompleter(QObject *parent)
+LocationCompleter::LocationCompleter(QObject *parent)
     : QCompleter(parent)
 {
     init();
 }
 
-HistoryCompleter::HistoryCompleter(QAbstractItemModel *m, QObject *parent)
+LocationCompleter::LocationCompleter(QAbstractItemModel *m, QObject *parent)
     : QCompleter(m, parent)
 {
     init();
 }
 
-void HistoryCompleter::init()
+void LocationCompleter::init()
 {
-    setPopup(new HistoryCompletionView());
+    setPopup(new LocationCompletionView());
 
     // we want to complete against our own faked role
-    setCompletionRole(HistoryCompletionModel::HistoryCompletionRole);
+    setCompletionRole(LocationCompletionModel::LocationCompletionRole);
 
     // and since we fake our completion role, we can take
     // advantage of the sorted-model optimizations in QCompleter
@@ -192,17 +198,17 @@ void HistoryCompleter::init()
     connect(&m_filterTimer, SIGNAL(timeout()), this, SLOT(updateFilter()));
 }
 
-QString HistoryCompleter::pathFromIndex(const QModelIndex &index) const
+QString LocationCompleter::pathFromIndex(const QModelIndex &index) const
 {
     // we want to return the actual url from the history for the
     // data the QCompleter finally returns
     return model()->data(index, HistoryModel::UrlStringRole).toString();
 }
 
-QStringList HistoryCompleter::splitPath(const QString &path) const
+QStringList LocationCompleter::splitPath(const QString &path) const
 {
     if (path == m_searchString)
-        return QStringList() << QLatin1String("a");
+        return QStringList() << QStringLiteral("a");
 
     // queue an update to our search string
     // We will wait a bit so that if the user is quickly typing,
@@ -214,7 +220,7 @@ QStringList HistoryCompleter::splitPath(const QString &path) const
     // if the previous search results are not a superset of
     // the current search results, tell the model that it is not valid yet
     if (!path.startsWith(m_searchString)) {
-        HistoryCompletionModel *completionModel = qobject_cast<HistoryCompletionModel*>(model());
+        LocationCompletionModel *completionModel = qobject_cast<LocationCompletionModel*>(model());
         Q_ASSERT(completionModel);
         completionModel->setValid(false);
     }
@@ -223,10 +229,10 @@ QStringList HistoryCompleter::splitPath(const QString &path) const
 
     // the actual filtering is done by the HistoryCompletionModel; we just
     // return a short dummy here so that QCompleter thinks we match everything
-    return QStringList() << QLatin1String("a");
+    return QStringList() << QStringLiteral("a");
 }
 
-bool HistoryCompleter::eventFilter(QObject *obj, QEvent *event)
+bool LocationCompleter::eventFilter(QObject *obj, QEvent *event)
 {
     if (event->type() == QEvent::KeyPress && popup()->isVisible()) {
         QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
@@ -257,12 +263,12 @@ bool HistoryCompleter::eventFilter(QObject *obj, QEvent *event)
     return QCompleter::eventFilter(obj, event);
 }
 
-void HistoryCompleter::updateFilter()
+void LocationCompleter::updateFilter()
 {
-    HistoryCompletionModel *completionModel = qobject_cast<HistoryCompletionModel*>(model());
+    LocationCompletionModel *completionModel = qobject_cast<LocationCompletionModel*>(model());
     Q_ASSERT(completionModel);
 
-    // tell the HistoryCompletionModel about the new search string
+    // tell the LocationCompletionModel about the new search string
     completionModel->setSearchString(m_searchString);
 
     // sort the model
diff --git a/src/history/historycompleter.h b/src/locationcompleter.h
similarity index 72%
rename from src/history/historycompleter.h
rename to src/locationcompleter.h
index 44f32f0f..85f645e5 100644
--- a/src/history/historycompleter.h
+++ b/src/locationcompleter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Benjamin K. Stuhl <bks24@cornell.edu>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -18,22 +18,22 @@
  * Boston, MA  02110-1301  USA
  */
 
-#ifndef HISTORYCOMPLETER_H
-#define HISTORYCOMPLETER_H
+#ifndef LOCATIONCOMPLETER_H
+#define LOCATIONCOMPLETER_H
 
 #include "history.h"
 
-#include <qcompleter.h>
-#include <qregexp.h>
-#include <qsortfilterproxymodel.h>
-#include <qtableview.h>
-#include <qtimer.h>
+#include <QCompleter>
+#include <QRegExp>
+#include <QSortFilterProxyModel>
+#include <QTableView>
+#include <QTimer>
 
 class QResizeEvent;
-class HistoryCompletionView : public QTableView
+class LocationCompletionView : public QTableView
 {
 public:
-    HistoryCompletionView(QWidget *parent = 0);
+    LocationCompletionView(QWidget *parent = nullptr);
     int sizeHintForRow(int row) const;
 
 protected:
@@ -46,28 +46,31 @@ class HistoryCompletionView : public QTableView
 // data. (QCompleter also does not allow post-facto sorting of the completion results,
 // the source model must already be completed.) To work around these limitations,
 // we create a custom subclass of QCompleter which abuses the QCompleter::pathFromIndex()
-// virtual override to tell the HistoryCompletionModel which string to look for,
-// _before_ the QCompleter tries to do matching. Since the HistoryCompletionModel does
+// virtual override to tell the LocationCompletionModel which string to look for,
+// _before_ the QCompleter tries to do matching. Since the LocationCompletionModel does
 // its own filtering, we just lie to the QCompleter and tell it everything matches. We then
 // abuse QCompleter::pathFromIndex() to return a url that does not start with what
 // the user typed -- but is what they were looking for.
 
-class HistoryCompletionModel : public QSortFilterProxyModel
+class LocationCompletionModel : public QSortFilterProxyModel
 {
     Q_OBJECT
-    Q_PROPERTY(QString searchString READ searchString WRITE setSearchString)
+    Q_PROPERTY(QString searchString READ searchString WRITE setSearchString NOTIFY searchStringChanged)
 
 public:
-    HistoryCompletionModel(QObject *parent = 0);
+    LocationCompletionModel(QObject *parent = nullptr);
 
-    enum Roles { HistoryCompletionRole = HistoryFilterModel::MaxRole + 1 };
+    enum Roles { LocationCompletionRole = HistoryFilterModel::MaxRole + 1 };
 
     QString searchString() const;
     void setSearchString(const QString &str);
+    void searchStringChanged();
 
     bool isValid() const;
     void setValid(bool b);
 
+    bool couldBeURL(QString &url);
+
     virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
 
 protected:
@@ -81,13 +84,13 @@ class HistoryCompletionModel : public QSortFilterProxyModel
     bool m_isValid;
 };
 
-class HistoryCompleter : public QCompleter
+class LocationCompleter : public QCompleter
 {
     Q_OBJECT
 
 public:
-    HistoryCompleter(QObject *parent = 0);
-    HistoryCompleter(QAbstractItemModel *model, QObject *parent = 0);
+    LocationCompleter(QObject *parent = nullptr);
+    LocationCompleter(QAbstractItemModel *model, QObject *parent = nullptr);
 
     virtual QString pathFromIndex(const QModelIndex &index) const;
     virtual QStringList splitPath(const QString &path) const;
@@ -95,7 +98,7 @@ class HistoryCompleter : public QCompleter
 protected:
     bool eventFilter(QObject *obj, QEvent *event);
 
-private slots:
+private Q_SLOTS:
     void updateFilter();
 
 private:
diff --git a/src/main.cpp b/src/main.cpp
index a8d0e78c..815d8a98 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
diff --git a/src/modelmenu.cpp b/src/modelmenu.cpp
index ab2cdddb..47fdffde 100644
--- a/src/modelmenu.cpp
+++ b/src/modelmenu.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -68,14 +68,16 @@
 #include "browserapplication.h"
 #endif
 
-#include <qabstractitemmodel.h>
-#include <qapplication.h>
-#include <qevent.h>
+#include <QAbstractItemModel>
+#include <QApplication>
+#include <QEvent>
 #include <QWidget>
 #include <QDrag>
 #include <QMimeData>
+#include <QMouseEvent>
+#include <QDropEvent>
 
-#include <qdebug.h>
+#include <QDebug>
 
 ModelMenu::ModelMenu(QWidget *parent)
     : QMenu(parent)
@@ -84,7 +86,7 @@ ModelMenu::ModelMenu(QWidget *parent)
     , m_maxWidth(-1)
     , m_statusBarTextRole(0)
     , m_separatorRole(0)
-    , m_model(0)
+    , m_model(nullptr)
 {
     setAcceptDrops(true);
 
@@ -214,7 +216,7 @@ void ModelMenu::createMenu(const QModelIndex &parent, int max, QMenu *parentMenu
             createMenu(idx, -1, menu);
         } else {
             if (m_separatorRole != 0
-                && idx.data(m_separatorRole).toBool())
+                    && idx.data(m_separatorRole).toBool())
                 addSeparator();
             else
                 menu->addAction(makeAction(idx));
@@ -240,7 +242,7 @@ QAction *ModelMenu::makeAction(const QIcon &icon, const QString &text, QObject *
 {
     QFontMetrics fm(font());
     if (-1 == m_maxWidth)
-        m_maxWidth = fm.horizontalAdvance(QLatin1Char('m')) * 30;
+        m_maxWidth = fm.horizontalAdvance(QChar('m')) * 30;
     QString smallText = fm.elidedText(text, Qt::ElideMiddle, m_maxWidth);
     return new QAction(icon, smallText, parent);
 }
@@ -249,7 +251,7 @@ void ModelMenu::actionTriggered(QAction *action)
 {
     QModelIndex idx = index(action);
     if (idx.isValid())
-        emit activated(idx);
+        Q_EMIT activated(idx);
 }
 
 QModelIndex ModelMenu::index(QAction *action)
@@ -271,7 +273,7 @@ void ModelMenu::dragEnterEvent(QDragEnterEvent *event)
     }
 
     QStringList mimeTypes = m_model->mimeTypes();
-    foreach (const QString &mimeType, mimeTypes) {
+    Q_FOREACH (const QString &mimeType, mimeTypes) {
         if (event->mimeData()->hasFormat(mimeType))
             event->acceptProposedAction();
     }
diff --git a/src/modelmenu.h b/src/modelmenu.h
index e72a9d22..94b9879e 100644
--- a/src/modelmenu.h
+++ b/src/modelmenu.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -64,19 +64,19 @@
 #ifndef MODELMENU_H
 #define MODELMENU_H
 
-#include <qmenu.h>
-#include <qabstractitemmodel.h>
+#include <QMenu>
+#include <QAbstractItemModel>
 
 // A QMenu that is dynamically populated from a QAbstractItemModel
 class ModelMenu : public QMenu
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void activated(const QModelIndex &index);
 
 public:
-    ModelMenu(QWidget *parent = 0);
+    ModelMenu(QWidget *parent = nullptr);
 
     void setModel(QAbstractItemModel *model);
     QAbstractItemModel *model() const;
@@ -108,7 +108,7 @@ class ModelMenu : public QMenu
     virtual ModelMenu *createBaseMenu();
 
     // put all of the children of parent into menu up to max
-    void createMenu(const QModelIndex &parent, int max, QMenu *parentMenu = 0, QMenu *menu = 0);
+    void createMenu(const QModelIndex &parent, int max, QMenu *parentMenu = nullptr, QMenu *menu = nullptr);
 
     void dragEnterEvent(QDragEnterEvent *event);
     void dropEvent(QDropEvent *event);
@@ -119,7 +119,7 @@ class ModelMenu : public QMenu
 #endif
     void mouseMoveEvent(QMouseEvent *event);
 
-private slots:
+private Q_SLOTS:
     void aboutToShow();
     void actionTriggered(QAction *action);
 
diff --git a/src/modeltoolbar.cpp b/src/modeltoolbar.cpp
index c27005fa..2bae2315 100644
--- a/src/modeltoolbar.cpp
+++ b/src/modeltoolbar.cpp
@@ -19,18 +19,22 @@
 
 #include "modeltoolbar.h"
 
+#ifndef NO_BROWSERAPPLICATION
 #include "browserapplication.h"
+#endif
 #include "modelmenu.h"
 
-#include <qevent.h>
-#include <qtoolbutton.h>
+#include <QEvent>
+#include <QMouseEvent>
+#include <QToolButton>
 #include <QDrag>
 #include <QMimeData>
+#include <QApplication>
 
 
 ModelToolBar::ModelToolBar(QWidget *parent)
     : QToolBar(parent)
-    , m_model(0)
+    , m_model(nullptr)
 {
     if (isVisible())
         build();
@@ -40,7 +44,7 @@ ModelToolBar::ModelToolBar(QWidget *parent)
 
 ModelToolBar::ModelToolBar(const QString &title, QWidget *parent)
     : QToolBar(title, parent)
-    , m_model(0)
+    , m_model(nullptr)
 {
     if (isVisible())
         build();
@@ -150,13 +154,15 @@ bool ModelToolBar::eventFilter(QObject *object, QEvent *event)
 
         QMouseEvent *mouseEvent = static_cast<QMouseEvent*>(event);
 
+#ifndef NO_BROWSERAPPLICATION
         BrowserApplication::instance()->setEventMouseButtons(mouseEvent->button());
         BrowserApplication::instance()->setEventKeyboardModifiers(mouseEvent->modifiers());
+#endif
         QAction *action = button->defaultAction();
         Q_ASSERT(action);
         QModelIndex index = this->index(action);
         Q_ASSERT(this->index(action).isValid());
-        emit activated(index);
+        Q_EMIT activated(index);
     } else if (event->type() == QEvent::MouseButtonPress) {
         Q_ASSERT(static_cast<QToolButton*>(object));
 
@@ -177,7 +183,7 @@ void ModelToolBar::dragEnterEvent(QDragEnterEvent *event)
     }
 
     QStringList mimeTypes = m_model->mimeTypes();
-    foreach (const QString &mimeType, mimeTypes) {
+    Q_FOREACH (const QString &mimeType, mimeTypes) {
         if (event->mimeData()->hasFormat(mimeType))
             event->acceptProposedAction();
     }
diff --git a/src/modeltoolbar.h b/src/modeltoolbar.h
index 820b7a77..b53c851b 100644
--- a/src/modeltoolbar.h
+++ b/src/modeltoolbar.h
@@ -20,9 +20,9 @@
 #ifndef MODELTOOLBAR_H
 #define MODELTOOLBAR_H
 
-#include <qtoolbar.h>
+#include <QToolBar>
 
-#include <qabstractitemmodel.h>
+#include <QAbstractItemModel>
 
 Q_DECLARE_METATYPE(QModelIndex)
 
@@ -32,12 +32,12 @@ class ModelToolBar : public QToolBar
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void activated(const QModelIndex &index);
 
 public:
-    ModelToolBar(QWidget *parent = 0);
-    ModelToolBar(const QString &title, QWidget *parent = 0);
+    ModelToolBar(QWidget *parent = nullptr);
+    ModelToolBar(const QString &title, QWidget *parent = nullptr);
 
     void setModel(QAbstractItemModel *model);
     QAbstractItemModel *model() const;
@@ -58,7 +58,7 @@ class ModelToolBar : public QToolBar
     void dropEvent(QDropEvent *event);
     void mouseMoveEvent(QMouseEvent *event);
 
-protected slots:
+protected Q_SLOTS:
     void build();
 
 private:
diff --git a/src/network/cookiejar/cookiedialog.cpp b/src/network/cookiejar/cookiedialog.cpp
deleted file mode 100644
index d00a1ce6..00000000
--- a/src/network/cookiejar/cookiedialog.cpp
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#include "cookiedialog.h"
-
-#include <qsortfilterproxymodel.h>
-#include <qdatetime.h>
-#include <qheaderview.h>
-
-#include "cookiemodel.h"
-#include "cookieexceptionsdialog.h"
-
-CookieDialog::CookieDialog(CookieJar *cookieJar, QWidget *parent)
-    : QDialog(parent)
-    , m_cookieJar(cookieJar)
-{
-    setupUi(this);
-    setWindowFlags(Qt::Sheet);
-    CookieModel *model = new CookieModel(cookieJar, this);
-    m_proxyModel = new QSortFilterProxyModel(this);
-    connect(search, SIGNAL(textChanged(QString)),
-            m_proxyModel, SLOT(setFilterFixedString(QString)));
-    connect(removeButton, SIGNAL(clicked()), cookiesTable, SLOT(removeSelected()));
-    connect(removeAllButton, SIGNAL(clicked()), cookiesTable, SLOT(removeAll()));
-    connect(addRuleButton, SIGNAL(clicked()), this, SLOT(addRule()));
-    m_proxyModel->setSourceModel(model);
-    m_proxyModel->setSortRole(CookieModel::SortRole);
-    cookiesTable->verticalHeader()->hide();
-    cookiesTable->setSelectionBehavior(QAbstractItemView::SelectRows);
-    cookiesTable->setModel(m_proxyModel);
-    cookiesTable->setAlternatingRowColors(true);
-    cookiesTable->setTextElideMode(Qt::ElideMiddle);
-    cookiesTable->setShowGrid(false);
-    cookiesTable->setSortingEnabled(true);
-    QFont f = font();
-    f.setPointSize(10);
-    QFontMetrics fm(f);
-    int height = fm.height() + fm.height() / 3;
-    cookiesTable->verticalHeader()->setDefaultSectionSize(height);
-    cookiesTable->verticalHeader()->setMinimumSectionSize(-1);
-    for (int i = 0; i < model->columnCount(); ++i) {
-        int header = cookiesTable->horizontalHeader()->sectionSizeHint(i);
-        switch (i) {
-        case 0:
-            header = fm.horizontalAdvance(QLatin1String("averagehost.domain.com"));
-            break;
-        case 1:
-            header = fm.horizontalAdvance(QLatin1String("_session_id"));
-            break;
-        case 4:
-            header = fm.horizontalAdvance(QDateTime::currentDateTime().toString(Qt::LocalDate));
-            break;
-        }
-        int buffer = fm.horizontalAdvance(QLatin1String("xx"));
-        header += buffer;
-        cookiesTable->horizontalHeader()->resizeSection(i, header);
-    }
-    cookiesTable->horizontalHeader()->setStretchLastSection(true);
-}
-
-void CookieDialog::addRule()
-{
-    const QModelIndexList selection = cookiesTable->selectionModel()->selectedRows();
-    if (selection.isEmpty())
-        return;
-    QModelIndex firstSelected = selection.at(0);
-    QModelIndex domainSelection = firstSelected.sibling(firstSelected.row(), 0);
-    QString domain = m_proxyModel->data(domainSelection, Qt::DisplayRole).toString();
-    CookieExceptionsDialog dialog(m_cookieJar, this);
-    dialog.setDomainName(domain);
-    dialog.exec();
-}
-
-
diff --git a/src/network/cookiejar/cookiedialog.h b/src/network/cookiejar/cookiedialog.h
deleted file mode 100644
index da2f51fb..00000000
--- a/src/network/cookiejar/cookiedialog.h
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef COOKIEDIALOG_H
-#define COOKIEDIALOG_H
-
-#include <qdialog.h>
-
-#include "ui_cookies.h"
-
-class CookieJar;
-class QSortFilterProxyModel;
-class CookieDialog : public QDialog, public Ui_CookiesDialog
-{
-    Q_OBJECT
-
-public:
-    CookieDialog(CookieJar *cookieJar, QWidget *parent = 0);
-
-private:
-    QSortFilterProxyModel *m_proxyModel;
-    CookieJar *m_cookieJar;
-
-private slots:
-    void addRule();
-};
-
-#endif // COOKIEDIALOG_H
-
diff --git a/src/network/cookiejar/cookieexceptionsdialog.cpp b/src/network/cookiejar/cookieexceptionsdialog.cpp
deleted file mode 100644
index bea15561..00000000
--- a/src/network/cookiejar/cookieexceptionsdialog.cpp
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#include "cookieexceptionsdialog.h"
-
-#include <qsortfilterproxymodel.h>
-
-#include <qheaderview.h>
-#include <qcompleter.h>
-#include "cookiemodel.h"
-#include "cookiejar.h"
-#include "cookieexceptionsmodel.h"
-
-CookieExceptionsDialog::CookieExceptionsDialog(CookieJar *cookieJar, QWidget *parent)
-    : QDialog(parent)
-    , m_cookieJar(cookieJar)
-{
-    setupUi(this);
-    setWindowFlags(Qt::Sheet);
-    connect(removeButton, SIGNAL(clicked()), exceptionTable, SLOT(removeSelected()));
-    connect(removeAllButton, SIGNAL(clicked()), exceptionTable, SLOT(removeAll()));
-    exceptionTable->verticalHeader()->hide();
-    exceptionTable->setSelectionBehavior(QAbstractItemView::SelectRows);
-    exceptionTable->setAlternatingRowColors(true);
-    exceptionTable->setTextElideMode(Qt::ElideMiddle);
-    exceptionTable->setShowGrid(false);
-    exceptionTable->setSortingEnabled(true);
-    m_exceptionsModel = new CookieExceptionsModel(cookieJar, this);
-    m_proxyModel = new QSortFilterProxyModel(this);
-    m_proxyModel->setSourceModel(m_exceptionsModel);
-    connect(search, SIGNAL(textChanged(QString)),
-            m_proxyModel, SLOT(setFilterFixedString(QString)));
-    exceptionTable->setModel(m_proxyModel);
-
-    CookieModel *cookieModel = new CookieModel(cookieJar, this);
-    domainLineEdit->setCompleter(new QCompleter(cookieModel, domainLineEdit));
-
-    connect(domainLineEdit, SIGNAL(textChanged(const QString &)),
-            this, SLOT(textChanged(const QString &)));
-    connect(blockButton, SIGNAL(clicked()), this, SLOT(block()));
-    connect(allowButton, SIGNAL(clicked()), this, SLOT(allow()));
-    connect(allowForSessionButton, SIGNAL(clicked()), this, SLOT(allowForSession()));
-
-    QFont f = font();
-    f.setPointSize(10);
-    QFontMetrics fm(f);
-    int height = fm.height() + fm.height() / 3;
-    exceptionTable->verticalHeader()->setDefaultSectionSize(height);
-    exceptionTable->verticalHeader()->setMinimumSectionSize(-1);
-    for (int i = 0; i < m_exceptionsModel->columnCount(); ++i) {
-        int header = exceptionTable->horizontalHeader()->sectionSizeHint(i);
-        switch (i) {
-        case 0:
-            header = fm.horizontalAdvance(QLatin1String("averagebiglonghost.domain.com"));
-            break;
-        case 1:
-            header = fm.horizontalAdvance(QLatin1String("Allow For Session"));
-            break;
-        }
-        int buffer = fm.horizontalAdvance(QLatin1String("xx"));
-        header += buffer;
-        exceptionTable->horizontalHeader()->resizeSection(i, header);
-    }
-}
-
-void CookieExceptionsDialog::textChanged(const QString &text)
-{
-    bool enabled = !text.isEmpty();
-    blockButton->setEnabled(enabled);
-    allowButton->setEnabled(enabled);
-    allowForSessionButton->setEnabled(enabled);
-}
-
-void CookieExceptionsDialog::setDomainName(const QString &domainName)
-{
-    domainLineEdit->setText(domainName);
-}
-
-void CookieExceptionsDialog::block()
-{
-    m_exceptionsModel->addRule(domainLineEdit->text(), CookieJar::Block);
-}
-
-void CookieExceptionsDialog::allow()
-{
-    m_exceptionsModel->addRule(domainLineEdit->text(), CookieJar::Allow);
-}
-
-void CookieExceptionsDialog::allowForSession()
-{
-    m_exceptionsModel->addRule(domainLineEdit->text(), CookieJar::AllowForSession);
-}
-
-void CookieExceptionsDialog::accept()
-{
-    m_cookieJar->setBlockedCookies(m_exceptionsModel->m_blockedCookies);
-    m_cookieJar->setAllowedCookies(m_exceptionsModel->m_allowedCookies);
-    m_cookieJar->setAllowForSessionCookies(m_exceptionsModel->m_sessionCookies);
-    QDialog::accept();
-}
-
diff --git a/src/network/cookiejar/cookieexceptionsdialog.h b/src/network/cookiejar/cookieexceptionsdialog.h
deleted file mode 100644
index da6f39ed..00000000
--- a/src/network/cookiejar/cookieexceptionsdialog.h
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef COOKIEEXCEPTIONSDIALOG_H
-#define COOKIEEXCEPTIONSDIALOG_H
-
-#include <qdialog.h>
-
-#include "ui_cookiesexceptions.h"
-
-class CookieJar;
-class QSortFilterProxyModel;
-class CookieExceptionsModel;
-class CookieExceptionsDialog : public QDialog, public Ui_CookiesExceptionsDialog
-{
-    Q_OBJECT
-
-public:
-    CookieExceptionsDialog(CookieJar *cookieJar, QWidget *parent = 0);
-    void accept();
-    void setDomainName(const QString &domainName);
-
-private slots:
-    void block();
-    void allow();
-    void allowForSession();
-    void textChanged(const QString &text);
-
-private:
-    CookieExceptionsModel *m_exceptionsModel;
-    QSortFilterProxyModel *m_proxyModel;
-    CookieJar *m_cookieJar;
-};
-
-#endif // COOKIEEXCEPTIONSDIALOG_H
-
diff --git a/src/network/cookiejar/cookieexceptionsmodel.cpp b/src/network/cookiejar/cookieexceptionsmodel.cpp
deleted file mode 100644
index 098af001..00000000
--- a/src/network/cookiejar/cookieexceptionsmodel.cpp
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#include "cookieexceptionsmodel.h"
-
-#include "cookiejar.h"
-
-#include <qfontmetrics.h>
-
-CookieExceptionsModel::CookieExceptionsModel(CookieJar *cookiejar, QObject *parent)
-    : QAbstractTableModel(parent)
-    , m_cookieJar(cookiejar)
-{
-    m_allowedCookies = m_cookieJar->allowedCookies();
-    m_blockedCookies = m_cookieJar->blockedCookies();
-    m_sessionCookies = m_cookieJar->allowForSessionCookies();
-}
-
-QVariant CookieExceptionsModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (role == Qt::SizeHintRole) {
-        QFont font;
-        font.setPointSize(10);
-        QFontMetrics fm(font);
-        int height = fm.height() + fm.height() / 3;
-        int width = fm.horizontalAdvance(headerData(section, orientation, Qt::DisplayRole).toString());
-        return QSize(width, height);
-    }
-
-    if (orientation == Qt::Horizontal
-        && role == Qt::DisplayRole) {
-        switch (section) {
-        case 0:
-            return tr("Website");
-        case 1:
-            return tr("Rule");
-        }
-    }
-    return QAbstractTableModel::headerData(section, orientation, role);
-}
-
-QVariant CookieExceptionsModel::data(const QModelIndex &index, int role) const
-{
-    if (index.row() < 0 || index.row() >= rowCount())
-        return QVariant();
-
-    switch (role) {
-    case Qt::DisplayRole:
-    case Qt::EditRole: {
-        int row = index.row();
-        if (row < m_allowedCookies.count()) {
-            switch (index.column()) {
-            case 0:
-                return m_allowedCookies.at(row);
-            case 1:
-                return tr("Allow");
-            }
-        }
-        row = row - m_allowedCookies.count();
-        if (row < m_blockedCookies.count()) {
-            switch (index.column()) {
-            case 0:
-                return m_blockedCookies.at(row);
-            case 1:
-                return tr("Block");
-            }
-        }
-        row = row - m_blockedCookies.count();
-        if (row < m_sessionCookies.count()) {
-            switch (index.column()) {
-            case 0:
-                return m_sessionCookies.at(row);
-            case 1:
-                return tr("Allow For Session");
-            }
-        }
-    }
-    case Qt::FontRole: {
-        QFont font;
-        font.setPointSize(10);
-        return font;
-    }
-    }
-    return QVariant();
-}
-
-int CookieExceptionsModel::columnCount(const QModelIndex &parent) const
-{
-    return (parent.isValid()) ? 0 : 2;
-}
-
-int CookieExceptionsModel::rowCount(const QModelIndex &parent) const
-{
-    return (parent.isValid() || !m_cookieJar) ? 0 : m_allowedCookies.count() + m_blockedCookies.count() + m_sessionCookies.count();
-}
-
-bool CookieExceptionsModel::removeRows(int row, int count, const QModelIndex &parent)
-{
-    if (parent.isValid() || !m_cookieJar)
-        return false;
-
-    int lastRow = row + count - 1;
-    beginRemoveRows(parent, row, lastRow);
-
-    for (int i = lastRow; i >= row; --i) {
-        int rowToRemove = i;
-        if (rowToRemove < m_allowedCookies.count()) {
-            m_allowedCookies.removeAt(rowToRemove);
-            continue;
-        }
-        rowToRemove = rowToRemove - m_allowedCookies.count();
-        if (rowToRemove < m_blockedCookies.count()) {
-            m_blockedCookies.removeAt(rowToRemove);
-            continue;
-        }
-        rowToRemove = rowToRemove - m_blockedCookies.count();
-        if (rowToRemove < m_sessionCookies.count()) {
-            m_sessionCookies.removeAt(rowToRemove);
-            continue;
-        }
-    }
-    endRemoveRows();
-    return true;
-}
-
-void CookieExceptionsModel::addRule(QString host, CookieJar::CookieRule rule)
-{
-    if (host.isEmpty())
-        return;
-    switch (rule) {
-        case CookieJar::Allow :
-            addHost(host, m_allowedCookies, m_blockedCookies, m_sessionCookies);
-            return;
-        case CookieJar::Block :
-            addHost(host, m_blockedCookies, m_allowedCookies, m_sessionCookies);
-            return;
-        case CookieJar::AllowForSession :
-            addHost(host, m_sessionCookies, m_allowedCookies, m_blockedCookies);
-            return;
-    }
-}
-
-void CookieExceptionsModel::addHost(QString host, QStringList &add, QStringList &remove1, QStringList &remove2)
-{
-    beginResetModel();
-    if (!add.contains(host)) {
-        add.append(host);
-        remove1.removeOne(host);
-        remove2.removeOne(host);
-    }
-    // avoid to have similar rules, with or without starting dot, eg "endorphin-browser.org" and ".endorphin-browser.org"
-    // means the same domain.
-    QString otherRule;
-    if (host.startsWith(QLatin1Char('.'))) {
-        otherRule = host.mid(1);
-    } else {
-        otherRule = QLatin1String(".") + host;
-    }
-    add.removeOne(otherRule);
-    remove1.removeOne(otherRule);
-    remove2.removeOne(otherRule);
-    endResetModel();
-}
-
diff --git a/src/network/cookiejar/cookieexceptionsmodel.h b/src/network/cookiejar/cookieexceptionsmodel.h
deleted file mode 100644
index 00259c57..00000000
--- a/src/network/cookiejar/cookieexceptionsmodel.h
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef COOKIEEXCEPTIONSMODEL_H
-#define COOKIEEXCEPTIONSMODEL_H
-
-#include "cookiejar.h"
-
-#include <qabstractitemmodel.h>
-#include <qstringlist.h>
-
-
-class CookieExceptionsModel : public QAbstractTableModel
-{
-    Q_OBJECT
-    friend class CookieExceptionsDialog;
-
-public:
-    CookieExceptionsModel(CookieJar *cookieJar, QObject *parent = 0);
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
-
-
-    void addRule(QString host, CookieJar::CookieRule rule);
-
-private:
-    CookieJar *m_cookieJar;
-
-    // Domains we allow, Domains we block, Domains we allow for this session
-    QStringList m_allowedCookies;
-    QStringList m_blockedCookies;
-    QStringList m_sessionCookies;
-
-    void addHost(QString host, QStringList &add, QStringList &remove1, QStringList &remove2);
-
-};
-
-#endif // COOKIEEXCEPTIONSMODEL_H
-
diff --git a/src/network/cookiejar/cookiejar.cpp b/src/network/cookiejar/cookiejar.cpp
deleted file mode 100644
index 1f106d8d..00000000
--- a/src/network/cookiejar/cookiejar.cpp
+++ /dev/null
@@ -1,493 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#include "cookiejar.h"
-
-#include "autosaver.h"
-#include "browserapplication.h"
-
-#include <qapplication.h>
-#include <qdir.h>
-#include <qmetaobject.h>
-#include <qsettings.h>
-#include <qurl.h>
-#include <QNetworkCookie>
-#include <QDataStream>
-
-#include <qdebug.h>
-
-static const unsigned int JAR_VERSION = 23;
-
-QT_BEGIN_NAMESPACE
-QDataStream &operator<<(QDataStream &stream, const QList<QNetworkCookie> &list)
-{
-    stream << JAR_VERSION;
-    stream << quint32(list.size());
-    for (int i = 0; i < list.size(); ++i)
-        stream << list.at(i).toRawForm();
-    return stream;
-}
-
-QDataStream &operator>>(QDataStream &stream, QList<QNetworkCookie> &list)
-{
-    list.clear();
-
-    quint32 version;
-    stream >> version;
-
-    if (version != JAR_VERSION)
-        return stream;
-
-    quint32 count;
-    stream >> count;
-    for (quint32 i = 0; i < count; ++i) {
-        QByteArray value;
-        stream >> value;
-        QList<QNetworkCookie> newCookies = QNetworkCookie::parseCookies(value);
-        if (newCookies.count() == 0 && value.length() != 0) {
-            qWarning() << "CookieJar: Unable to parse saved cookie:" << value;
-        }
-        for (int j = 0; j < newCookies.count(); ++j)
-            list.append(newCookies.at(j));
-        if (stream.atEnd())
-            break;
-    }
-    return stream;
-}
-QT_END_NAMESPACE
-
-CookieJar::CookieJar(QObject *parent)
-    : NetworkCookieJar(parent)
-    , m_loaded(false)
-    , m_saveTimer(new AutoSaver(this))
-    , m_filterTrackingCookies(false)
-    , m_acceptCookies(AcceptOnlyFromSitesNavigatedTo)
-    , m_isPrivate(false)
-{
-}
-
-CookieJar::~CookieJar()
-{
-    if (m_loaded && m_keepCookies == KeepUntilExit)
-        clear();
-    m_saveTimer->saveIfNeccessary();
-}
-
-void CookieJar::setPrivate(bool isPrivate)
-{
-    m_isPrivate = isPrivate;
-}
-
-void CookieJar::clear()
-{
-    if (!m_loaded)
-        load();
-    setAllCookies(QList<QNetworkCookie>());
-    m_saveTimer->changeOccurred();
-    emit cookiesChanged();
-}
-
-void CookieJar::load()
-{
-    if (m_loaded)
-        return;
-    // load cookies and exceptions
-    qRegisterMetaTypeStreamOperators<QList<QNetworkCookie> >("QList<QNetworkCookie>");
-    QSettings cookieSettings(BrowserApplication::dataFilePath(QLatin1String("cookies.ini")), QSettings::IniFormat);
-    if (!m_isPrivate) {
-        setAllCookies(qvariant_cast<QList<QNetworkCookie> >(cookieSettings.value(QLatin1String("cookies"))));
-    }
-    cookieSettings.beginGroup(QLatin1String("Exceptions"));
-    m_exceptions_block = cookieSettings.value(QLatin1String("block")).toStringList();
-    m_exceptions_allow = cookieSettings.value(QLatin1String("allow")).toStringList();
-    m_exceptions_allowForSession = cookieSettings.value(QLatin1String("allowForSession")).toStringList();
-    std::sort(m_exceptions_block.begin(), m_exceptions_block.end());
-    std::sort(m_exceptions_allow.begin(), m_exceptions_allow.end());
-    std::sort(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end());
-
-    loadSettings();
-}
-
-void CookieJar::loadSettings()
-{
-    QSettings settings;
-    settings.beginGroup(QLatin1String("cookies"));
-    QByteArray value = settings.value(QLatin1String("acceptCookies"),
-                                      QLatin1String("AcceptOnlyFromSitesNavigatedTo")).toByteArray();
-    QMetaEnum acceptPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("AcceptPolicy"));
-    m_acceptCookies = acceptPolicyEnum.keyToValue(value) == -1 ?
-                      AcceptOnlyFromSitesNavigatedTo :
-                      static_cast<AcceptPolicy>(acceptPolicyEnum.keyToValue(value));
-
-    value = settings.value(QLatin1String("keepCookiesUntil"), QLatin1String("KeepUntilExpire")).toByteArray();
-    QMetaEnum keepPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("KeepPolicy"));
-    m_keepCookies = keepPolicyEnum.keyToValue(value) == -1 ?
-                    KeepUntilExpire :
-                    static_cast<KeepPolicy>(keepPolicyEnum.keyToValue(value));
-
-    if (m_keepCookies == KeepUntilExit)
-        setAllCookies(QList<QNetworkCookie>());
-
-    m_loaded = true;
-    m_filterTrackingCookies = settings.value(QLatin1String("filterTrackingCookies"), m_filterTrackingCookies).toBool();
-    m_sessionLength = settings.value(QLatin1String("sessionLength"), -1).toInt();
-    emit cookiesChanged();
-}
-
-void CookieJar::save()
-{
-    if (!m_loaded || m_isPrivate)
-        return;
-    purgeOldCookies();
-
-    QSettings cookieSettings(BrowserApplication::dataFilePath(QLatin1String("cookies.ini")), QSettings::IniFormat);
-
-    QList<QNetworkCookie> cookies = allCookies();
-    for (int i = cookies.count() - 1; i >= 0; --i) {
-        if (cookies.at(i).isSessionCookie())
-            cookies.removeAt(i);
-    }
-    cookieSettings.setValue(QLatin1String("cookies"), QVariant::fromValue(cookies));
-    cookieSettings.beginGroup(QLatin1String("Exceptions"));
-    cookieSettings.setValue(QLatin1String("block"), m_exceptions_block);
-    cookieSettings.setValue(QLatin1String("allow"), m_exceptions_allow);
-    cookieSettings.setValue(QLatin1String("allowForSession"), m_exceptions_allowForSession);
-
-    // save cookie settings
-    QSettings settings;
-    settings.beginGroup(QLatin1String("cookies"));
-    QMetaEnum acceptPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("AcceptPolicy"));
-    settings.setValue(QLatin1String("acceptCookies"), QLatin1String(acceptPolicyEnum.valueToKey(m_acceptCookies)));
-
-    QMetaEnum keepPolicyEnum = staticMetaObject.enumerator(staticMetaObject.indexOfEnumerator("KeepPolicy"));
-    settings.setValue(QLatin1String("keepCookiesUntil"), QLatin1String(keepPolicyEnum.valueToKey(m_keepCookies)));
-
-    settings.setValue(QLatin1String("filterTrackingCookies"), m_filterTrackingCookies);
-    settings.setValue(QLatin1String("sessionLength"), m_sessionLength);
-}
-
-void CookieJar::purgeOldCookies()
-{
-    QList<QNetworkCookie> cookies = allCookies();
-    if (cookies.isEmpty())
-        return;
-    int oldCount = cookies.count();
-    QDateTime now = QDateTime::currentDateTime();
-    for (int i = cookies.count() - 1; i >= 0; --i) {
-        if (!cookies.at(i).isSessionCookie() && cookies.at(i).expirationDate() < now)
-            cookies.removeAt(i);
-    }
-    if (oldCount == cookies.count())
-        return;
-    setAllCookies(cookies);
-    emit cookiesChanged();
-}
-
-QList<QNetworkCookie> CookieJar::cookiesForUrl(const QUrl &url) const
-{
-    CookieJar *that = const_cast<CookieJar*>(this);
-    if (!m_loaded)
-        that->load();
-
-    return NetworkCookieJar::cookiesForUrl(url);
-}
-
-bool CookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
-{
-    if (!m_loaded)
-        load();
-
-    QString host = url.host();
-    bool eBlock = isOnDomainList(m_exceptions_block, host);
-    bool eAllow = !eBlock && isOnDomainList(m_exceptions_allow, host);
-    bool eAllowSession = !eBlock && !eAllow && isOnDomainList(m_exceptions_allowForSession, host);
-
-    bool addedCookies = false;
-    // pass exceptions
-    bool acceptInitially = (m_acceptCookies != AcceptNever);
-    if ((acceptInitially && !eBlock)
-        || (!acceptInitially && (eAllow || eAllowSession))) {
-        // pass url domain == cookie domain
-        QDateTime soon = QDateTime::currentDateTime();
-        soon = soon.addDays(90);
-        foreach (QNetworkCookie cookie, cookieList) {
-            if (cookie.isSessionCookie() && m_sessionLength != -1) {
-                QDateTime now = QDateTime::currentDateTime();
-                cookie.setExpirationDate(now.addDays(m_sessionLength));
-            }
-
-            QList<QNetworkCookie> lst;
-            if (!(m_filterTrackingCookies && cookie.name().startsWith("__utm"))) {
-
-
-                if (eAllowSession) {
-                    cookie.setExpirationDate(QDateTime());
-                }
-                if (m_keepCookies == KeepUntilTimeLimit
-                    && !cookie.isSessionCookie()
-                    && cookie.expirationDate() > soon) {
-                    cookie.setExpirationDate(soon);
-                }
-                lst += cookie;
-                if (NetworkCookieJar::setCookiesFromUrl(lst, url)) {
-                    addedCookies = true;
-                } else {
-                    // finally force it in if wanted
-                    if (m_acceptCookies == AcceptAlways) {
-                        QList<QNetworkCookie> cookies = allCookies();
-                        QList<QNetworkCookie>::Iterator it = cookies.begin(),
-                                   end = cookies.end();
-                        for (; it != end; ++it) {
-                            // does this cookie already exist?
-                            if (cookie.name() == it->name() &&
-                                cookie.domain() == it->domain() &&
-                                cookie.path() == it->path()) {
-                                // found a match
-                                cookies.erase(it);
-                                break;
-                            }
-                        }
-
-                        cookies += cookie;
-                        setAllCookies(cookies);
-                        addedCookies = true;
-                    }
-    #if 0
-                    else
-                        qWarning() << "setCookiesFromUrl failed" << url << cookieList.value(0).toRawForm();
-    #endif
-                }
-#if 0
-            } else {
-                qWarning() << "cookie treated as tracking cookie" << cookie;
-#endif
-            }
-        }
-    }
-
-    if (addedCookies) {
-        m_saveTimer->changeOccurred();
-        emit cookiesChanged();
-    }
-    return addedCookies;
-}
-
-QList<QNetworkCookie> CookieJar::cookies() const
-{
-    CookieJar *that = const_cast<CookieJar*>(this);
-    if (!m_loaded)
-        that->load();
-
-    return allCookies();
-}
-
-void CookieJar::setCookies(const QList<QNetworkCookie> &cookies)
-{
-    if (!m_loaded)
-        load();
-    setAllCookies(cookies);
-    m_saveTimer->changeOccurred();
-    emit cookiesChanged();
-}
-
-bool CookieJar::isOnDomainList(const QStringList &rules, const QString &domain)
-{
-    // Either the rule matches the domain exactly
-    // or the domain ends with ".rule"
-    foreach (const QString &rule, rules) {
-        if (rule.startsWith(QLatin1String("."))) {
-            if (domain.endsWith(rule))
-                return true;
-
-            QStringRef withoutDot = rule.rightRef(rule.size() - 1);
-            if (domain == withoutDot)
-                return true;
-        } else {
-            QStringRef domainEnding = domain.rightRef(rule.size() + 1);
-            if (!domainEnding.isEmpty()
-                && domainEnding.at(0) == QLatin1Char('.')
-                && domain.endsWith(rule)) {
-                return true;
-            }
-
-            if (rule == domain)
-                return true;
-        }
-    }
-    return false;
-}
-
-CookieJar::AcceptPolicy CookieJar::acceptPolicy() const
-{
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
-    return m_acceptCookies;
-}
-
-void CookieJar::setAcceptPolicy(AcceptPolicy policy)
-{
-    if (!m_loaded)
-        load();
-    if (policy == m_acceptCookies)
-        return;
-    m_acceptCookies = policy;
-    m_saveTimer->changeOccurred();
-}
-
-CookieJar::KeepPolicy CookieJar::keepPolicy() const
-{
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
-    return m_keepCookies;
-}
-
-void CookieJar::setKeepPolicy(KeepPolicy policy)
-{
-    if (!m_loaded)
-        load();
-    if (policy == m_keepCookies)
-        return;
-    m_keepCookies = policy;
-    m_saveTimer->changeOccurred();
-}
-
-QStringList CookieJar::blockedCookies() const
-{
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
-    return m_exceptions_block;
-}
-
-QStringList CookieJar::allowedCookies() const
-{
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
-    return m_exceptions_allow;
-}
-
-QStringList CookieJar::allowForSessionCookies() const
-{
-    if (!m_loaded)
-        (const_cast<CookieJar*>(this))->load();
-    return m_exceptions_allowForSession;
-}
-
-void CookieJar::setBlockedCookies(const QStringList &list)
-{
-    if (!m_loaded)
-        load();
-    m_exceptions_block = list;
-    std::sort(m_exceptions_block.begin(), m_exceptions_block.end());
-    applyRules();
-    m_saveTimer->changeOccurred();
-}
-
-void CookieJar::setAllowedCookies(const QStringList &list)
-{
-    if (!m_loaded)
-        load();
-    m_exceptions_allow = list;
-    std::sort(m_exceptions_allow.begin(), m_exceptions_allow.end());
-    applyRules();
-    m_saveTimer->changeOccurred();
-}
-
-void CookieJar::setAllowForSessionCookies(const QStringList &list)
-{
-    if (!m_loaded)
-        load();
-    m_exceptions_allowForSession = list;
-    std::sort(m_exceptions_allowForSession.begin(), m_exceptions_allowForSession.end());
-    applyRules();
-    m_saveTimer->changeOccurred();
-}
-
-void CookieJar::applyRules()
-{
-    QList<QNetworkCookie> cookies = allCookies();
-    bool changed = false;
-    for (int i = cookies.count() - 1; i >= 0; --i) {
-        const QNetworkCookie &cookie = cookies.at(i);
-        if (isOnDomainList(m_exceptions_block, cookie.domain())) {
-            cookies.removeAt(i);
-            changed = true;
-        } else if (isOnDomainList(m_exceptions_allowForSession, cookie.domain())) {
-            const_cast<QNetworkCookie&>(cookie).setExpirationDate(QDateTime());
-            changed = true;
-        }
-    }
-    if (changed) {
-        setAllCookies(cookies);
-        m_saveTimer->changeOccurred();
-        emit cookiesChanged();
-    }
-}
-
-bool CookieJar::filterTrackingCookies() const
-{
-    return this->m_filterTrackingCookies;
-}
-
-void CookieJar::setFilterTrackingCookies(bool filterTrackingCookies)
-{
-    this->m_filterTrackingCookies = filterTrackingCookies;
-}
diff --git a/src/network/cookiejar/cookiejar.h b/src/network/cookiejar/cookiejar.h
deleted file mode 100644
index eb67e265..00000000
--- a/src/network/cookiejar/cookiejar.h
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef COOKIEJAR_H
-#define COOKIEJAR_H
-
-#include "networkcookiejar.h"
-
-#include <qstringlist.h>
-
-class AutoSaver;
-class CookieJar : public NetworkCookieJar
-{
-    Q_OBJECT
-    Q_PROPERTY(AcceptPolicy acceptPolicy READ acceptPolicy WRITE setAcceptPolicy)
-    Q_PROPERTY(KeepPolicy keepPolicy READ keepPolicy WRITE setKeepPolicy)
-    Q_PROPERTY(QStringList blockedCookies READ blockedCookies WRITE setBlockedCookies)
-    Q_PROPERTY(QStringList allowedCookies READ allowedCookies WRITE setAllowedCookies)
-    Q_PROPERTY(QStringList allowForSessionCookies READ allowForSessionCookies WRITE setAllowForSessionCookies)
-    Q_ENUMS(KeepPolicy)
-    Q_ENUMS(AcceptPolicy)
-    Q_ENUMS(CookieRule)
-
-signals:
-    void cookiesChanged();
-
-public:
-    enum AcceptPolicy {
-        AcceptAlways,
-        AcceptNever,
-        AcceptOnlyFromSitesNavigatedTo
-    };
-
-    enum KeepPolicy {
-        KeepUntilExpire,
-        KeepUntilExit,
-        KeepUntilTimeLimit
-    };
-
-    enum CookieRule {
-        Allow,
-        AllowForSession,
-        Block
-    };
-
-
-    CookieJar(QObject *parent = 0);
-    ~CookieJar();
-
-    QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const;
-    bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url);
-
-    QList<QNetworkCookie> cookies() const;
-    void setCookies(const QList<QNetworkCookie> &cookies);
-
-    AcceptPolicy acceptPolicy() const;
-    void setAcceptPolicy(AcceptPolicy policy);
-
-    KeepPolicy keepPolicy() const;
-    void setKeepPolicy(KeepPolicy policy);
-
-    QStringList blockedCookies() const;
-    QStringList allowedCookies() const;
-    QStringList allowForSessionCookies() const;
-
-    void setBlockedCookies(const QStringList &list);
-    void setAllowedCookies(const QStringList &list);
-    void setAllowForSessionCookies(const QStringList &list);
-
-    bool filterTrackingCookies() const;
-    void setFilterTrackingCookies(bool filterTrackingCookies);
-
-    void setPrivate(bool isPrivate);
-
-public slots:
-    void clear();
-    void loadSettings();
-
-private slots:
-    void save();
-
-protected:
-    static bool isOnDomainList(const QStringList &rules, const QString &domain);
-
-private:
-    void applyRules();
-    void purgeOldCookies();
-    void load();
-    bool m_loaded;
-    AutoSaver *m_saveTimer;
-    bool m_filterTrackingCookies;
-
-    AcceptPolicy m_acceptCookies;
-    KeepPolicy m_keepCookies;
-
-    QStringList m_exceptions_block;
-    QStringList m_exceptions_allow;
-    QStringList m_exceptions_allowForSession;
-    bool m_isPrivate;
-    int m_sessionLength;
-};
-
-#endif // COOKIEJAR_H
-
diff --git a/src/network/cookiejar/cookiejar.pri b/src/network/cookiejar/cookiejar.pri
deleted file mode 100644
index 62612d3a..00000000
--- a/src/network/cookiejar/cookiejar.pri
+++ /dev/null
@@ -1,23 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += \
-  cookiedialog.h \
-  cookieexceptionsdialog.h \
-  cookieexceptionsmodel.h \
-  cookiejar.h \
-  cookiemodel.h
-
-SOURCES += \
-  cookiedialog.cpp \
-  cookieexceptionsmodel.cpp \
-  cookiemodel.cpp \
-  cookieexceptionsdialog.cpp \
-  cookiejar.cpp
-
-FORMS += \
-    cookies.ui \
-    cookiesexceptions.ui
-
-include($$PWD/networkcookiejar/networkcookiejar.pri)
diff --git a/src/network/cookiejar/cookiemodel.cpp b/src/network/cookiejar/cookiemodel.cpp
deleted file mode 100644
index 2fac9f1f..00000000
--- a/src/network/cookiejar/cookiemodel.cpp
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#include "cookiemodel.h"
-
-#include "cookiejar.h"
-#include "autosaver.h"
-
-#include <qdatetime.h>
-#include <qfontmetrics.h>
-
-CookieModel::CookieModel(CookieJar *cookieJar, QObject *parent)
-    : QAbstractTableModel(parent)
-    , m_cookieJar(cookieJar)
-{
-    connect(m_cookieJar, SIGNAL(cookiesChanged()), this, SLOT(cookiesChanged()));
-    m_cookies = m_cookieJar->cookies();
-}
-
-QVariant CookieModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (role == Qt::SizeHintRole) {
-        QFont font;
-        font.setPointSize(10);
-        QFontMetrics fm(font);
-        int height = fm.height() + fm.height() / 3;
-        int width = fm.horizontalAdvance(headerData(section, orientation, Qt::DisplayRole).toString());
-        return QSize(width, height);
-    }
-
-    if (orientation == Qt::Horizontal) {
-        if (role != Qt::DisplayRole)
-            return QVariant();
-
-        switch (section) {
-        case 0:
-            return tr("Website");
-        case 1:
-            return tr("Name");
-        case 2:
-            return tr("Path");
-        case 3:
-            return tr("Secure");
-        case 4:
-            return tr("Expires");
-        case 5:
-            return tr("Contents");
-        default:
-            return QVariant();
-        }
-    }
-    return QAbstractTableModel::headerData(section, orientation, role);
-}
-
-QVariant CookieModel::data(const QModelIndex &index, int role) const
-{
-    if (index.row() < 0 || index.row() >= m_cookies.size())
-        return QVariant();
-
-    switch (role) {
-    case CookieModel::SortRole:
-    {
-        QNetworkCookie cookie = m_cookies.at(index.row());
-        switch (index.column()) {
-        case 0:
-            return cookie.domain();
-        case 1:
-            return cookie.name();
-        case 2:
-            return cookie.path();
-        case 3:
-            return cookie.isSecure();
-        case 4:
-            return cookie.expirationDate();
-        case 5:
-            return cookie.value();
-        }
-    }
-    case Qt::DisplayRole:
-    case Qt::EditRole: {
-        QNetworkCookie cookie = m_cookies.at(index.row());
-        switch (index.column()) {
-        case 0:
-            return cookie.domain();
-        case 1:
-            return cookie.name();
-        case 2:
-            return cookie.path();
-        case 3:
-            return cookie.isSecure() ? tr("true") : tr("false");
-        case 4:
-            return cookie.isSessionCookie() ? tr("Session cookie") : cookie.expirationDate().toString();
-        case 5:
-            return cookie.value();
-        }
-    }
-    case Qt::FontRole: {
-        QFont font;
-        font.setPointSize(10);
-        return font;
-    }
-    }
-
-    return QVariant();
-}
-
-int CookieModel::columnCount(const QModelIndex &parent) const
-{
-    return (parent.isValid()) ? 0 : 6;
-}
-
-int CookieModel::rowCount(const QModelIndex &parent) const
-{
-    return (parent.isValid() || !m_cookieJar) ? 0 : m_cookies.count();
-}
-
-bool CookieModel::removeRows(int row, int count, const QModelIndex &parent)
-{
-    if (parent.isValid() || !m_cookieJar)
-        return false;
-    int lastRow = row + count - 1;
-    beginRemoveRows(parent, row, lastRow);
-    QList<QNetworkCookie> lst = m_cookies;
-    for (int i = lastRow; i >= row; --i) {
-        lst.removeAt(i);
-    }
-    disconnect(m_cookieJar, SIGNAL(cookiesChanged()), this, SLOT(cookiesChanged()));
-    m_cookieJar->setCookies(lst);
-    connect(m_cookieJar, SIGNAL(cookiesChanged()), this, SLOT(cookiesChanged()));
-
-    m_cookies = lst;
-    endRemoveRows();
-    return true;
-}
-
-void CookieModel::cookiesChanged()
-{
-    beginResetModel();
-    if (m_cookieJar)
-        m_cookies = m_cookieJar->cookies();
-    endResetModel();
-}
diff --git a/src/network/cookiejar/cookiemodel.h b/src/network/cookiejar/cookiemodel.h
deleted file mode 100644
index 585a12c9..00000000
--- a/src/network/cookiejar/cookiemodel.h
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef COOKIEMODEL_H
-#define COOKIEMODEL_H
-
-#include <qabstractitemmodel.h>
-
-#include <qnetworkcookie.h>
-
-class CookieJar;
-class CookieModel : public QAbstractTableModel
-{
-    Q_OBJECT
-
-public:
-    enum DisplayRole
-    {
-        SortRole = Qt::UserRole
-    };
-    CookieModel(CookieJar *jar, QObject *parent = 0);
-    QVariant headerData(int section, Qt::Orientation orientation, int role) const;
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
-
-private slots:
-    void cookiesChanged();
-
-private:
-    QList<QNetworkCookie> m_cookies;
-    CookieJar *m_cookieJar;
-};
-
-#endif // COOKIEMODEL_H
-
diff --git a/src/network/cookiejar/cookies.ui b/src/network/cookiejar/cookies.ui
deleted file mode 100644
index fda5c2d5..00000000
--- a/src/network/cookiejar/cookies.ui
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>CookiesDialog</class>
- <widget class="QDialog" name="CookiesDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>550</width>
-    <height>370</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Cookies</string>
-  </property>
-  <layout class="QGridLayout">
-   <item row="0" column="0">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>252</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="0" column="1">
-    <widget class="SearchLineEdit" name="search"/>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="EditTableView" name="cookiesTable"/>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QPushButton" name="removeButton">
-       <property name="text">
-        <string>&amp;Remove</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="removeAllButton">
-       <property name="text">
-        <string>Remove &amp;All Cookies</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="addRuleButton">
-       <property name="text">
-        <string>Add &amp;Rule</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Close</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SearchLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>searchlineedit.h</header>
-  </customwidget>
-  <customwidget>
-   <class>EditTableView</class>
-   <extends>QTableView</extends>
-   <header>edittableview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>CookiesDialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>472</x>
-     <y>329</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>461</x>
-     <y>356</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/network/cookiejar/cookiesexceptions.ui b/src/network/cookiejar/cookiesexceptions.ui
deleted file mode 100644
index 3d9ef624..00000000
--- a/src/network/cookiejar/cookiesexceptions.ui
+++ /dev/null
@@ -1,184 +0,0 @@
-<ui version="4.0" >
- <class>CookiesExceptionsDialog</class>
- <widget class="QDialog" name="CookiesExceptionsDialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>466</width>
-    <height>446</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Cookie Exceptions</string>
-  </property>
-  <layout class="QVBoxLayout" >
-   <item>
-    <widget class="QGroupBox" name="newExceptionGroupBox" >
-     <property name="title" >
-      <string>New Exception</string>
-     </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" >
-       <layout class="QHBoxLayout" >
-        <item>
-         <widget class="QLabel" name="label" >
-          <property name="text" >
-           <string>Domain:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="domainLineEdit" />
-        </item>
-       </layout>
-      </item>
-      <item row="1" column="0" >
-       <layout class="QHBoxLayout" >
-        <item>
-         <spacer>
-          <property name="orientation" >
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeHint" stdset="0" >
-           <size>
-            <width>81</width>
-            <height>25</height>
-           </size>
-          </property>
-         </spacer>
-        </item>
-        <item>
-         <widget class="QPushButton" name="blockButton" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-          <property name="text" >
-           <string>Block</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="allowForSessionButton" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-          <property name="text" >
-           <string>Allow For Session</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="allowButton" >
-          <property name="enabled" >
-           <bool>false</bool>
-          </property>
-          <property name="text" >
-           <string>Allow</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="ExceptionsGroupBox" >
-     <property name="title" >
-      <string>Exceptions</string>
-     </property>
-     <layout class="QGridLayout" >
-      <item row="0" column="0" colspan="3" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>252</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-      <item row="0" column="3" >
-       <widget class="SearchLineEdit" name="search" />
-      </item>
-      <item row="1" column="0" colspan="4" >
-       <widget class="EditTableView" name="exceptionTable" />
-      </item>
-      <item row="2" column="0" >
-       <widget class="QPushButton" name="removeButton" >
-        <property name="text" >
-         <string>&amp;Remove</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="1" >
-       <widget class="QPushButton" name="removeAllButton" >
-        <property name="text" >
-         <string>Remove &amp;All</string>
-        </property>
-       </widget>
-      </item>
-      <item row="2" column="2" colspan="2" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0" >
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>SearchLineEdit</class>
-   <extends>QLineEdit</extends>
-   <header>searchlineedit.h</header>
-  </customwidget>
-  <customwidget>
-   <class>EditTableView</class>
-   <extends>QTableView</extends>
-   <header>edittableview.h</header>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>CookiesExceptionsDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>381</x>
-     <y>428</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>336</x>
-     <y>443</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/network/cookiejar/networkcookiejar/MOZILLA_LICENSE.txt b/src/network/cookiejar/networkcookiejar/MOZILLA_LICENSE.txt
deleted file mode 100644
index 18f8109b..00000000
--- a/src/network/cookiejar/networkcookiejar/MOZILLA_LICENSE.txt
+++ /dev/null
@@ -1,567 +0,0 @@
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     Once Covered Code has been published under a particular version of the
-     License, You may always continue to use it under the terms of that
-     version. You may also choose to use such Covered Code under the terms
-     of any subsequent version of the License published by Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``The contents of this file are subject to the Mozilla Public License
-     Version 1.1 (the "License"); you may not use this file except in
-     compliance with the License. You may obtain a copy of the License at
-     http://www.mozilla.org/MPL/
-
-     Software distributed under the License is distributed on an "AS IS"
-     basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
-     License for the specific language governing rights and limitations
-     under the License.
-
-     The Original Code is ______________________________________.
-
-     The Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-     ----------------------------------------------------------------------
-
-     AMENDMENTS
-
-     The Netscape Public License Version 1.1 ("NPL") consists of the
-     Mozilla Public License Version 1.1 with the following Amendments,
-     including Exhibit A-Netscape Public License.  Files identified with
-     "Exhibit A-Netscape Public License" are governed by the Netscape
-     Public License Version 1.1.
-
-     Additional Terms applicable to the Netscape Public License.
-          I. Effect.
-          These additional terms described in this Netscape Public
-          License -- Amendments shall apply to the Mozilla Communicator
-          client code and to all Covered Code under this License.
-
-          II. "Netscape's Branded Code" means Covered Code that Netscape
-          distributes and/or permits others to distribute under one or more
-          trademark(s) which are controlled by Netscape but which are not
-          licensed for use under this License.
-
-          III. Netscape and logo.
-          This License does not grant any rights to use the trademarks
-          "Netscape", the "Netscape N and horizon" logo or the "Netscape
-          lighthouse" logo, "Netcenter", "Gecko", "Java" or "JavaScript",
-          "Smart Browsing" even if such marks are included in the Original
-          Code or Modifications.
-
-          IV. Inability to Comply Due to Contractual Obligation.
-          Prior to licensing the Original Code under this License, Netscape
-          has licensed third party code for use in Netscape's Branded Code.
-          To the extent that Netscape is limited contractually from making
-          such third party code available under this License, Netscape may
-          choose to reintegrate such code into Covered Code without being
-          required to distribute such code in Source Code form, even if
-          such code would otherwise be considered "Modifications" under
-          this License.
-
-          V. Use of Modifications and Covered Code by Initial Developer.
-               V.1. In General.
-               The obligations of Section 3 apply to Netscape, except to
-               the extent specified in this Amendment, Section V.2 and V.3.
-
-               V.2. Other Products.
-               Netscape may include Covered Code in products other than the
-               Netscape's Branded Code which are released by Netscape
-               during the two (2) years following the release date of the
-               Original Code, without such additional products becoming
-               subject to the terms of this License, and may license such
-               additional products on different terms from those contained
-               in this License.
-
-               V.3. Alternative Licensing.
-               Netscape may license the Source Code of Netscape's Branded
-               Code, including Modifications incorporated therein, without
-               such Netscape Branded Code becoming subject to the terms of
-               this License, and may license such Netscape Branded Code on
-               different terms from those contained in this License.
-
-          VI. Litigation.
-          Notwithstanding the limitations of Section 11 above, the
-          provisions regarding litigation in Section 11(a), (b) and (c) of
-          the License shall apply to all disputes relating to this License.
-
-     EXHIBIT A-Netscape Public License.
-
-          "The contents of this file are subject to the Netscape Public
-          License Version 1.1 (the "License"); you may not use this file
-          except in compliance with the License. You may obtain a copy of
-          the License at http://www.mozilla.org/NPL/
-
-          Software distributed under the License is distributed on an "AS
-          IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
-          implied. See the License for the specific language governing
-          rights and limitations under the License.
-
-          The Original Code is Mozilla Communicator client code, released
-          March 31, 1998.
-
-          The Initial Developer of the Original Code is Netscape
-          Communications Corporation. Portions created by Netscape are
-          Copyright (C) 1998-1999 Netscape Communications Corporation. All
-          Rights Reserved.
-
-          Contributor(s): ______________________________________.
-
-          Alternatively, the contents of this file may be used under the
-          terms of the _____ license (the "[___] License"), in which case
-          the provisions of [______] License are applicable  instead of
-          those above.  If you wish to allow use of your version of this
-          file only under the terms of the [____] License and not to allow
-          others to use your version of this file under the NPL, indicate
-          your decision by deleting  the provisions above and replace  them
-          with the notice and other provisions required by the [___]
-          License.  If you do not delete the provisions above, a recipient
-          may use your version of this file under either the NPL or the
-          [___] License."
diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp b/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp
deleted file mode 100644
index 30c15a8e..00000000
--- a/src/network/cookiejar/networkcookiejar/networkcookiejar.cpp
+++ /dev/null
@@ -1,372 +0,0 @@
-/*
-   Copyright (C) 2009, Torch Mobile Inc. and Linden Research, Inc. All rights reserved.
-*/
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Torch Mobile Inc. (http://www.torchmobile.com/) code
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#include "networkcookiejar.h"
-#include "networkcookiejar_p.h"
-#include "twoleveldomains_p.h"
-#include <QDataStream>
-
-//#define NETWORKCOOKIEJAR_DEBUG
-
-#ifndef QT_NO_DEBUG
-// ^ Prevent being left on in a released product by accident
-// qDebug any cookies that are rejected for further inspection
-#define NETWORKCOOKIEJAR_LOGREJECTEDCOOKIES
-#include <qdebug.h>
-#endif
-
-#include <qurl.h>
-#include <qdatetime.h>
-
-#if defined(NETWORKCOOKIEJAR_DEBUG)
-#include <qdebug.h>
-#endif
-
-
-NetworkCookieJar::NetworkCookieJar(QObject *parent)
-        : QNetworkCookieJar(parent)
-{
-    d = new NetworkCookieJarPrivate;
-}
-
-NetworkCookieJar::~NetworkCookieJar()
-{
-    delete d;
-}
-
-static QStringList splitHost(const QString &host) {
-    QStringList parts = host.split(QLatin1Char('.'), QString::KeepEmptyParts);
-    // Remove empty components that are on the start and end
-    while (!parts.isEmpty() && parts.last().isEmpty())
-        parts.removeLast();
-    while (!parts.isEmpty() && parts.first().isEmpty())
-        parts.removeFirst();
-    return parts;
-}
-
-inline static bool shorterPaths(const QNetworkCookie &c1, const QNetworkCookie &c2)
-{
-    return c2.path().length() < c1.path().length();
-}
-
-QList<QNetworkCookie> NetworkCookieJar::cookiesForUrl(const QUrl &url) const
-{
-#if defined(NETWORKCOOKIEJAR_DEBUG)
-    qDebug() << "NetworkCookieJar::" << __FUNCTION__ << url;
-#endif
-    // Generate split host
-    QString host = url.host();
-    if (url.scheme().toLower() == QLatin1String("file"))
-        host = QLatin1String("localhost");
-    QStringList urlHost = splitHost(host);
-
-    // Get all the cookies for url
-    QList<QNetworkCookie> cookies = d->tree.find(urlHost);
-    if (urlHost.count() > 2) {
-        int top = 2;
-        if (d->matchesBlacklist(urlHost.last()))
-            top = 3;
-
-        urlHost.removeFirst();
-        while (urlHost.count() >= top) {
-            cookies += d->tree.find(urlHost);
-            urlHost.removeFirst();
-        }
-    }
-
-    // Prevent doing anything expensive in the common case where
-    // there are no cookies to check
-    if (cookies.isEmpty())
-        return cookies;
-
-    QDateTime now = QDateTime::currentDateTime().toTimeSpec(Qt::UTC);
-    const QString urlPath = d->urlPath(url);
-    const bool isSecure = url.scheme().toLower() == QLatin1String("https");
-    QList<QNetworkCookie>::iterator i = cookies.begin();
-    for (; i != cookies.end();) {
-        if (!d->matchingPath(*i, urlPath)) {
-#if defined(NETWORKCOOKIEJAR_DEBUG)
-            qDebug() << __FUNCTION__ << "Ignoring cookie, path does not match" << *i << urlPath;
-#endif
-            i = cookies.erase(i);
-            continue;
-        }
-        if (!isSecure && i->isSecure()) {
-            i = cookies.erase(i);
-#if defined(NETWORKCOOKIEJAR_DEBUG)
-            qDebug() << __FUNCTION__ << "Ignoring cookie, security mismatch"
-                     << *i << !isSecure;
-#endif
-            continue;
-        }
-        if (!i->isSessionCookie() && now > i->expirationDate()) {
-            // remove now (expensive short term) because there will
-            // probably be many more cookiesForUrl calls for this host
-            d->tree.remove(splitHost(i->domain()), *i);
-#if defined(NETWORKCOOKIEJAR_DEBUG)
-            qDebug() << __FUNCTION__ << "Ignoring cookie, expiration issue"
-                     << *i << now;
-#endif
-            i = cookies.erase(i);
-            continue;
-        }
-        ++i;
-    }
-
-    // shorter paths should go first
-    std::sort(cookies.begin(), cookies.end(), shorterPaths);
-#if defined(NETWORKCOOKIEJAR_DEBUG)
-    qDebug() << "NetworkCookieJar::" << __FUNCTION__ << "returning" << cookies.count();
-    qDebug() << cookies;
-#endif
-    return cookies;
-}
-
-static const qint32 NetworkCookieJarMagic = 0xae;
-
-QByteArray NetworkCookieJar::saveState () const
-{
-    int version = 1;
-    QByteArray data;
-    QDataStream stream(&data, QIODevice::WriteOnly);
-
-    stream << qint32(NetworkCookieJarMagic);
-    stream << qint32(version);
-    stream << d->tree;
-    return data;
-}
-
-bool NetworkCookieJar::restoreState(const QByteArray &state)
-{
-    int version = 1;
-    QByteArray sd = state;
-    QDataStream stream(&sd, QIODevice::ReadOnly);
-    if (stream.atEnd())
-        return false;
-    qint32 marker;
-    qint32 v;
-    stream >> marker;
-    stream >> v;
-    if (marker != NetworkCookieJarMagic || v != version)
-        return false;
-    stream >> d->tree;
-    return true;
-}
-
-/*!
-    Remove any session cookies or cookies that have expired.
-  */
-void NetworkCookieJar::endSession()
-{
-    const QList<QNetworkCookie> cookies = d->tree.all();
-    QDateTime now = QDateTime::currentDateTime().toTimeSpec(Qt::UTC);
-    QList<QNetworkCookie>::const_iterator i = cookies.constBegin();
-    for (; i != cookies.constEnd();) {
-        if (i->isSessionCookie()
-            || (!i->isSessionCookie() && now > i->expirationDate())) {
-                d->tree.remove(splitHost(i->domain()), *i);
-        }
-        ++i;
-    }
-}
-
-static const int maxCookiePathLength = 1024;
-
-bool NetworkCookieJar::setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
-{
-#if defined(NETWORKCOOKIEJAR_DEBUG)
-    qDebug() << "NetworkCookieJar::" << __FUNCTION__ << url;
-    qDebug() << cookieList;
-#endif
-    QDateTime now = QDateTime::currentDateTime().toTimeSpec(Qt::UTC);
-    bool changed = false;
-    QString fullUrlPath = url.path();
-    QString defaultPath = fullUrlPath.mid(0, fullUrlPath.lastIndexOf(QLatin1Char('/')) + 1);
-    if (defaultPath.isEmpty())
-        defaultPath = QLatin1Char('/');
-
-    QString urlPath = d->urlPath(url);
-    foreach (QNetworkCookie cookie, cookieList) {
-        if (cookie.path().length() > maxCookiePathLength)
-            continue;
-
-        bool alreadyDead = !cookie.isSessionCookie() && cookie.expirationDate() < now;
-
-        if (cookie.path().isEmpty()) {
-            cookie.setPath(defaultPath);
-        }
-        // Matching the behavior of Firefox, no path checking is done when setting cookies
-        // Safari does something even odder, when that paths don't match it keeps
-        // the cookie, but changes the paths to the default path
-#if 0
-        else if (!d->matchingPath(cookie, urlPath)) {
-#ifdef NETWORKCOOKIEJAR_LOGREJECTEDCOOKIES
-            qDebug() << "NetworkCookieJar::" << __FUNCTION__
-                     << "Blocked cookie because: path doesn't match: " << cookie << url;
-#endif
-            continue;
-        }
-#endif
-
-        if (cookie.domain().isEmpty()) {
-            QString host = url.host().toLower();
-            if (host.isEmpty())
-                continue;
-            cookie.setDomain(host);
-        } else if (!d->matchingDomain(cookie, url)) {
-#ifdef NETWORKCOOKIEJAR_LOGREJECTEDCOOKIES
-            qDebug() << "NetworkCookieJar::" << __FUNCTION__
-                     << "Blocked cookie because: domain doesn't match: " << cookie << url;
-#endif
-            continue;
-        }
-
-        // replace/remove existing cookies
-        QString domain = cookie.domain();
-        Q_ASSERT(!domain.isEmpty());
-        QStringList urlHost = splitHost(domain);
-
-        QList<QNetworkCookie> cookies = d->tree.find(urlHost);
-        QList<QNetworkCookie>::const_iterator it = cookies.constBegin();
-        for (; it != cookies.constEnd(); ++it) {
-            if (cookie.name() == it->name() &&
-                cookie.domain() == it->domain() &&
-                cookie.path() == it->path()) {
-                d->tree.remove(urlHost, *it);
-                break;
-            }
-        }
-
-        if (alreadyDead)
-            continue;
-
-        changed = true;
-        d->tree.insert(urlHost, cookie);
-    }
-
-    return changed;
-}
-
-QList<QNetworkCookie> NetworkCookieJar::allCookies() const
-{
-#if defined(NETWORKCOOKIEJAR_DEBUG)
-    qDebug() << "NetworkCookieJar::" << __FUNCTION__;
-#endif
-    return d->tree.all();
-}
-
-void NetworkCookieJar::setAllCookies(const QList<QNetworkCookie> &cookieList)
-{
-#if defined(NETWORKCOOKIEJAR_DEBUG)
-    qDebug() << "NetworkCookieJar::" << __FUNCTION__ << cookieList.count();
-#endif
-    d->tree.clear();
-    foreach (const QNetworkCookie &cookie, cookieList) {
-        QString domain = cookie.domain();
-        d->tree.insert(splitHost(domain), cookie);
-    }
-}
-
-QString NetworkCookieJarPrivate::urlPath(const QUrl &url) const
-{
-    QString urlPath = url.path();
-    if (!urlPath.endsWith(QLatin1Char('/')))
-        urlPath += QLatin1Char('/');
-    return urlPath;
-}
-
-bool NetworkCookieJarPrivate::matchingPath(const QNetworkCookie &cookie, const QString &urlPath) const
-{
-    QString cookiePath = cookie.path();
-    if (!cookiePath.endsWith(QLatin1Char('/')))
-        cookiePath += QLatin1Char('/');
-
-    return urlPath.startsWith(cookiePath);
-}
-
-bool NetworkCookieJarPrivate::matchesBlacklist(const QString &string) const
-{
-    if (!setSecondLevelDomain) {
-        // Alternatively to save a little bit of ram we could just
-        // use bsearch on twoLevelDomains in place
-        for (int j = 0; twoLevelDomains[j]; ++j)
-            secondLevelDomains += QLatin1String(twoLevelDomains[j]);
-        setSecondLevelDomain = true;
-    }
-    QStringList::const_iterator i =
-         std::lower_bound(secondLevelDomains.constBegin(), secondLevelDomains.constEnd(), string);
-        return (i != secondLevelDomains.constEnd());
-}
-
-bool NetworkCookieJarPrivate::matchingDomain(const QNetworkCookie &cookie, const QUrl &url) const
-{
-    QString domain = cookie.domain().simplified().toLower();
-    domain.remove(QLatin1Char(' '));
-    QStringList parts = splitHost(domain);
-    if (parts.isEmpty())
-        return false;
-
-    // When there is only one part only file://localhost/ is accepted
-    if (parts.count() == 1) {
-        QString s = parts.first();
-        if (parts.first() != QLatin1String("localhost"))
-            return false;
-        if (url.scheme().toLower() == QLatin1String("file"))
-            return true;
-    }
-
-    // Check for blacklist
-    if (parts.count() == 2 && matchesBlacklist(parts.last()))
-        return false;
-
-    QStringList urlParts = url.host().toLower().split(QLatin1Char('.'), QString::SkipEmptyParts);
-    if (urlParts.isEmpty())
-        return false;
-    while (urlParts.count() > parts.count())
-        urlParts.removeFirst();
-
-    for (int j = 0; j < urlParts.count(); ++j) {
-        if (urlParts.at(j) != parts.at(j)) {
-            return false;
-        }
-    }
-
-    return true;
-}
-
-void NetworkCookieJar::setSecondLevelDomains(const QStringList &secondLevelDomains)
-{
-    d->setSecondLevelDomain = true;
-    d->secondLevelDomains = secondLevelDomains;
-    std::sort(d->secondLevelDomains.begin(), d->secondLevelDomains.end());
-}
diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.h b/src/network/cookiejar/networkcookiejar/networkcookiejar.h
deleted file mode 100644
index fd516207..00000000
--- a/src/network/cookiejar/networkcookiejar/networkcookiejar.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-   Copyright (C) 2009, Torch Mobile Inc. and Linden Research, Inc. All rights reserved.
-*/
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Torch Mobile Inc. (http://www.torchmobile.com/) code
- *
- * The Initial Developer of the Original Code is:
- *   Aaron Dewes (aaron.dewes@web.de)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef NETWORKCOOKIEJAR_H
-#define NETWORKCOOKIEJAR_H
-
-#include <QNetworkCookieJar>
-
-class NetworkCookieJarPrivate;
-class NetworkCookieJar : public QNetworkCookieJar {
-    Q_OBJECT
-public:
-    NetworkCookieJar(QObject *parent = 0);
-    ~NetworkCookieJar();
-
-    virtual QList<QNetworkCookie> cookiesForUrl(const QUrl & url) const;
-    virtual bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url);
-
-protected:
-    QByteArray saveState() const;
-    bool restoreState(const QByteArray &state);
-    void endSession();
-
-    QList<QNetworkCookie> allCookies() const;
-    void setAllCookies(const QList<QNetworkCookie> &cookieList);
-    void setSecondLevelDomains(const QStringList &secondLevelDomains);
-
-private:
-    NetworkCookieJarPrivate *d;
-};
-
-#endif
-
diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar.pri b/src/network/cookiejar/networkcookiejar/networkcookiejar.pri
deleted file mode 100644
index 8b150bf1..00000000
--- a/src/network/cookiejar/networkcookiejar/networkcookiejar.pri
+++ /dev/null
@@ -1,6 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += trie_p.h networkcookiejar.h twoleveldomains_p.h networkcookiejar_p.h
-SOURCES += networkcookiejar.cpp
diff --git a/src/network/cookiejar/networkcookiejar/networkcookiejar_p.h b/src/network/cookiejar/networkcookiejar/networkcookiejar_p.h
deleted file mode 100644
index 5847207b..00000000
--- a/src/network/cookiejar/networkcookiejar/networkcookiejar_p.h
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-   Copyright (C) 2009, Torch Mobile Inc. and Linden Research, Inc. All rights reserved.
-*/
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Torch Mobile Inc. (http://www.torchmobile.com/) code
- *
- * The Initial Developer of the Original Code is:
- *   Aaron Dewes (aaron.dewes@web.de)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef NETWORKCOOKIEJARPRIVATE_H
-#define NETWORKCOOKIEJARPRIVATE_H
-
-#include "trie_p.h"
-#include <QNetworkCookie>
-
-QT_BEGIN_NAMESPACE
-QDataStream &operator<<(QDataStream &stream, const QNetworkCookie &cookie)
-{
-    stream << cookie.toRawForm();
-    return stream;
-}
-
-QDataStream &operator>>(QDataStream &stream, QNetworkCookie &cookie)
-{
-    QByteArray value;
-    stream >> value;
-    QList<QNetworkCookie> newCookies = QNetworkCookie::parseCookies(value);
-    if (!newCookies.isEmpty())
-        cookie = newCookies.first();
-    return stream;
-}
-QT_END_NAMESPACE
-
-class NetworkCookieJarPrivate {
-public:
-    NetworkCookieJarPrivate()
-        : setSecondLevelDomain(false)
-    {}
-
-    Trie<QNetworkCookie> tree;
-    mutable bool setSecondLevelDomain;
-    mutable QStringList secondLevelDomains;
-
-    bool matchesBlacklist(const QString &string) const;
-    bool matchingDomain(const QNetworkCookie &cookie, const QUrl &url) const;
-    QString urlPath(const QUrl &url) const;
-    bool matchingPath(const QNetworkCookie &cookie, const QString &urlPath) const;
-};
-
-#endif
-
diff --git a/src/network/cookiejar/networkcookiejar/trie_p.h b/src/network/cookiejar/networkcookiejar/trie_p.h
deleted file mode 100644
index 72f1b77d..00000000
--- a/src/network/cookiejar/networkcookiejar/trie_p.h
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
-   Copyright (C) 2009, Torch Mobile Inc. and Linden Research, Inc. All rights reserved.
-*/
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Torch Mobile Inc. (http://www.torchmobile.com/) code
- *
- * The Initial Developer of the Original Code is:
- *   Aaron Dewes (aaron.dewes@web.de)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-#ifndef TRIE_H
-#define TRIE_H
-
-//#define TRIE_DEBUG
-
-#include <qstringlist.h>
-
-#if defined(TRIE_DEBUG)
-#include <qdebug.h>
-#endif
-
-/*
-    A Trie tree (prefix tree) where the lookup takes m in the worst case.
-
-    The key is stored in _reverse_ order
-
-    Example:
-    Keys: x,a y,a
-
-    Trie:
-    a
-    | \
-    x  y
-*/
-
-template<class T>
-class Trie {
-public:
-    Trie();
-    ~Trie();
-
-    void clear();
-    void insert(const QStringList &key, const T &value);
-    bool remove(const QStringList &key, const T &value);
-    QList<T> find(const QStringList &key) const;
-    QList<T> all() const;
-
-    inline bool contains(const QStringList &key) const;
-    inline bool isEmpty() const { return children.isEmpty() && values.isEmpty(); }
-
-private:
-    const Trie<T>* walkTo(const QStringList &key) const;
-    Trie<T>* walkTo(const QStringList &key, bool create = false);
-
-    template<class T1> friend QDataStream &operator<<(QDataStream &, const Trie<T1>&);
-    template<class T1> friend QDataStream &operator>>(QDataStream &, Trie<T1>&);
-
-    QList<T> values;
-    QStringList childrenKeys;
-    QList<Trie<T> > children;
-};
-
-template<class T>
-Trie<T>::Trie() {
-}
-
-template<class T>
-Trie<T>::~Trie() {
-}
-
-template<class T>
-void Trie<T>::clear() {
-#if defined(TRIE_DEBUG)
-    qDebug() << "Trie::" << __FUNCTION__;
-#endif
-    values.clear();
-    childrenKeys.clear();
-    children.clear();
-}
-
-template<class T>
-bool Trie<T>::contains(const QStringList &key) const {
-    return walkTo(key);
-}
-
-template<class T>
-void Trie<T>::insert(const QStringList &key, const T &value) {
-#if defined(TRIE_DEBUG)
-    qDebug() << "Trie::" << __FUNCTION__ << key << value;
-#endif
-    Trie<T> *node = walkTo(key, true);
-    if (node)
-        node->values.append(value);
-}
-
-template<class T>
-bool Trie<T>::remove(const QStringList &key, const T &value) {
-#if defined(TRIE_DEBUG)
-    qDebug() << "Trie::" << __FUNCTION__ << key << value;
-#endif
-    Trie<T> *node = walkTo(key, true);
-    if (node) {
-        bool removed = node->values.removeOne(value);
-        if (!removed)
-            return false;
-
-        // A faster implementation of removing nodes up the tree
-        // can be created if profile shows this to be slow
-        QStringList subKey = key;
-        while (node->values.isEmpty()
-               && node->children.isEmpty()
-               && !subKey.isEmpty()) {
-            QString currentLevelKey = subKey.first();
-            QStringList parentKey = subKey.mid(1);
-            Trie<T> *parent = walkTo(parentKey, false);
-            Q_ASSERT(parent);
-            QStringList::iterator iterator;
-            iterator = std::lower_bound(parent->childrenKeys.begin(),
-                                   parent->childrenKeys.end(),
-                                   currentLevelKey);
-            Q_ASSERT(iterator != parent->childrenKeys.end());
-            int index = iterator - parent->childrenKeys.begin();
-            parent->children.removeAt(index);
-            parent->childrenKeys.removeAt(index);
-
-            node = parent;
-            subKey = parentKey;
-        }
-        return removed;
-    }
-    return false;
-}
-
-template<class T>
-QList<T> Trie<T>::find(const QStringList &key) const {
-#if defined(TRIE_DEBUG)
-    qDebug() << "Trie::" << __FUNCTION__ << key;
-#endif
-    const Trie<T> *node = walkTo(key);
-    if (node)
-        return node->values;
-    return QList<T>();
-}
-
-template<class T>
-QList<T> Trie<T>::all() const {
-#if defined(TRIE_DEBUG)
-    qDebug() << "Trie::" << __FUNCTION__;
-#endif
-    QList<T> all = values;
-    for (int i = 0; i < children.count(); ++i)
-        all += children[i].all();
-    return all;
-}
-
-template<class T>
-QDataStream &operator<<(QDataStream &out, const Trie<T>&trie) {
-    out << trie.values;
-    out << trie.childrenKeys;
-    out << trie.children;
-    Q_ASSERT(trie.childrenKeys.count() == trie.children.count());
-    return out;
-}
-
-template<class T>
-QDataStream &operator>>(QDataStream &in, Trie<T> &trie) {
-    trie.clear();
-    in >> trie.values;
-    in >> trie.childrenKeys;
-    in >> trie.children;
-    Q_ASSERT(trie.childrenKeys.count() == trie.children.count());
-    return in;
-}
-
-// Very fast const walk
-template<class T>
-const Trie<T>* Trie<T>::walkTo(const QStringList &key) const {
-    const Trie<T> *node = this;
-    QStringList::const_iterator childIterator;
-    QStringList::const_iterator begin, end;
-
-    int depth = key.count() - 1;
-    while (depth >= 0) {
-        const QString currentLevelKey = key.at(depth--);
-        begin = node->childrenKeys.constBegin();
-        end = node->childrenKeys.constEnd();
-        childIterator = std::lower_bound(begin, end, currentLevelKey);
-        if (childIterator == end)
-            return 0;
-        node = &node->children.at(childIterator - begin);
-    }
-    return node;
-}
-
-template<class T>
-Trie<T>* Trie<T>::walkTo(const QStringList &key, bool create) {
-    QStringList::iterator iterator;
-    Trie<T> *node = this;
-    QStringList::iterator begin, end;
-    int depth = key.count() - 1;
-    while (depth >= 0) {
-        const QString currentLevelKey = key.at(depth--);
-        begin = node->childrenKeys.begin();
-        end = node->childrenKeys.end();
-        iterator = std::lower_bound(begin, end, currentLevelKey);
-#if defined(TRIE_DEBUG)
-        qDebug() << "\t" << node << key << currentLevelKey << node->childrenKeys;
-#endif
-        int index = -1;
-        if (iterator == end) {
-            if (!create)
-                return 0;
-            iterator = std::lower_bound(begin,
-                                   end,
-                                   currentLevelKey);
-            index = iterator - begin;
-            node->childrenKeys.insert(iterator, currentLevelKey);
-            node->children.insert(index, Trie<T>());
-        } else {
-            index = iterator - begin;
-        }
-        Q_ASSERT(index >= 0 && index < node->children.count());
-        node = &node->children[index];
-    }
-    return node;
-}
-
-#endif
-
diff --git a/src/network/cookiejar/networkcookiejar/twoleveldomains_p.h b/src/network/cookiejar/networkcookiejar/twoleveldomains_p.h
deleted file mode 100644
index cf11ef70..00000000
--- a/src/network/cookiejar/networkcookiejar/twoleveldomains_p.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-   Copyright (C) 2009, Torch Mobile Inc. and Linden Research, Inc. All rights reserved.
-*/
-
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is Torch Mobile Inc. (http://www.torchmobile.com/) code
- *
- * The Initial Developer of the Original Code is:
- *   Aaron Dewes (aaron.dewes@web.de)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// Updated from https://wiki.mozilla.org/TLD_List#External_Links
-// To set a custom list use NetworkCookieJar::setSecondLevelDomains()
-static const char *const twoLevelDomains[] = {
-    "ao",
-    "ar",
-    "arpa",
-    "bd",
-    "bn",
-    "br",
-    "co",
-    "cr",
-    "cy",
-    "do",
-    "eg",
-    "et",
-    "fj",
-    "fk",
-    "gh",
-    "gn",
-    "gu",
-    "id",
-    "il",
-    "jm",
-    "ke",
-    "kh",
-    "ki",
-    "kw",
-    "kz",
-    "lb",
-    "lc",
-    "lr",
-    "ls",
-    "ml",
-    "mm",
-    "mv",
-    "mw",
-    "mx",
-    "my",
-    "ng",
-    "ni",
-    "np",
-    "nz",
-    "om",
-    "pa",
-    "pe",
-    "pg",
-    "pw",
-    "py",
-    "qa",
-    "sa",
-    "sb",
-    "sv",
-    "sy",
-    "th",
-    "tn",
-    "tz",
-    "uk",
-    "uy",
-    "va",
-    "ve",
-    "ye",
-    "yu",
-    "za",
-    "zm",
-    "zw",
-    0
-};
diff --git a/src/network/fileaccesshandler.cpp b/src/network/fileaccesshandler.cpp
deleted file mode 100644
index de65abe7..00000000
--- a/src/network/fileaccesshandler.cpp
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * Copyright 2009 Jonas Gehring <jonas.gehring@boolsoft.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "fileaccesshandler.h"
-
-#include <qapplication.h>
-#include <qcryptographichash.h>
-#include <qdatetime.h>
-#include <qdir.h>
-#include <qfileiconprovider.h>
-#include <qhash.h>
-#include <qstyle.h>
-#include <qtextstream.h>
-#include <qtimer.h>
-#include <qwebsettings.h>
-
-FileAccessHandler::FileAccessHandler(QObject *parent)
-    : SchemeAccessHandler(parent)
-{
-}
-
-QNetworkReply *FileAccessHandler::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
-{
-    Q_UNUSED(outgoingData);
-
-    switch (op) {
-    case QNetworkAccessManager::GetOperation:
-        break;
-    default:
-        return 0;
-    }
-
-    // This handler can only list directories yet, so pass anything
-    // else back to the manager
-    QString path = request.url().toLocalFile();
-    if (!QFileInfo(path).isDir()) {
-        return 0;
-    }
-
-    FileAccessReply *reply = new FileAccessReply(request, this);
-    return reply;
-}
-
-
-FileAccessReply::FileAccessReply(const QNetworkRequest &request, QObject *parent)
-    : QNetworkReply(parent)
-{
-    setOperation(QNetworkAccessManager::GetOperation);
-    setRequest(request);
-    setUrl(request.url());
-
-    buffer.open(QIODevice::ReadWrite);
-    setError(QNetworkReply::NoError, tr("No Error"));
-
-    QTimer::singleShot(0, this, SLOT(listDirectory()));
-
-    open(QIODevice::ReadOnly);
-}
-
-FileAccessReply::~FileAccessReply()
-{
-    close();
-}
-
-qint64 FileAccessReply::bytesAvailable() const
-{
-    return buffer.bytesAvailable() + QNetworkReply::bytesAvailable();
-}
-
-void FileAccessReply::close()
-{
-    buffer.close();
-}
-
-static QString cssLinkClass(const QIcon &icon, int size = 32)
-{
-    // The CSS class generation is a bit tricky, because QIcon/QPixmap's
-    // cacheKey() returns the different values for the same icons on my Windows
-    // box (tested with XP). Thus, the checksum of the actual text of the CSS class
-    // is used for the class name.
-    QString data = QLatin1String("a.%3 {\n\
-  padding-left: %1px;\n\
-  background: transparent url(data:image/png;base64,%2) no-repeat center left;\n\
-  font-weight: bold;\n\
-}\n");
-    QPixmap pixmap = icon.pixmap(QSize(size, size));
-    QBuffer imageBuffer;
-    imageBuffer.open(QBuffer::ReadWrite);
-    if (!pixmap.save(&imageBuffer, "PNG")) {
-        // If an error occured, write a blank pixmap
-        pixmap = QPixmap(size, size);
-        pixmap.fill(Qt::transparent);
-        imageBuffer.buffer().clear();
-        pixmap.save(&imageBuffer, "PNG");
-    }
-    return data.arg(size+4).arg(QLatin1String(imageBuffer.buffer().toBase64()));
-}
-
-void FileAccessReply::listDirectory()
-{
-    QDir dir(url().toLocalFile());
-    if (!dir.exists()) {
-        setError(QNetworkReply::ContentNotFoundError, tr("Error opening: %1: No such file or directory").arg(dir.absolutePath()));
-        emit error(QNetworkReply::ContentNotFoundError);
-        emit finished();
-        return;
-    }
-    if (!dir.isReadable()) {
-        setError(QNetworkReply::ContentAccessDenied, tr("Unable to read %1").arg(dir.absolutePath()));
-        emit error(QNetworkReply::ContentAccessDenied);
-        emit finished();
-        return;
-    }
-
-    // Format a html page for the directory contents
-    QFile dirlistFile(QLatin1String(":/dirlist.html"));
-    if (!dirlistFile.open(QIODevice::ReadOnly))
-        return;
-    QString html = QLatin1String(dirlistFile.readAll());
-    html = html.arg(dir.absolutePath(), tr("Contents of %1").arg(dir.absolutePath()));
-
-    // Templates for the listing
-    QString link = QLatin1String("<a class=\"%1\" href=\"%2\">%3</a>");
-    QString row = QLatin1String("<tr%1> <td class=\"name\">%2</td> <td class=\"size\">%3</td> <td class=\"modified\">%4</td> </tr>\n");
-
-    QFileIconProvider iconProvider;
-    QHash<QString, bool> existingClasses;
-    int iconSize = QWebSettings::globalSettings()->fontSize(QWebSettings::DefaultFontSize);
-    QFileInfoList list = dir.entryInfoList(QDir::AllEntries | QDir::Hidden, QDir::Name | QDir::DirsFirst);
-    QString dirlist, classes;
-
-    // Write link to parent directory first
-    if (!dir.isRoot()) {
-        QIcon icon = qApp->style()->standardIcon(QStyle::SP_FileDialogToParent);
-        classes += cssLinkClass(icon, iconSize).arg(QLatin1String("link_parent"));
-
-        QString addr = QString::fromUtf8(QUrl::fromLocalFile(QFileInfo(dir.absoluteFilePath(QLatin1String(".."))).canonicalFilePath()).toEncoded());
-        QString size, modified; // Empty by intention
-        dirlist += row.arg(QString()).arg(link.arg(QLatin1String("link_parent")).arg(addr).arg(QLatin1String(".."))).arg(size).arg(modified);
-    }
-
-    for (int i = 0; i < list.count(); ++i) {
-        // Skip '.' and '..'
-        if (list[i].fileName() == QLatin1String(".") || list[i].fileName() == QLatin1String("..")) {
-            continue;
-        }
-
-        // Fetch file icon and generate a corresponding CSS class if neccessary
-        QIcon icon = iconProvider.icon(list[i]);
-        QString cssClass = cssLinkClass(icon, iconSize);
-        QByteArray cssData = cssClass.toLatin1();
-        QString className = QString(QLatin1String("link_%1")).arg(QLatin1String(QCryptographicHash::hash(cssData, QCryptographicHash::Md4).toHex()));
-        if (!existingClasses.contains(className)) {
-            classes += cssClass.arg(className);
-            existingClasses.insert(className, true);
-        }
-
-        QString addr = QString::fromUtf8(QUrl::fromLocalFile(list[i].canonicalFilePath()).toEncoded());
-        QString size, modified;
-        if (list[i].fileName() != QLatin1String("..")) {
-            if (list[i].isFile())
-                size = tr("%1 KB").arg(QString::number(list[i].size()/1024));
-            modified = list[i].lastModified().toString(Qt::SystemLocaleShortDate);
-        }
-
-        QString classes;
-        if (list[i].isHidden())
-            classes = QLatin1String(" class=\"hidden\"");
-        dirlist += row.arg(classes).arg(link.arg(className).arg(addr).arg(list[i].fileName())).arg(size).arg(modified);
-    }
-
-    html = html.arg(classes).arg(dirlist).arg(tr("Show Hidden Files"));
-
-    // Save result to buffer
-    QTextStream stream(&buffer);
-    stream << html;
-    stream.flush();
-    buffer.reset();
-
-    // Publish result
-    setHeader(QNetworkRequest::ContentTypeHeader, QByteArray("text/html"));
-    setHeader(QNetworkRequest::ContentLengthHeader, buffer.bytesAvailable());
-    setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 200);
-    setAttribute(QNetworkRequest::HttpReasonPhraseAttribute, QByteArray("Ok"));
-    emit metaDataChanged();
-    emit downloadProgress(buffer.size(), buffer.size());
-    QNetworkReply::NetworkError errorCode = error();
-    if (errorCode != QNetworkReply::NoError) {
-        emit error(errorCode);
-    } else if (buffer.size() > 0) {
-        emit readyRead();
-    }
-
-    emit finished();
-}
-
-qint64 FileAccessReply::readData(char *data, qint64 maxSize)
-{
-    return buffer.read(data, maxSize);
-}
diff --git a/src/network/fileaccesshandler.h b/src/network/fileaccesshandler.h
deleted file mode 100644
index 1c887ff3..00000000
--- a/src/network/fileaccesshandler.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright 2009 Jonas Gehring <jonas.gehring@boolsoft.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef FILEACCESSHANDLER_H
-#define FILEACCESSHANDLER_H
-
-#include "schemeaccesshandler.h"
-
-#include <qbuffer.h>
-#include <qnetworkreply.h>
-
-class FileAccessHandler : public SchemeAccessHandler
-{
-public:
-    FileAccessHandler(QObject *parent = 0);
-
-    virtual QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0);
-};
-
-class FileAccessReply : public QNetworkReply
-{
-    Q_OBJECT
-
-public:
-    FileAccessReply(const QNetworkRequest &request, QObject *parent = 0);
-    ~FileAccessReply();
-
-    virtual qint64 bytesAvailable() const;
-    virtual void abort() { };
-    virtual void close();
-
-protected:
-    virtual qint64 readData(char *data, qint64 maxSize);
-
-private slots:
-    void listDirectory();
-
-private:
-    QBuffer buffer;
-};
-
-#endif // FILEACCESSHANDLER_H
diff --git a/src/network/network.pri b/src/network/network.pri
deleted file mode 100644
index a6c7a30c..00000000
--- a/src/network/network.pri
+++ /dev/null
@@ -1,23 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-FORMS += \
-    passworddialog.ui \
-    proxy.ui
-
-HEADERS += \
-    fileaccesshandler.h \
-    networkaccessmanager.h \
-    networkdiskcache.h \
-    networkproxyfactory.h \
-    schemeaccesshandler.h
-
-SOURCES += \
-    fileaccesshandler.cpp \
-    networkaccessmanager.cpp \
-    networkdiskcache.cpp \
-    networkproxyfactory.cpp \
-    schemeaccesshandler.cpp
-
-include(cookiejar/cookiejar.pri)
diff --git a/src/network/networkaccessmanager.cpp b/src/network/networkaccessmanager.cpp
deleted file mode 100644
index 840ef3c3..00000000
--- a/src/network/networkaccessmanager.cpp
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#include "networkaccessmanager.h"
-
-#include "adblockmanager.h"
-#include "adblocknetwork.h"
-#include "adblockschemeaccesshandler.h"
-#include "acceptlanguagedialog.h"
-#include "autofillmanager.h"
-#include "browserapplication.h"
-#include "browsermainwindow.h"
-#include "cookiejar.h"
-#include "schemeaccesshandler.h"
-#include "fileaccesshandler.h"
-#include "networkproxyfactory.h"
-#include "networkdiskcache.h"
-#include "ui_passworddialog.h"
-#include "ui_proxy.h"
-
-#include <qdialog.h>
-#include <qmessagebox.h>
-#include <qsettings.h>
-#include <qstyle.h>
-#include <qtextdocument.h>
-
-#include <qauthenticator.h>
-#include <qsslconfiguration.h>
-#include <qsslerror.h>
-#include <qdatetime.h>
-
-// #define NETWORKACCESSMANAGER_DEBUG
-
-NetworkAccessManager::NetworkAccessManager(QObject *parent)
-    : NetworkAccessManagerProxy(parent)
-    , m_adblockNetwork(0)
-{
-    connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
-            SLOT(authenticationRequired(QNetworkReply*, QAuthenticator*)));
-    connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
-            SLOT(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
-#ifndef QT_NO_OPENSSL
-    connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
-            SLOT(sslErrors(QNetworkReply*, const QList<QSslError>&)));
-#endif
-    connect(BrowserApplication::instance(), SIGNAL(privacyChanged(bool)),
-            this, SLOT(privacyChanged(bool)));
-    loadSettings();
-
-    // Register custom scheme handlers
-    setSchemeHandler(QLatin1String("file"), new FileAccessHandler(this));
-    setSchemeHandler(QLatin1String("abp"), new AdBlockSchemeAccessHandler(this));
-    setCookieJar(new CookieJar);
-}
-
-void NetworkAccessManager::privacyChanged(bool isPrivate)
-{
-    // Create a new CookieJar that has the privacy flag set so the old cookies
-    // are not loaded and the cookies are not saved on exit
-    if (isPrivate) {
-        CookieJar *cookieJar = new CookieJar;
-        cookieJar->setPrivate(isPrivate);
-        setCookieJar(cookieJar);
-    } else {
-        // it will delete the old one
-        setCookieJar(new CookieJar);
-    }
-}
-
-void NetworkAccessManager::setSchemeHandler(const QString &scheme, SchemeAccessHandler *handler)
-{
-    m_schemeHandlers.insert(scheme, handler);
-}
-
-void NetworkAccessManager::loadSettings()
-{
-    QSettings settings;
-    settings.beginGroup(QLatin1String("proxy"));
-    QNetworkProxy proxy;
-    if (settings.value(QLatin1String("enabled"), false).toBool()) {
-        int proxyType = settings.value(QLatin1String("type"), 0).toInt();
-        if (proxyType == 0)
-            proxy = QNetworkProxy::Socks5Proxy;
-        else if (proxyType == 1)
-            proxy = QNetworkProxy::HttpProxy;
-        else { // 2
-            proxy.setType(QNetworkProxy::HttpCachingProxy);
-            proxy.setCapabilities(QNetworkProxy::CachingCapability | QNetworkProxy::HostNameLookupCapability);
-        }
-        proxy.setHostName(settings.value(QLatin1String("hostName")).toString());
-        proxy.setPort(settings.value(QLatin1String("port"), 1080).toInt());
-        proxy.setUser(settings.value(QLatin1String("userName")).toString());
-        proxy.setPassword(settings.value(QLatin1String("password")).toString());
-    }
-    NetworkProxyFactory *proxyFactory = new NetworkProxyFactory;
-    if (proxy.type() == QNetworkProxy::HttpCachingProxy) {
-        proxyFactory->setHttpProxy(proxy);
-        proxyFactory->setGlobalProxy(QNetworkProxy::DefaultProxy);
-    } else {
-        proxyFactory->setHttpProxy(QNetworkProxy::DefaultProxy);
-        proxyFactory->setGlobalProxy(proxy);
-    }
-    setProxyFactory(proxyFactory);
-    settings.endGroup();
-
-#ifndef QT_NO_OPENSSL
-    QSslConfiguration sslCfg = QSslConfiguration::defaultConfiguration();
-    sslCfg.setCaCertificates(sslCfg.systemCaCertificates());
-    QList<QSslCertificate> ca_list = sslCfg.caCertificates();
-    QList<QSslCertificate> ca_new = QSslCertificate::fromData(settings.value(QLatin1String("CaCertificates")).toByteArray());
-    ca_list += ca_new;
-    sslCfg.setCaCertificates(ca_list);
-    sslCfg.setProtocol(QSsl::AnyProtocol);
-    QSslConfiguration::setDefaultConfiguration(sslCfg);
-#endif
-
-    settings.beginGroup(QLatin1String("network"));
-    QStringList acceptList = settings.value(QLatin1String("acceptLanguages"),
-            AcceptLanguageDialog::defaultAcceptList()).toStringList();
-    m_acceptLanguage = AcceptLanguageDialog::httpString(acceptList);
-
-    bool cacheEnabled = settings.value(QLatin1String("cacheEnabled"), true).toBool();
-
-    if (cacheEnabled) {
-        NetworkDiskCache *diskCache;
-        if (cache())
-            diskCache = qobject_cast<NetworkDiskCache*>(cache());
-        else
-            diskCache = new NetworkDiskCache(this);
-        setCache(diskCache);
-        diskCache->loadSettings();
-    } else {
-        setCache(0);
-    }
-    settings.endGroup();
-}
-
-void NetworkAccessManager::authenticationRequired(QNetworkReply *reply, QAuthenticator *auth)
-{
-#ifdef NETWORKACCESSMANAGER_DEBUG
-    qDebug() << __FUNCTION__ << reply;
-#endif
-    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
-
-    QDialog dialog(mainWindow);
-    dialog.setWindowFlags(Qt::Sheet);
-
-    Ui::PasswordDialog passwordDialog;
-    passwordDialog.setupUi(&dialog);
-
-    passwordDialog.iconLabel->setText(QString());
-    passwordDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
-
-    QString introMessage = tr("<qt>Enter username and password for \"%1\" at %2</qt>");
-    introMessage = introMessage.arg(QString(auth->realm()).toHtmlEscaped().arg(reply->url().toString().toHtmlEscaped()));
-    passwordDialog.introLabel->setText(introMessage);
-    passwordDialog.introLabel->setWordWrap(true);
-
-    if (dialog.exec() == QDialog::Accepted) {
-        auth->setUser(passwordDialog.userNameLineEdit->text());
-        auth->setPassword(passwordDialog.passwordLineEdit->text());
-    }
-}
-
-void NetworkAccessManager::proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth)
-{
-#ifdef NETWORKACCESSMANAGER_DEBUG
-    qDebug() << __FUNCTION__;
-#endif
-    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
-
-    QDialog dialog(mainWindow);
-    dialog.setWindowFlags(Qt::Sheet);
-
-    Ui::ProxyDialog proxyDialog;
-    proxyDialog.setupUi(&dialog);
-
-    proxyDialog.iconLabel->setText(QString());
-    proxyDialog.iconLabel->setPixmap(mainWindow->style()->standardIcon(QStyle::SP_MessageBoxQuestion, 0, mainWindow).pixmap(32, 32));
-
-    QString introMessage = tr("<qt>Connect to proxy \"%1\" using:</qt>");
-    introMessage = introMessage.arg(QString(proxy.hostName()).toHtmlEscaped());
-    proxyDialog.introLabel->setText(introMessage);
-    proxyDialog.introLabel->setWordWrap(true);
-
-    if (dialog.exec() == QDialog::Accepted) {
-        auth->setUser(proxyDialog.userNameLineEdit->text());
-        auth->setPassword(proxyDialog.passwordLineEdit->text());
-    }
-}
-
-#ifndef QT_NO_OPENSSL
-QString NetworkAccessManager::certToFormattedString(QSslCertificate cert)
-{
-    QStringList message;
-    message << cert.subjectInfo(QSslCertificate::CommonName);
-    foreach (QString issuer, cert.issuerInfo(QSslCertificate::CommonName)) {
-        message << tr("Issuer: %1").arg(issuer.toHtmlEscaped());
-    }
-    message << tr("Not valid before: %1").arg(cert.effectiveDate().toString());
-    message << tr("Valid until: %1").arg(cert.expiryDate().toString());
-
-    QMultiMap<QSsl::AlternativeNameEntryType, QString> names = cert.subjectAlternativeNames();
-    if (names.count() > 0) {
-        QString list;
-        list += QLatin1String("<br />");
-        list += tr("Alternate Names:");
-        list += QLatin1String("<ul><li>");
-        list += QStringList(names.values(QSsl::DnsEntry)).join(QLatin1String("</li><li>"));
-        list += QLatin1String("</li></ul>");
-        message << list;
-    }
-
-    QString result = QLatin1String("<p>") + message.join(QLatin1String("<br />")) + QLatin1String("</p>");
-
-    return result;
-}
-
-void NetworkAccessManager::sslErrors(QNetworkReply *reply, const QList<QSslError> &error)
-{
-#ifdef NETWORKACCESSMANAGER_DEBUG
-    qDebug() << __FUNCTION__;
-#endif
-    BrowserMainWindow *mainWindow = BrowserApplication::instance()->mainWindow();
-
-    QSettings settings;
-    QList<QSslCertificate> ca_merge = QSslCertificate::fromData(settings.value(QLatin1String("CaCertificates")).toByteArray());
-
-    QList<QSslCertificate> ca_new;
-    QStringList errorStrings;
-    for (int i = 0; i < error.count(); ++i) {
-        if (ca_merge.contains(error.at(i).certificate()))
-            continue;
-        errorStrings += error.at(i).errorString();
-        if (!error.at(i).certificate().isNull()) {
-            ca_new.append(error.at(i).certificate());
-        }
-    }
-    if (errorStrings.isEmpty()) {
-        reply->ignoreSslErrors();
-        return;
-    }
-
-    QString errors = errorStrings.join(QLatin1String("</li><li>"));
-    int ret = QMessageBox::warning(mainWindow,
-                           QCoreApplication::applicationName() + tr(" - SSL Errors"),
-                           tr("<qt>SSL Errors:"
-                              "<br/><br/>for: <tt>%1</tt>"
-                              "<ul><li>%2</li></ul>\n\n"
-                              "Do you want to ignore these errors?</qt>").arg(reply->url().toString()).arg(errors),
-                           QMessageBox::Yes | QMessageBox::No,
-                           QMessageBox::No);
-
-    if (ret == QMessageBox::Yes) {
-        if (ca_new.count() > 0) {
-            QStringList certinfos;
-            for (int i = 0; i < ca_new.count(); ++i)
-                certinfos += certToFormattedString(ca_new.at(i));
-            ret = QMessageBox::question(mainWindow, QCoreApplication::applicationName(),
-                tr("<qt>Certificates:<br/>"
-                   "%1<br/>"
-                   "Do you want to accept all these certificates?</qt>")
-                    .arg(certinfos.join(QString())),
-                QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
-            if (ret == QMessageBox::Yes) {
-                ca_merge += ca_new;
-
-                QSslConfiguration sslCfg = QSslConfiguration::defaultConfiguration();
-                QList<QSslCertificate> ca_list = sslCfg.caCertificates();
-                ca_list += ca_new;
-                sslCfg.setCaCertificates(ca_list);
-                sslCfg.setProtocol(QSsl::AnyProtocol);
-                QSslConfiguration::setDefaultConfiguration(sslCfg);
-                reply->setSslConfiguration(sslCfg);
-
-                QByteArray pems;
-                for (int i = 0; i < ca_merge.count(); ++i)
-                    pems += ca_merge.at(i).toPem() + '\n';
-                settings.setValue(QLatin1String("CaCertificates"), pems);
-            }
-        }
-        reply->ignoreSslErrors();
-    }
-}
-#endif
-
-QNetworkReply *NetworkAccessManager::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
-{
-    if (op == PostOperation && outgoingData) {
-        QByteArray outgoingDataByteArray = outgoingData->peek(1024 * 1024);
-        BrowserApplication::autoFillManager()->post(request, outgoingDataByteArray);
-    }
-
-    QNetworkReply *reply = 0;
-    // Check if there is a valid handler registered for the requested URL scheme
-    if (m_schemeHandlers.contains(request.url().scheme()))
-        reply = m_schemeHandlers[request.url().scheme()]->createRequest(op, request, outgoingData);
-    if (reply)
-        return reply;
-
-    QNetworkRequest req = request;
-    req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
-    if (!m_acceptLanguage.isEmpty())
-        req.setRawHeader("Accept-Language", m_acceptLanguage);
-
-    // Adblock
-    if (op == QNetworkAccessManager::GetOperation) {
-        if (!m_adblockNetwork)
-            m_adblockNetwork = AdBlockManager::instance()->network();
-        reply = m_adblockNetwork->block(req);
-        if (reply)
-            return reply;
-    }
-
-    reply = QNetworkAccessManager::createRequest(op, req, outgoingData);
-    emit requestCreated(op, req, reply);
-    return reply;
-}
-
diff --git a/src/network/networkaccessmanager.h b/src/network/networkaccessmanager.h
deleted file mode 100644
index 1044e353..00000000
--- a/src/network/networkaccessmanager.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/****************************************************************************
-**
-** Copyright (C) 2007-2008 Trolltech ASA. All rights reserved.
-**
-** This file is part of the demonstration applications of the Qt Toolkit.
-**
-** This file may be used under the terms of the GNU General Public
-** License versions 2.0 or 3.0 as published by the Free Software
-** Foundation and appearing in the files LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file.  Alternatively you may (at
-** your option) use any later version of the GNU General Public
-** License if such license has been publicly approved by Trolltech ASA
-** (or its successors, if any) and the KDE Free Qt Foundation. In
-** addition, as a special exception, Trolltech gives you certain
-** additional rights. These rights are described in the Trolltech GPL
-** Exception version 1.2, which can be found at
-** http://www.trolltech.com/products/qt/gplexception/ and in the file
-** GPL_EXCEPTION.txt in this package.
-**
-** Please review the following information to ensure GNU General
-** Public Licensing requirements will be met:
-** http://trolltech.com/products/qt/licenses/licensing/opensource/. If
-** you are unsure which license is appropriate for your use, please
-** review the following information:
-** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
-** or contact the sales department at sales@trolltech.com.
-**
-** In addition, as a special exception, Trolltech, as the sole
-** copyright holder for Qt Designer, grants users of the Qt/Eclipse
-** Integration plug-in the right for the Qt/Eclipse Integration to
-** link to functionality provided by Qt Designer and its related
-** libraries.
-**
-** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
-** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE. Trolltech reserves all rights not expressly
-** granted herein.
-**
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-**
-****************************************************************************/
-
-#ifndef NETWORKACCESSMANAGER_H
-#define NETWORKACCESSMANAGER_H
-
-#include <qnetworkaccessmanager.h>
-#include <qsslconfiguration.h>
-#include <qhash.h>
-#include "networkaccessmanagerproxy.h"
-
-class SchemeAccessHandler;
-
-class AdBlockNetwork;
-class NetworkAccessManager : public NetworkAccessManagerProxy
-{
-    Q_OBJECT
-
-signals:
-    void requestCreated(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QNetworkReply *reply);
-
-public:
-    NetworkAccessManager(QObject *parent = 0);
-    void setSchemeHandler(const QString &scheme, SchemeAccessHandler *handler);
-
-    inline QNetworkReply *createRequestProxy(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
-    {
-        return createRequest(op, request, outgoingData);
-    }
-
-protected:
-    QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0);
-
-public slots:
-    void loadSettings();
-
-private slots:
-    void authenticationRequired(QNetworkReply *reply, QAuthenticator *auth);
-    void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *auth);
-#ifndef QT_NO_OPENSSL
-    void sslErrors(QNetworkReply *reply, const QList<QSslError> &error);
-#endif
-    void privacyChanged(bool isPrivate);
-
-private:
-#ifndef QT_NO_OPENSSL
-    static QString certToFormattedString(QSslCertificate cert);
-#endif
-
-    QByteArray m_acceptLanguage;
-    QHash<QString, SchemeAccessHandler*> m_schemeHandlers;
-
-    QNetworkCookieJar *m_privateCookieJar;
-    AdBlockNetwork *m_adblockNetwork;
-};
-
-#endif // NETWORKACCESSMANAGER_H
diff --git a/src/network/networkdiskcache.cpp b/src/network/networkdiskcache.cpp
deleted file mode 100644
index 9b139764..00000000
--- a/src/network/networkdiskcache.cpp
+++ /dev/null
@@ -1,67 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "networkdiskcache.h"
-
-#include "browserapplication.h"
-
-#include <qdesktopservices.h>
-#include <qsettings.h>
-
-NetworkDiskCache::NetworkDiskCache(QObject *parent)
-    : QNetworkDiskCache(parent)
-    , m_private(false)
-{
-    QString diskCacheDirectory = QStandardPaths::writableLocation(QStandardPaths::CacheLocation)
-                                + QLatin1String("/browser");
-    setCacheDirectory(diskCacheDirectory);
-    connect(BrowserApplication::instance(), SIGNAL(privacyChanged(bool)),
-            this, SLOT(privacyChanged(bool)));
-}
-
-void NetworkDiskCache::loadSettings()
-{
-    QSettings settings;
-    settings.beginGroup(QLatin1String("network"));
-    qint64 maximumCacheSize = settings.value(QLatin1String("maximumCacheSize"), 50).toInt();
-    maximumCacheSize = maximumCacheSize * 1024 * 1024;
-    setMaximumCacheSize(maximumCacheSize);
-}
-
-void NetworkDiskCache::privacyChanged(bool isPrivate)
-{
-    m_private = isPrivate;
-}
-
-QIODevice *NetworkDiskCache::prepare(const QNetworkCacheMetaData &metaData)
-{
-    if (m_private)
-        return 0;
-    return QNetworkDiskCache::prepare(metaData);
-}
-
diff --git a/src/network/networkdiskcache.h b/src/network/networkdiskcache.h
deleted file mode 100644
index ce4227de..00000000
--- a/src/network/networkdiskcache.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef NETWORKDISKCACHE_H
-#define NETWORKDISKCACHE_H
-
-#include <qnetworkdiskcache.h>
-
-class NetworkDiskCache : public QNetworkDiskCache
-{
-    Q_OBJECT
-
-public:
-    NetworkDiskCache(QObject *parent = 0);
-
-    void loadSettings();
-
-    QIODevice *prepare(const QNetworkCacheMetaData &metaData);
-
-private slots:
-    void privacyChanged(bool isPrivate);
-
-private:
-    bool m_private;
-};
-
-#endif // NETWORKDISKCACHE_H
-
diff --git a/src/network/networkproxyfactory.cpp b/src/network/networkproxyfactory.cpp
deleted file mode 100644
index 9cda8092..00000000
--- a/src/network/networkproxyfactory.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2009 Benjamin K. Stuhl <bks24@cornell.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "networkproxyfactory.h"
-
-NetworkProxyFactory::NetworkProxyFactory()
-    : QNetworkProxyFactory()
-{
-}
-
-void NetworkProxyFactory::setHttpProxy(const QNetworkProxy &proxy)
-{
-    m_httpProxy = proxy;
-}
-
-void NetworkProxyFactory::setGlobalProxy(const QNetworkProxy &proxy)
-{
-    m_globalProxy = proxy;
-}
-
-QList<QNetworkProxy> NetworkProxyFactory::queryProxy(const QNetworkProxyQuery &query)
-{
-    QList<QNetworkProxy> ret;
-
-    if (query.protocolTag() == QLatin1String("http") && m_httpProxy.type() != QNetworkProxy::DefaultProxy)
-        ret << m_httpProxy;
-    ret << m_globalProxy;
-
-    return ret;
-}
-
diff --git a/src/network/networkproxyfactory.h b/src/network/networkproxyfactory.h
deleted file mode 100644
index 9f692aa7..00000000
--- a/src/network/networkproxyfactory.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Copyright 2009 Benjamin K. Stuhl <bks24@cornell.edu>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef NETWORKPROXYFACTORY_H
-#define NETWORKPROXYFACTORY_H
-
-#include <qnetworkproxy.h>
-
-class NetworkProxyFactory : public QNetworkProxyFactory
-{
-public:
-    NetworkProxyFactory();
-
-    void setHttpProxy(const QNetworkProxy &proxy);
-    void setGlobalProxy(const QNetworkProxy &proxy);
-
-    virtual QList<QNetworkProxy> queryProxy(const QNetworkProxyQuery &query = QNetworkProxyQuery());
-
-private:
-    QNetworkProxy m_httpProxy;
-    QNetworkProxy m_globalProxy;
-};
-
-#endif // NETWORKPROXYFACTORY_H
diff --git a/src/network/passworddialog.ui b/src/network/passworddialog.ui
deleted file mode 100644
index 7c166586..00000000
--- a/src/network/passworddialog.ui
+++ /dev/null
@@ -1,111 +0,0 @@
-<ui version="4.0" >
- <class>PasswordDialog</class>
- <widget class="QDialog" name="PasswordDialog" >
-  <property name="geometry" >
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>399</width>
-    <height>148</height>
-   </rect>
-  </property>
-  <property name="windowTitle" >
-   <string>Authentication Required</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout" >
-   <item row="0" column="0" colspan="2" >
-    <layout class="QHBoxLayout" >
-     <item>
-      <widget class="QLabel" name="iconLabel" >
-       <property name="text" >
-        <string>DUMMY ICON</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="introLabel" >
-       <property name="sizePolicy" >
-        <sizepolicy vsizetype="MinimumExpanding" hsizetype="MinimumExpanding" >
-         <horstretch>0</horstretch>
-         <verstretch>0</verstretch>
-        </sizepolicy>
-       </property>
-       <property name="text" >
-        <string>INTRO TEXT DUMMY</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item row="1" column="0" >
-    <widget class="QLabel" name="label" >
-     <property name="text" >
-      <string>Username:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="1" >
-    <widget class="QLineEdit" name="userNameLineEdit" />
-   </item>
-   <item row="2" column="0" >
-    <widget class="QLabel" name="lblPassword" >
-     <property name="text" >
-      <string>Password:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1" >
-    <widget class="QLineEdit" name="passwordLineEdit" >
-     <property name="echoMode" >
-      <enum>QLineEdit::Password</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="QDialogButtonBox" name="buttonBox" >
-     <property name="orientation" >
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons" >
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>PasswordDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>PasswordDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel" >
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel" >
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/network/proxy.ui b/src/network/proxy.ui
deleted file mode 100644
index 33fa25f7..00000000
--- a/src/network/proxy.ui
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ProxyDialog</class>
- <widget class="QDialog" name="ProxyDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>369</width>
-    <height>144</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Proxy Authentication</string>
-  </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
-    <widget class="QLabel" name="iconLabel">
-     <property name="text">
-      <string notr="true">ICON</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="1" colspan="2">
-    <widget class="QLabel" name="introLabel">
-     <property name="text">
-      <string>Connect to proxy</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0" colspan="2">
-    <widget class="QLabel" name="usernameLabel">
-     <property name="text">
-      <string>Username:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="2">
-    <widget class="QLineEdit" name="userNameLineEdit"/>
-   </item>
-   <item row="2" column="0" colspan="2">
-    <widget class="QLabel" name="passwordLabel">
-     <property name="text">
-      <string>Password:</string>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QLineEdit" name="passwordLineEdit">
-     <property name="echoMode">
-      <enum>QLineEdit::Password</enum>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="3">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>ProxyDialog</receiver>
-   <slot>accept()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>248</x>
-     <y>254</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>157</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>ProxyDialog</receiver>
-   <slot>reject()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>316</x>
-     <y>260</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>286</x>
-     <y>274</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/network/schemeaccesshandler.cpp b/src/network/schemeaccesshandler.cpp
deleted file mode 100644
index 1e4a8294..00000000
--- a/src/network/schemeaccesshandler.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright 2009 Jonas Gehring <jonas.gehring@boolsoft.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "schemeaccesshandler.h"
-
-SchemeAccessHandler::SchemeAccessHandler(QObject *parent)
-    : QObject(parent)
-{
-}
-
diff --git a/src/network/schemeaccesshandler.h b/src/network/schemeaccesshandler.h
deleted file mode 100644
index c2310b05..00000000
--- a/src/network/schemeaccesshandler.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2009 Jonas Gehring <jonas.gehring@boolsoft.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef SCHEMEACCESSHANDLER_H
-#define SCHEMEACCESSHANDLER_H
-
-#include <qobject.h>
-
-#include <qnetworkaccessmanager.h>
-
-class QNetworkReply;
-class SchemeAccessHandler : public QObject
-{
-public:
-    SchemeAccessHandler(QObject *parent = 0);
-
-    virtual QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0) = 0;
-};
-
-#endif // SCHEMEACCESSHANDLER_H
diff --git a/src/opensearch/opensearch.pri b/src/opensearch/opensearch.pri
deleted file mode 100644
index e46dda23..00000000
--- a/src/opensearch/opensearch.pri
+++ /dev/null
@@ -1,27 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += \
-    opensearchdialog.h \
-    opensearchengine.h \
-    opensearchenginedelegate.h \
-    opensearchengineaction.h \
-    opensearchenginemodel.h \
-    opensearchmanager.h \
-    opensearchreader.h \
-    opensearchwriter.h
-
-SOURCES += \
-    opensearchdialog.cpp \
-    opensearchengine.cpp \
-    opensearchenginedelegate.cpp \
-    opensearchengineaction.cpp \
-    opensearchenginemodel.cpp \
-    opensearchmanager.cpp \
-    opensearchreader.cpp \
-    opensearchwriter.cpp
-
-FORMS += opensearchdialog.ui
-
-QT += script
diff --git a/src/opensearch/opensearchdialog.cpp b/src/opensearch/opensearchdialog.cpp
index 94fdf8d8..54f960b9 100644
--- a/src/opensearch/opensearchdialog.cpp
+++ b/src/opensearch/opensearchdialog.cpp
@@ -20,17 +20,16 @@
 
 #include "opensearchdialog.h"
 
-#include "browserapplication.h"
 #include "opensearchenginemodel.h"
 #include "opensearchmanager.h"
 #include "toolbarsearch.h"
 
-#include <qfiledialog.h>
-#include <qmessagebox.h>
+#include <QFileDialog>
+#include <QMessageBox>
 
 OpenSearchDialog::OpenSearchDialog(QWidget *parent)
     : QDialog(parent)
-    , m_model(0)
+    , m_model(nullptr)
 {
     setModal(true);
     setupUi(this);
@@ -58,14 +57,14 @@ OpenSearchDialog::OpenSearchDialog(QWidget *parent)
 void OpenSearchDialog::addButtonClicked()
 {
     QStringList fileNames = QFileDialog::getOpenFileNames(this,
-                                                          tr("Open File"),
-                                                          QString(),
-                                                          tr("OpenSearch") + QLatin1String(" (*.xml)"));
+                            tr("Open File"),
+                            QString(),
+                            tr("OpenSearch") + QStringLiteral(" (*.xml)"));
 
-    foreach (const QString &fileName, fileNames) {
+    Q_FOREACH (const QString &fileName, fileNames) {
         if (!ToolbarSearch::openSearchManager()->addEngine(fileName)) {
             QMessageBox::critical(this, tr("Error"),
-                    tr("%1 is not a valid OpenSearch 1.1 description or is already on your list.").arg(fileName));
+                                  tr("%1 is not a valid OpenSearch 1.1 description or is already on your list.").arg(fileName));
         }
     }
 }
@@ -74,7 +73,7 @@ void OpenSearchDialog::deleteButtonClicked()
 {
     if (m_tableView->model()->rowCount() == 1) {
         QMessageBox::critical(this, tr("Error"),
-                tr("You must have at least one search engine in here."));
+                              tr("You must have at least one search engine in here."));
         return;
     }
 
diff --git a/src/opensearch/opensearchdialog.h b/src/opensearch/opensearchdialog.h
index 5f50e974..b29d6398 100644
--- a/src/opensearch/opensearchdialog.h
+++ b/src/opensearch/opensearchdialog.h
@@ -21,7 +21,7 @@
 #ifndef OPENSEARCHDIALOG_H
 #define OPENSEARCHDIALOG_H
 
-#include <qdialog.h>
+#include <QDialog>
 
 #include "ui_opensearchdialog.h"
 
@@ -32,9 +32,9 @@ class OpenSearchDialog : public QDialog, public Ui_OpenSearchDialog
     Q_OBJECT
 
 public:
-    OpenSearchDialog(QWidget *parent = 0);
+    OpenSearchDialog(QWidget *parent = nullptr);
 
-protected slots:
+protected Q_SLOTS:
     void addButtonClicked();
     void deleteButtonClicked();
     void restoreButtonClicked();
diff --git a/src/opensearch/opensearchengine.cpp b/src/opensearch/opensearchengine.cpp
index b979917a..c797e358 100644
--- a/src/opensearch/opensearchengine.cpp
+++ b/src/opensearch/opensearchengine.cpp
@@ -22,13 +22,13 @@
 #include "opensearchenginedelegate.h"
 
 #include <qbuffer.h>
-#include <qcoreapplication.h>
+#include <QCoreApplication>
 #include <qlocale.h>
-#include <qnetworkrequest.h>
-#include <qnetworkreply.h>
-#include <qregexp.h>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QRegExp>
 #include <qstringlist.h>
-#include <QScriptEngine>
+#include <QJSEngine>
 #include <QUrlQuery>
 
 /*!
@@ -83,15 +83,15 @@
 */
 OpenSearchEngine::OpenSearchEngine(QObject *parent)
     : QObject(parent)
-    , m_searchMethod(QLatin1String("get"))
-    , m_suggestionsMethod(QLatin1String("get"))
-    , m_networkAccessManager(0)
-    , m_suggestionsReply(0)
-    , m_scriptEngine(0)
-    , m_delegate(0)
+    , m_searchMethod(QStringLiteral("get"))
+    , m_suggestionsMethod(QStringLiteral("get"))
+    , m_networkAccessManager(nullptr)
+    , m_suggestionsReply(nullptr)
+    , m_scriptEngine(nullptr)
+    , m_delegate(nullptr)
 {
-    m_requestMethods.insert(QLatin1String("get"), QNetworkAccessManager::GetOperation);
-    m_requestMethods.insert(QLatin1String("post"), QNetworkAccessManager::PostOperation);
+    m_requestMethods.insert(QStringLiteral("get"), QNetworkAccessManager::GetOperation);
+    m_requestMethods.insert(QStringLiteral("post"), QNetworkAccessManager::PostOperation);
 }
 
 /*!
@@ -107,17 +107,17 @@ QString OpenSearchEngine::parseTemplate(const QString &searchTerm, const QString
 {
     QString language = QLocale().name();
     // Simple conversion to RFC 3066.
-    language = language.replace(QLatin1Char('_'), QLatin1Char('-'));
+    language = language.replace(QChar('_'), QChar('-'));
 
     QString result = searchTemplate;
-    result.replace(QLatin1String("{count}"), QLatin1String("20"));
-    result.replace(QLatin1String("{startIndex}"), QLatin1String("0"));
-    result.replace(QLatin1String("{startPage}"), QLatin1String("0"));
-    result.replace(QLatin1String("{language}"), language);
-    result.replace(QLatin1String("{inputEncoding}"), QLatin1String("UTF-8"));
-    result.replace(QLatin1String("{outputEncoding}"), QLatin1String("UTF-8"));
-    result.replace(QRegExp(QLatin1String("\\{([^\\}]*:|)source\\??\\}")), QCoreApplication::applicationName());
-    result.replace(QLatin1String("{searchTerms}"), QLatin1String(QUrl::toPercentEncoding(searchTerm)));
+    result.replace(QStringLiteral("{count}"), QStringLiteral("20"));
+    result.replace(QStringLiteral("{startIndex}"), QStringLiteral("0"));
+    result.replace(QStringLiteral("{startPage}"), QStringLiteral("0"));
+    result.replace(QStringLiteral("{language}"), language);
+    result.replace(QStringLiteral("{inputEncoding}"), QStringLiteral("UTF-8"));
+    result.replace(QStringLiteral("{outputEncoding}"), QStringLiteral("UTF-8"));
+    result.replace(QRegExp(QStringLiteral("\\{([^\\}]*:|)source\\??\\}")), QCoreApplication::applicationName());
+    result.replace(QStringLiteral("{searchTerms}"), QString(QUrl::toPercentEncoding(searchTerm)));
 
     return result;
 }
@@ -208,7 +208,7 @@ QUrl OpenSearchEngine::searchUrl(const QString &searchTerm) const
     QUrl retVal = QUrl::fromEncoded(parseTemplate(searchTerm, m_searchUrlTemplate).toUtf8());
     QUrlQuery query(retVal.query());
 
-    if (m_searchMethod != QLatin1String("post")) {
+    if (m_searchMethod != QStringLiteral("post")) {
         Parameters::const_iterator end = m_searchParameters.constEnd();
         Parameters::const_iterator i = m_searchParameters.constBegin();
         for (; i != end; ++i)
@@ -262,7 +262,7 @@ QUrl OpenSearchEngine::suggestionsUrl(const QString &searchTerm) const
     QUrl retVal = QUrl::fromEncoded(parseTemplate(searchTerm, m_suggestionsUrlTemplate).toUtf8());
     QUrlQuery query(retVal.query());
 
-    if (m_suggestionsMethod != QLatin1String("post")) {
+    if (m_suggestionsMethod != QStringLiteral("post")) {
         Parameters::const_iterator end = m_suggestionsParameters.constEnd();
         Parameters::const_iterator i = m_suggestionsParameters.constBegin();
         for (; i != end; ++i)
@@ -390,7 +390,7 @@ void OpenSearchEngine::imageObtained()
         return;
 
     m_image.loadFromData(response);
-    emit imageChanged();
+    Q_EMIT imageChanged();
 }
 
 /*!
@@ -415,13 +415,13 @@ void OpenSearchEngine::setImage(const QImage &image)
         QBuffer imageBuffer;
         imageBuffer.open(QBuffer::ReadWrite);
         if (image.save(&imageBuffer, "PNG")) {
-            m_imageUrl = QString(QLatin1String("data:image/png;base64,%1"))
-                         .arg(QLatin1String(imageBuffer.buffer().toBase64()));
+            m_imageUrl = QString(QStringLiteral("data:image/png;base64,%1"))
+                         .arg(QString(imageBuffer.buffer().toBase64()));
         }
     }
 
     m_image = image;
-    emit imageChanged();
+    Q_EMIT imageChanged();
 }
 
 /*!
@@ -452,7 +452,7 @@ bool OpenSearchEngine::operator<(const OpenSearchEngine &other) const
 /*!
     Requests contextual suggestions on the search engine, for a given \a searchTerm.
 
-    If succeeded, suggestions() signal will be emitted once the suggestions are received.
+    If succeeded, suggestions() signal will be Q_EMITted once the suggestions are received.
 
     \note To be able to request suggestions, you need to provide a network access manager,
           which will be used for network operations.
@@ -473,20 +473,20 @@ void OpenSearchEngine::requestSuggestions(const QString &searchTerm)
         m_suggestionsReply->disconnect(this);
         m_suggestionsReply->abort();
         m_suggestionsReply->deleteLater();
-        m_suggestionsReply = 0;
+        m_suggestionsReply = nullptr;
     }
 
     Q_ASSERT(m_requestMethods.contains(m_suggestionsMethod));
-    if (m_suggestionsMethod == QLatin1String("get")) {
+    if (m_suggestionsMethod == QStringLiteral("get")) {
         m_suggestionsReply = m_networkAccessManager->get(QNetworkRequest(suggestionsUrl(searchTerm)));
     } else {
         QStringList parameters;
         Parameters::const_iterator end = m_suggestionsParameters.constEnd();
         Parameters::const_iterator i = m_suggestionsParameters.constBegin();
         for (; i != end; ++i)
-            parameters.append(i->first + QLatin1String("=") + i->second);
+            parameters.append(i->first + QStringLiteral("=") + i->second);
 
-        QByteArray data = parameters.join(QLatin1String("&")).toUtf8();
+        QByteArray data = parameters.join(QStringLiteral("&")).toUtf8();
         m_suggestionsReply = m_networkAccessManager->post(QNetworkRequest(suggestionsUrl(searchTerm)), data);
     }
 
@@ -519,9 +519,9 @@ void OpenSearchEngine::requestSearchResults(const QString &searchTerm)
         Parameters::const_iterator end = m_searchParameters.constEnd();
         Parameters::const_iterator i = m_searchParameters.constBegin();
         for (; i != end; ++i)
-            parameters.append(i->first + QLatin1String("=") + i->second);
+            parameters.append(i->first + QStringLiteral("=") + i->second);
 
-        data = parameters.join(QLatin1String("&")).toUtf8();
+        data = parameters.join(QStringLiteral("&")).toUtf8();
     }
 
     m_delegate->performSearchRequest(request, operation, data);
@@ -534,30 +534,31 @@ void OpenSearchEngine::suggestionsObtained()
 
     m_suggestionsReply->close();
     m_suggestionsReply->deleteLater();
-    m_suggestionsReply = 0;
+    m_suggestionsReply = nullptr;
 
     if (response.isEmpty())
         return;
 
-    if (!response.startsWith(QLatin1Char('[')) || !response.endsWith(QLatin1Char(']')))
+    if (!response.startsWith(QChar('[')) || !response.endsWith(QChar(']')))
         return;
 
     if (!m_scriptEngine)
-        m_scriptEngine = new QScriptEngine();
+        m_scriptEngine = new QJSEngine();
 
     // Evaluate the JSON response using QtScript.
-    if (!m_scriptEngine->canEvaluate(response))
+    if (m_scriptEngine->evaluate(response).isError())
         return;
 
-    QScriptValue responseParts = m_scriptEngine->evaluate(response);
+    QJSValue responseParts = m_scriptEngine->evaluate(response);
 
     if (!responseParts.property(1).isArray())
         return;
 
     QStringList suggestionsList;
-    qScriptValueToSequence(responseParts.property(1), suggestionsList);
 
-    emit suggestions(suggestionsList);
+    suggestionsList = responseParts.property(1).toVariant().toStringList();
+
+    Q_EMIT suggestions(suggestionsList);
 }
 
 /*!
@@ -597,7 +598,7 @@ void OpenSearchEngine::setDelegate(OpenSearchEngineDelegate *delegate)
 /*!
     \fn void OpenSearchEngine::imageChanged()
 
-    This signal is emitted whenever the image of the engine changes.
+    This signal is Q_EMITted whenever the image of the engine changes.
 
     \sa image(), imageUrl()
 */
@@ -605,7 +606,7 @@ void OpenSearchEngine::setDelegate(OpenSearchEngineDelegate *delegate)
 /*!
     \fn void OpenSearchEngine::suggestions(const QStringList &suggestions)
 
-    This signal is emitted whenever new contextual suggestions have been provided
+    This signal is Q_EMITted whenever new contextual suggestions have been provided
     by the search engine. To request suggestions, use requestSuggestions().
     The suggestion set is specified by \a suggestions.
 
diff --git a/src/opensearch/opensearchengine.h b/src/opensearch/opensearchengine.h
index 3ec63d22..df7473a4 100644
--- a/src/opensearch/opensearchengine.h
+++ b/src/opensearch/opensearchengine.h
@@ -25,38 +25,52 @@
 #include <qmap.h>
 #include <qnetworkaccessmanager.h>
 #include <qstring.h>
-#include <qurl.h>
+#include <QUrl>
 
 class QNetworkReply;
-class QScriptEngine;
+class QJSEngine;
 
 class OpenSearchEngineDelegate;
 class OpenSearchEngine : public QObject
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void imageChanged();
+    void nameChanged();
     void suggestions(const QStringList &suggestions);
+    void descriptionChanged();
+    void searchUrlTemplateChanged();
+    void searchUrlChanged();
+    void providesSuggestionsChanged();
+    void suggestionsUrlTemplateChanged();
+    void suggestionsUrlChanged();
+    void searchParametersChanged();
+    void suggestionsParametersChanged();
+    void searchMethodChanged();
+    void suggestionsMethodChanged();
+    void imageUrlChanged();
+    void validChanged();
+    void networkAccessManagerChanged();
 
 public:
     typedef QPair<QString, QString> Parameter;
     typedef QList<Parameter> Parameters;
 
-    Q_PROPERTY(QString name READ name WRITE setName)
-    Q_PROPERTY(QString description READ description WRITE setDescription)
-    Q_PROPERTY(QString searchUrlTemplate READ searchUrlTemplate WRITE setSearchUrlTemplate)
-    Q_PROPERTY(Parameters searchParameters READ searchParameters WRITE setSearchParameters)
-    Q_PROPERTY(QString searchMethod READ searchMethod WRITE setSearchMethod)
-    Q_PROPERTY(QString suggestionsUrlTemplate READ suggestionsUrlTemplate WRITE setSuggestionsUrlTemplate)
-    Q_PROPERTY(Parameters suggestionsParameters READ suggestionsParameters WRITE setSuggestionsParameters)
-    Q_PROPERTY(QString suggestionsMethod READ suggestionsMethod WRITE setSuggestionsMethod)
-    Q_PROPERTY(bool providesSuggestions READ providesSuggestions)
-    Q_PROPERTY(QString imageUrl READ imageUrl WRITE setImageUrl)
-    Q_PROPERTY(bool valid READ isValid)
-    Q_PROPERTY(QNetworkAccessManager *networkAccessManager READ networkAccessManager WRITE setNetworkAccessManager)
-
-    OpenSearchEngine(QObject *parent = 0);
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+    Q_PROPERTY(QString description READ description WRITE setDescription NOTIFY descriptionChanged)
+    Q_PROPERTY(QString searchUrlTemplate READ searchUrlTemplate WRITE setSearchUrlTemplate NOTIFY searchUrlTemplateChanged)
+    Q_PROPERTY(Parameters searchParameters READ searchParameters WRITE setSearchParameters NOTIFY searchParametersChanged)
+    Q_PROPERTY(QString searchMethod READ searchMethod WRITE setSearchMethod NOTIFY searchMethodChanged)
+    Q_PROPERTY(QString suggestionsUrlTemplate READ suggestionsUrlTemplate WRITE setSuggestionsUrlTemplate  NOTIFY suggestionsUrlTemplateChanged)
+    Q_PROPERTY(Parameters suggestionsParameters READ suggestionsParameters WRITE setSuggestionsParameters NOTIFY suggestionsParametersChanged)
+    Q_PROPERTY(QString suggestionsMethod READ suggestionsMethod WRITE setSuggestionsMethod NOTIFY suggestionsMethodChanged)
+    Q_PROPERTY(bool providesSuggestions READ providesSuggestions  NOTIFY providesSuggestionsChanged)
+    Q_PROPERTY(QString imageUrl READ imageUrl WRITE setImageUrl  NOTIFY imageUrlChanged)
+    Q_PROPERTY(bool valid READ isValid NOTIFY validChanged)
+    Q_PROPERTY(QNetworkAccessManager *networkAccessManager READ networkAccessManager WRITE setNetworkAccessManager NOTIFY networkAccessManagerChanged)
+
+    OpenSearchEngine(QObject *parent = nullptr);
     ~OpenSearchEngine();
 
     QString name() const;
@@ -104,7 +118,7 @@ class OpenSearchEngine : public QObject
     bool operator==(const OpenSearchEngine &other) const;
     bool operator<(const OpenSearchEngine &other) const;
 
-public slots:
+public Q_SLOTS:
     void requestSuggestions(const QString &searchTerm);
     void requestSearchResults(const QString &searchTerm);
 
@@ -112,7 +126,7 @@ public slots:
     static QString parseTemplate(const QString &searchTerm, const QString &searchTemplate);
     void loadImage() const;
 
-private slots:
+private Q_SLOTS:
     void imageObtained();
     void suggestionsObtained();
 
@@ -135,7 +149,7 @@ private slots:
     QNetworkAccessManager *m_networkAccessManager;
     QNetworkReply *m_suggestionsReply;
 
-    QScriptEngine *m_scriptEngine;
+    QJSEngine *m_scriptEngine;
 
     OpenSearchEngineDelegate *m_delegate;
 };
diff --git a/src/opensearch/opensearchengineaction.cpp b/src/opensearch/opensearchengineaction.cpp
index 8c4282c0..758c07ee 100644
--- a/src/opensearch/opensearchengineaction.cpp
+++ b/src/opensearch/opensearchengineaction.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #include "opensearchengineaction.h"
 
 #include "browserapplication.h"
-#include "networkaccessmanager.h"
+#include <qnetworkaccessmanager.h>
 #include "opensearchengine.h"
 
 OpenSearchEngineAction::OpenSearchEngineAction(OpenSearchEngine *engine, QObject *parent)
@@ -28,7 +28,7 @@ OpenSearchEngineAction::OpenSearchEngineAction(OpenSearchEngine *engine, QObject
     , m_engine(engine)
 {
     if (!engine->networkAccessManager())
-        engine->setNetworkAccessManager(BrowserApplication::networkAccessManager());
+        engine->setNetworkAccessManager(new QNetworkAccessManager());
 
     setText(engine->name());
     imageChanged();
diff --git a/src/opensearch/opensearchengineaction.h b/src/opensearch/opensearchengineaction.h
index 553f79a8..7154b28c 100644
--- a/src/opensearch/opensearchengineaction.h
+++ b/src/opensearch/opensearchengineaction.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #ifndef OPENSEARCHENGINEACTION_H
 #define OPENSEARCHENGINEACTION_H
 
-#include <qaction.h>
+#include <QAction>
 
 class OpenSearchEngine;
 class OpenSearchEngineAction : public QAction
@@ -28,9 +28,9 @@ class OpenSearchEngineAction : public QAction
     Q_OBJECT
 
 public:
-    OpenSearchEngineAction(OpenSearchEngine *engine, QObject *parent = 0);
+    OpenSearchEngineAction(OpenSearchEngine *engine, QObject *parent = nullptr);
 
-private slots:
+private Q_SLOTS:
     void imageChanged();
 
 private:
diff --git a/src/opensearch/opensearchenginedelegate.h b/src/opensearch/opensearchenginedelegate.h
index 5de3c598..e9a23c0d 100644
--- a/src/opensearch/opensearchenginedelegate.h
+++ b/src/opensearch/opensearchenginedelegate.h
@@ -21,7 +21,7 @@
 #define OPENSEARCHENGINEDELEGATE_H
 
 #include <qnetworkaccessmanager.h>
-#include <qnetworkrequest.h>
+#include <QNetworkRequest>
 
 class OpenSearchEngineDelegate
 {
diff --git a/src/opensearch/opensearchenginemodel.cpp b/src/opensearch/opensearchenginemodel.cpp
index 85559b15..b0930994 100644
--- a/src/opensearch/opensearchenginemodel.cpp
+++ b/src/opensearch/opensearchenginemodel.cpp
@@ -55,7 +55,7 @@ bool OpenSearchEngineModel::removeRows(int row, int count, const QModelIndex &pa
     for (int i = row; i <= lastRow; ++i)
         m_manager->removeEngine(nameList.at(i));
 
-    // removeEngine emits changed
+    // removeEngine Q_EMITs changed
     //endRemoveRows();
 
     return true;
@@ -97,24 +97,24 @@ QVariant OpenSearchEngineModel::data(const QModelIndex &index, int role) const
         switch (role) {
         case Qt::DisplayRole:
             return engine->name();
-        break;
+            break;
         case Qt::DecorationRole: {
             QImage image = engine->image();
             if (image.isNull())
                 return BrowserApplication::icon(engine->imageUrl());
             return image;
-        break;
+            break;
         }
         case Qt::ToolTipRole:
             QString description = tr("<strong>Description:</strong> %1").arg(engine->description());
 
             if (engine->providesSuggestions()) {
-                description += QLatin1String("<br />");
+                description += QStringLiteral("<br />");
                 description += tr("<strong>Provides contextual suggestions</strong>");
             }
 
             return description;
-        break;
+            break;
         }
         break;
 
@@ -122,7 +122,7 @@ QVariant OpenSearchEngineModel::data(const QModelIndex &index, int role) const
         switch (role) {
         case Qt::EditRole:
         case Qt::DisplayRole:
-            return QStringList(m_manager->keywordsForEngine(engine)).join(QLatin1String(","));
+            return QStringList(m_manager->keywordsForEngine(engine)).join(QStringLiteral(","));
         case Qt::ToolTipRole:
             return tr("Comma-separated list of keywords that may be entered in the location bar"
                       "followed by search terms to search with this engine");
@@ -145,7 +145,7 @@ bool OpenSearchEngineModel::setData(const QModelIndex &index, const QVariant &va
         return false;
 
     QString engineName = m_manager->allEnginesNames().at(index.row());
-    QStringList keywords = value.toString().split(QRegExp(QLatin1String("[ ,]+")), QString::SkipEmptyParts);
+    QStringList keywords = value.toString().split(QRegExp(QStringLiteral("[ ,]+")), Qt::SkipEmptyParts);
 
     m_manager->setKeywordsForEngine(m_manager->engine(engineName), keywords);
 
diff --git a/src/opensearch/opensearchenginemodel.h b/src/opensearch/opensearchenginemodel.h
index 23001cfd..322c0ff2 100644
--- a/src/opensearch/opensearchenginemodel.h
+++ b/src/opensearch/opensearchenginemodel.h
@@ -22,7 +22,7 @@
 #ifndef OPENSEARCHENGINEMODEL_H
 #define OPENSEARCHENGINEMODEL_H
 
-#include <qabstractitemmodel.h>
+#include <QAbstractItemModel>
 
 class OpenSearchEngine;
 class OpenSearchManager;
@@ -32,7 +32,7 @@ class OpenSearchEngineModel : public QAbstractTableModel
     Q_OBJECT
 
 public:
-    OpenSearchEngineModel(OpenSearchManager *manager, QObject *parent = 0);
+    OpenSearchEngineModel(OpenSearchManager *manager, QObject *parent = nullptr);
     bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
     int rowCount(const QModelIndex &parent = QModelIndex()) const;
     int columnCount(const QModelIndex &parent = QModelIndex()) const;
@@ -41,7 +41,7 @@ class OpenSearchEngineModel : public QAbstractTableModel
     bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
     QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
 
-protected slots:
+protected Q_SLOTS:
     void enginesChanged();
 
 private:
diff --git a/src/opensearch/opensearchmanager.cpp b/src/opensearch/opensearchmanager.cpp
index b4bc7895..a9ea2c2b 100644
--- a/src/opensearch/opensearchmanager.cpp
+++ b/src/opensearch/opensearchmanager.cpp
@@ -23,20 +23,20 @@
 
 #include "autosaver.h"
 #include "browserapplication.h"
-#include "networkaccessmanager.h"
+#include <qnetworkaccessmanager.h>
 #include "opensearchengine.h"
 #include "opensearchreader.h"
 #include "opensearchwriter.h"
 
-#include <qdesktopservices.h>
-#include <qdir.h>
+#include <QDesktopServices>
+#include <QDir>
 #include <qdiriterator.h>
-#include <qfile.h>
-#include <qmessagebox.h>
-#include <qnetworkreply.h>
-#include <qnetworkrequest.h>
-#include <qregexp.h>
-#include <qsettings.h>
+#include <QFile>
+#include <QMessageBox>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QRegExp>
+#include <QSettings>
 #include <qstringlist.h>
 
 OpenSearchManager::OpenSearchManager(QObject *parent)
@@ -67,14 +67,14 @@ void OpenSearchManager::setCurrentEngineName(const QString &name)
         return;
 
     m_current = name;
-    emit currentEngineChanged();
-    emit changed();
+    Q_EMIT currentEngineChanged();
+    Q_EMIT changed();
 }
 
 OpenSearchEngine *OpenSearchManager::currentEngine() const
 {
     if (m_current.isEmpty() || !m_engines.contains(m_current))
-        return 0;
+        return nullptr;
 
     return m_engines[m_current];
 }
@@ -90,7 +90,7 @@ void OpenSearchManager::setCurrentEngine(OpenSearchEngine *engine)
 OpenSearchEngine *OpenSearchManager::engine(const QString &name)
 {
     if (!m_engines.contains(name))
-        return 0;
+        return nullptr;
 
     return m_engines[name];
 }
@@ -115,7 +115,8 @@ void OpenSearchManager::addEngine(const QUrl &url)
     if (!url.isValid())
         return;
 
-    QNetworkReply *reply = BrowserApplication::networkAccessManager()->get(QNetworkRequest(url));
+    QNetworkAccessManager *manager = new QNetworkAccessManager();
+    QNetworkReply *reply = manager->get(QNetworkRequest(url));
     connect(reply, SIGNAL(finished()), this, SLOT(engineFromUrlAvailable()));
     reply->setParent(this);
 }
@@ -150,7 +151,7 @@ bool OpenSearchManager::addEngine(OpenSearchEngine *engine)
 
     m_engines[engine->name()] = engine;
 
-    emit changed();
+    Q_EMIT changed();
 
     return true;
 }
@@ -164,7 +165,7 @@ void OpenSearchManager::removeEngine(const QString &name)
         return;
 
     OpenSearchEngine *engine = m_engines[name];
-    foreach (const QString &keyword, m_keywords.keys(engine))
+    Q_FOREACH (const QString &keyword, m_keywords.keys(engine))
         m_keywords.remove(keyword);
     engine->deleteLater();
 
@@ -177,7 +178,7 @@ void OpenSearchManager::removeEngine(const QString &name)
     if (name == m_current)
         setCurrentEngineName(m_engines.keys().at(0));
 
-    emit changed();
+    Q_EMIT changed();
 }
 
 QString OpenSearchManager::generateEngineFileName(const QString &engineName) const
@@ -187,7 +188,7 @@ QString OpenSearchManager::generateEngineFileName(const QString &engineName) con
     // Strip special characters from the name.
     for (int i = 0; i < engineName.count(); ++i) {
         if (engineName.at(i).isSpace()) {
-            fileName.append(QLatin1Char('_'));
+            fileName.append(QChar('_'));
             continue;
         }
 
@@ -195,7 +196,7 @@ QString OpenSearchManager::generateEngineFileName(const QString &engineName) con
             fileName.append(engineName.at(i));
     }
 
-    fileName.append(QLatin1String(".xml"));
+    fileName.append(QStringLiteral(".xml"));
 
     return fileName;
 }
@@ -209,7 +210,7 @@ void OpenSearchManager::saveDirectory(const QString &dirName)
 
     OpenSearchWriter writer;
 
-    foreach (OpenSearchEngine *engine, m_engines.values()) {
+    Q_FOREACH (OpenSearchEngine *engine, m_engines.values()) {
         QString name = generateEngineFileName(engine->name());
         QString fileName = dir.filePath(name);
 
@@ -226,17 +227,17 @@ void OpenSearchManager::save()
     saveDirectory(enginesDirectory());
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("openSearch"));
-    settings.setValue(QLatin1String("engine"), m_current);
+    settings.beginGroup(QStringLiteral("openSearch"));
+    settings.setValue(QStringLiteral("engine"), m_current);
 
-    settings.beginWriteArray(QLatin1String("keywords"), m_keywords.count());
+    settings.beginWriteArray(QStringLiteral("keywords"), m_keywords.count());
     QHash<QString, OpenSearchEngine*>::const_iterator i = m_keywords.constBegin();
     QHash<QString, OpenSearchEngine*>::const_iterator end = m_keywords.constEnd();
     int j = 0;
     for (; i != end; ++i) {
         settings.setArrayIndex(j++);
-        settings.setValue(QLatin1String("keyword"), i.key());
-        settings.setValue(QLatin1String("engine"), i.value()->name());
+        settings.setValue(QStringLiteral("keyword"), i.key());
+        settings.setValue(QStringLiteral("engine"), i.value()->name());
     }
     settings.endArray();
 
@@ -248,7 +249,7 @@ bool OpenSearchManager::loadDirectory(const QString &dirName)
     if (!QFile::exists(dirName))
         return false;
 
-    QDirIterator iterator(dirName, QStringList() << QLatin1String("*.xml"));
+    QDirIterator iterator(dirName, QStringList() << QStringLiteral("*.xml"));
 
     if (!iterator.hasNext())
         return false;
@@ -266,18 +267,18 @@ bool OpenSearchManager::loadDirectory(const QString &dirName)
 void OpenSearchManager::load()
 {
     if (!loadDirectory(enginesDirectory()))
-        loadDirectory(QLatin1String(":/searchengines"));
+        loadDirectory(QStringLiteral(":/searchengines"));
 
     // get current engine
     QSettings settings;
-    settings.beginGroup(QLatin1String("openSearch"));
-    m_current = settings.value(QLatin1String("engine"), QLatin1String("Google")).toString();
+    settings.beginGroup(QStringLiteral("openSearch"));
+    m_current = settings.value(QStringLiteral("engine"), QStringLiteral("Google")).toString();
 
-    int size = settings.beginReadArray(QLatin1String("keywords"));
+    int size = settings.beginReadArray(QStringLiteral("keywords"));
     for (int i = 0; i < size; ++i) {
         settings.setArrayIndex(i);
-        QString keyword = settings.value(QLatin1String("keyword")).toString();
-        QString engineName = settings.value(QLatin1String("engine")).toString();
+        QString keyword = settings.value(QStringLiteral("keyword")).toString();
+        QString engineName = settings.value(QStringLiteral("engine")).toString();
         m_keywords.insert(keyword, engine(engineName));
     }
     settings.endArray();
@@ -287,18 +288,18 @@ void OpenSearchManager::load()
     if (!m_engines.contains(m_current) && m_engines.count() > 0)
         m_current = m_engines.keys().at(0);
 
-    emit currentEngineChanged();
+    Q_EMIT currentEngineChanged();
 }
 
 void OpenSearchManager::restoreDefaults()
 {
-    loadDirectory(QLatin1String(":/searchengines"));
+    loadDirectory(QStringLiteral(":/searchengines"));
 }
 
 QString OpenSearchManager::enginesDirectory() const
 {
     QDir directory(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + "/data/Endorphin");
-    return directory.filePath(QLatin1String("searchengines"));
+    return directory.filePath(QStringLiteral("searchengines"));
 }
 
 bool OpenSearchManager::confirmAddition(OpenSearchEngine *engine)
@@ -308,10 +309,10 @@ bool OpenSearchManager::confirmAddition(OpenSearchEngine *engine)
 
     QString host = QUrl(engine->searchUrlTemplate()).host();
 
-    QMessageBox::StandardButton button = QMessageBox::question(0, QString(),
-            tr("Do you want to add the following engine to your list of search engines?<br /><br />"
-               "Name: %1<br />Searches on: %2").arg(engine->name(), host),
-            QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
+    QMessageBox::StandardButton button = QMessageBox::question(nullptr, QString(),
+                                         tr("Do you want to add the following engine to your list of search engines?<br /><br />"
+                                            "Name: %1<br />Searches on: %2").arg(engine->name(), host),
+                                         QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
     return (button == QMessageBox::Yes);
 }
 
@@ -357,7 +358,7 @@ void OpenSearchManager::engineFromUrlAvailable()
 
 QUrl OpenSearchManager::convertKeywordSearchToUrl(const QString &string)
 {
-    int i = string.indexOf(QLatin1Char(' '));
+    int i = string.indexOf(QChar(' '));
     if (i <= 0)
         return QUrl();
 
@@ -375,9 +376,9 @@ QUrl OpenSearchManager::convertKeywordSearchToUrl(const QString &string)
 OpenSearchEngine *OpenSearchManager::engineForKeyword(const QString &keyword) const
 {
     if (keyword.isEmpty())
-        return 0;
+        return nullptr;
     if (!m_keywords.contains(keyword))
-        return 0;
+        return nullptr;
     return m_keywords.value(keyword);
 }
 
@@ -391,7 +392,7 @@ void OpenSearchManager::setEngineForKeyword(const QString &keyword, OpenSearchEn
     else
         m_keywords.insert(keyword, engine);
 
-    emit changed();
+    Q_EMIT changed();
 }
 
 QStringList OpenSearchManager::keywordsForEngine(OpenSearchEngine *engine) const
@@ -404,15 +405,15 @@ void OpenSearchManager::setKeywordsForEngine(OpenSearchEngine *engine, const QSt
     if (!engine)
         return;
 
-    foreach (const QString &keyword, keywordsForEngine(engine))
+    Q_FOREACH (const QString &keyword, keywordsForEngine(engine))
         m_keywords.remove(keyword);
 
-    foreach (const QString &keyword, keywords) {
+    Q_FOREACH (const QString &keyword, keywords) {
         if (keyword.isEmpty())
             continue;
 
         m_keywords.insert(keyword, engine);
     }
 
-    emit changed();
+    Q_EMIT changed();
 }
diff --git a/src/opensearch/opensearchmanager.h b/src/opensearch/opensearchmanager.h
index 1d3f33c9..da8d0528 100644
--- a/src/opensearch/opensearchmanager.h
+++ b/src/opensearch/opensearchmanager.h
@@ -22,11 +22,11 @@
 #ifndef OPENSEARCHMANAGER_H
 #define OPENSEARCHMANAGER_H
 
-#include <qobject.h>
+#include <QObject>
 
 #include <qhash.h>
 #include <qpixmap.h>
-#include <qurl.h>
+#include <QUrl>
 
 class QNetworkReply;
 class QNetworkRequest;
@@ -39,12 +39,12 @@ class OpenSearchManager : public QObject
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void changed();
     void currentEngineChanged();
 
 public:
-    OpenSearchManager(QObject *parent = 0);
+    OpenSearchManager(QObject *parent = nullptr);
     ~OpenSearchManager();
 
     QStringList allEnginesNames() const;
@@ -73,7 +73,7 @@ class OpenSearchManager : public QObject
     void removeEngine(const QString &name);
     void restoreDefaults();
 
-public slots:
+public Q_SLOTS:
     void save();
 
 protected:
@@ -86,7 +86,7 @@ public slots:
 private:
     bool confirmAddition(OpenSearchEngine *engine);
 
-protected slots:
+protected Q_SLOTS:
     void engineFromUrlAvailable();
 
 private:
diff --git a/src/opensearch/opensearchreader.cpp b/src/opensearch/opensearchreader.cpp
index 7b88578a..93aac549 100644
--- a/src/opensearch/opensearchreader.cpp
+++ b/src/opensearch/opensearchreader.cpp
@@ -84,8 +84,8 @@ OpenSearchEngine *OpenSearchReader::read()
     while (!isStartElement() && !atEnd())
         readNext();
 
-    if (name() != QLatin1String("OpenSearchDescription")
-        || namespaceUri() != QLatin1String("http://a9.com/-/spec/opensearch/1.1/")) {
+    if (name() != QStringLiteral("OpenSearchDescription")
+            || namespaceUri() != QStringLiteral("http://a9.com/-/spec/opensearch/1.1/")) {
         raiseError(QObject::tr("The file is not an OpenSearch 1.1 file."));
         return engine;
     }
@@ -96,24 +96,24 @@ OpenSearchEngine *OpenSearchReader::read()
         if (!isStartElement())
             continue;
 
-        if (name() == QLatin1String("ShortName")) {
+        if (name() == QStringLiteral("ShortName")) {
             engine->setName(readElementText());
-        } else if (name() == QLatin1String("Description")) {
+        } else if (name() == QStringLiteral("Description")) {
             engine->setDescription(readElementText());
-        } else if (name() == QLatin1String("Url")) {
+        } else if (name() == QStringLiteral("Url")) {
 
-            QString type = attributes().value(QLatin1String("type")).toString();
-            QString url = attributes().value(QLatin1String("template")).toString();
-            QString method = attributes().value(QLatin1String("method")).toString();
+            QString type = attributes().value(QStringLiteral("type")).toString();
+            QString url = attributes().value(QStringLiteral("template")).toString();
+            QString method = attributes().value(QStringLiteral("method")).toString();
 
-            if (type == QLatin1String("application/x-suggestions+json")
-                && !engine->suggestionsUrlTemplate().isEmpty())
+            if (type == QStringLiteral("application/x-suggestions+json")
+                    && !engine->suggestionsUrlTemplate().isEmpty())
                 continue;
 
             if ((type.isEmpty()
-                || type == QLatin1String("text/html")
-                || type == QLatin1String("application/xhtml+xml"))
-                && !engine->searchUrlTemplate().isEmpty())
+                    || type == QStringLiteral("text/html")
+                    || type == QStringLiteral("application/xhtml+xml"))
+                    && !engine->searchUrlTemplate().isEmpty())
                 continue;
 
             if (url.isEmpty())
@@ -123,14 +123,14 @@ OpenSearchEngine *OpenSearchReader::read()
 
             readNext();
 
-            while (!(isEndElement() && name() == QLatin1String("Url"))) {
-                if (!isStartElement() || (name() != QLatin1String("Param") && name() != QLatin1String("Parameter"))) {
+            while (!(isEndElement() && name() == QStringLiteral("Url"))) {
+                if (!isStartElement() || (name() != QStringLiteral("Param") && name() != QStringLiteral("Parameter"))) {
                     readNext();
                     continue;
                 }
 
-                QString key = attributes().value(QLatin1String("name")).toString();
-                QString value = attributes().value(QLatin1String("value")).toString();
+                QString key = attributes().value(QStringLiteral("name")).toString();
+                QString value = attributes().value(QStringLiteral("value")).toString();
 
                 if (!key.isEmpty() && !value.isEmpty())
                     parameters.append(OpenSearchEngine::Parameter(key, value));
@@ -139,25 +139,25 @@ OpenSearchEngine *OpenSearchReader::read()
                     readNext();
             }
 
-            if (type == QLatin1String("application/x-suggestions+json")) {
+            if (type == QStringLiteral("application/x-suggestions+json")) {
                 engine->setSuggestionsUrlTemplate(url);
                 engine->setSuggestionsParameters(parameters);
                 engine->setSuggestionsMethod(method);
-            } else if (type.isEmpty() || type == QLatin1String("text/html") || type == QLatin1String("application/xhtml+xml")) {
+            } else if (type.isEmpty() || type == QStringLiteral("text/html") || type == QStringLiteral("application/xhtml+xml")) {
                 engine->setSearchUrlTemplate(url);
                 engine->setSearchParameters(parameters);
                 engine->setSearchMethod(method);
             }
 
-        } else if (name() == QLatin1String("Image")) {
-             engine->setImageUrl(readElementText());
+        } else if (name() == QStringLiteral("Image")) {
+            engine->setImageUrl(readElementText());
         }
 
         if (!engine->name().isEmpty()
-            && !engine->description().isEmpty()
-            && !engine->suggestionsUrlTemplate().isEmpty()
-            && !engine->searchUrlTemplate().isEmpty()
-            && !engine->imageUrl().isEmpty())
+                && !engine->description().isEmpty()
+                && !engine->suggestionsUrlTemplate().isEmpty()
+                && !engine->searchUrlTemplate().isEmpty()
+                && !engine->imageUrl().isEmpty())
             break;
     }
 
diff --git a/src/opensearch/opensearchwriter.cpp b/src/opensearch/opensearchwriter.cpp
index 10b7c548..a9a6b647 100644
--- a/src/opensearch/opensearchwriter.cpp
+++ b/src/opensearch/opensearchwriter.cpp
@@ -21,7 +21,7 @@
 
 #include "opensearchengine.h"
 
-#include <qdebug.h>
+#include <QDebug>
 #include <qiodevice.h>
 
 /*!
@@ -74,30 +74,30 @@ bool OpenSearchWriter::write(QIODevice *device, OpenSearchEngine *engine)
 void OpenSearchWriter::write(OpenSearchEngine *engine)
 {
     writeStartDocument();
-    writeStartElement(QLatin1String("OpenSearchDescription"));
-    writeDefaultNamespace(QLatin1String("http://a9.com/-/spec/opensearch/1.1/"));
+    writeStartElement(QStringLiteral("OpenSearchDescription"));
+    writeDefaultNamespace(QStringLiteral("http://a9.com/-/spec/opensearch/1.1/"));
 
     if (!engine->name().isEmpty())
-        writeTextElement(QLatin1String("ShortName"), engine->name());
+        writeTextElement(QStringLiteral("ShortName"), engine->name());
 
     if (!engine->description().isEmpty())
-        writeTextElement(QLatin1String("Description"), engine->description());
+        writeTextElement(QStringLiteral("Description"), engine->description());
 
     if (!engine->searchUrlTemplate().isEmpty()) {
-        writeStartElement(QLatin1String("Url"));
-        writeAttribute(QLatin1String("method"), engine->searchMethod());
-        writeAttribute(QLatin1String("type"), QLatin1String("text/html"));
-        writeAttribute(QLatin1String("template"), engine->searchUrlTemplate());
+        writeStartElement(QStringLiteral("Url"));
+        writeAttribute(QStringLiteral("method"), engine->searchMethod());
+        writeAttribute(QStringLiteral("type"), QStringLiteral("text/html"));
+        writeAttribute(QStringLiteral("template"), engine->searchUrlTemplate());
 
         if (!engine->searchParameters().empty()) {
-            writeNamespace(QLatin1String("http://a9.com/-/spec/opensearch/extensions/parameters/1.0/"), QLatin1String("p"));
+            writeNamespace(QStringLiteral("http://a9.com/-/spec/opensearch/extensions/parameters/1.0/"), QStringLiteral("p"));
 
             QList<OpenSearchEngine::Parameter>::const_iterator end = engine->searchParameters().constEnd();
             QList<OpenSearchEngine::Parameter>::const_iterator i = engine->searchParameters().constBegin();
             for (; i != end; ++i) {
-                writeStartElement(QLatin1String("p:Parameter"));
-                writeAttribute(QLatin1String("name"), i->first);
-                writeAttribute(QLatin1String("value"), i->second);
+                writeStartElement(QStringLiteral("p:Parameter"));
+                writeAttribute(QStringLiteral("name"), i->first);
+                writeAttribute(QStringLiteral("value"), i->second);
                 writeEndElement();
             }
         }
@@ -106,20 +106,20 @@ void OpenSearchWriter::write(OpenSearchEngine *engine)
     }
 
     if (!engine->suggestionsUrlTemplate().isEmpty()) {
-        writeStartElement(QLatin1String("Url"));
-        writeAttribute(QLatin1String("method"), engine->suggestionsMethod());
-        writeAttribute(QLatin1String("type"), QLatin1String("application/x-suggestions+json"));
-        writeAttribute(QLatin1String("template"), engine->suggestionsUrlTemplate());
+        writeStartElement(QStringLiteral("Url"));
+        writeAttribute(QStringLiteral("method"), engine->suggestionsMethod());
+        writeAttribute(QStringLiteral("type"), QStringLiteral("application/x-suggestions+json"));
+        writeAttribute(QStringLiteral("template"), engine->suggestionsUrlTemplate());
 
         if (!engine->suggestionsParameters().empty()) {
-            writeNamespace(QLatin1String("http://a9.com/-/spec/opensearch/extensions/parameters/1.0/"), QLatin1String("p"));
+            writeNamespace(QStringLiteral("http://a9.com/-/spec/opensearch/extensions/parameters/1.0/"), QStringLiteral("p"));
 
             QList<OpenSearchEngine::Parameter>::const_iterator end = engine->suggestionsParameters().constEnd();
             QList<OpenSearchEngine::Parameter>::const_iterator i = engine->suggestionsParameters().constBegin();
             for (; i != end; ++i) {
-                writeStartElement(QLatin1String("p:Parameter"));
-                writeAttribute(QLatin1String("name"), i->first);
-                writeAttribute(QLatin1String("value"), i->second);
+                writeStartElement(QStringLiteral("p:Parameter"));
+                writeAttribute(QStringLiteral("name"), i->first);
+                writeAttribute(QStringLiteral("value"), i->second);
                 writeEndElement();
             }
         }
@@ -128,7 +128,7 @@ void OpenSearchWriter::write(OpenSearchEngine *engine)
     }
 
     if (!engine->imageUrl().isEmpty())
-        writeTextElement(QLatin1String("Image"), engine->imageUrl());
+        writeTextElement(QStringLiteral("Image"), engine->imageUrl());
 
     writeEndElement();
     writeEndDocument();
diff --git a/src/permissionbar.cpp b/src/permissionbar.cpp
new file mode 100644
index 00000000..ec620781
--- /dev/null
+++ b/src/permissionbar.cpp
@@ -0,0 +1,137 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "permissionbar.h"
+
+#include <QLabel>
+#include <QPushButton>
+#include <QHBoxLayout>
+#include <QUrl>
+#include <QPropertyAnimation>
+
+static const int defaultHeight = 30;
+
+static QString textForPermissionType(QWebEnginePage::Feature type)
+{
+    switch (type) {
+    case QWebEnginePage::Notifications:
+        return QObject::tr("use desktop notifications");
+    case QWebEnginePage::Geolocation:
+        return QObject::tr("use your position");
+    case QWebEnginePage::MediaAudioCapture:
+        return QObject::tr("use your microphone");
+    case QWebEnginePage::MediaVideoCapture:
+        return QObject::tr("use your camera");
+    case QWebEnginePage::MediaAudioVideoCapture:
+        return QObject::tr("use your camera and microphone");
+    case QWebEnginePage::MouseLock:
+        return QObject::tr("lock your mouse");
+    default:
+        Q_UNREACHABLE();
+    }
+    return QString();
+}
+
+PermissionBar::PermissionBar(QWidget *view)
+    : QWidget(view)
+    , m_messageLabel(new QLabel(this))
+{
+    setAutoFillBackground(true);
+    QHBoxLayout *l = new QHBoxLayout;
+    setLayout(l);
+    l->setContentsMargins(defaultHeight, 0, 0, 0);
+    l->addWidget(m_messageLabel);
+    l->addStretch();
+    QPushButton *allowButton = new QPushButton(tr("Allow"), this);
+    QPushButton *denyButton = new QPushButton(tr("Deny"), this);
+    QPushButton *discardButton = new QPushButton(QIcon(QStringLiteral(":closetab.png")), QString(), this);
+    connect(allowButton, &QPushButton::clicked, this, &PermissionBar::permissionGranted);
+    connect(denyButton, &QPushButton::clicked, this, &PermissionBar::permissionDenied);
+    connect(discardButton, &QPushButton::clicked, this, &PermissionBar::permissionUnknown);
+    connect(allowButton, &QPushButton::clicked, this, &QObject::deleteLater);
+    connect(denyButton, &QPushButton::clicked, this, &QObject::deleteLater);
+    connect(discardButton, &QPushButton::clicked, this, &QObject::deleteLater);
+    l->addWidget(denyButton);
+    l->addWidget(allowButton);
+    l->addWidget(discardButton);
+    setGeometry(0, -defaultHeight, view->width(), defaultHeight);
+}
+
+void PermissionBar::requestPermission(const QUrl &securityOrigin, QWebEnginePage::Feature feature)
+{
+    m_securityOrigin = securityOrigin;
+    m_feature = feature;
+    m_messageLabel->setText(tr("%1 wants to %2.").arg(securityOrigin.host()).arg(textForPermissionType(feature)));
+    show();
+    // Ease in
+    QPropertyAnimation *animation = new QPropertyAnimation(this);
+    animation->setTargetObject(this);
+    animation->setPropertyName(QByteArrayLiteral("pos"));
+    animation->setDuration(300);
+    animation->setStartValue(QVariant::fromValue(pos()));
+    animation->setEndValue(QVariant::fromValue(QPoint(0,0)));
+    animation->setEasingCurve(QEasingCurve::InOutQuad);
+    animation->start(QPropertyAnimation::DeleteWhenStopped);
+}
+
+void PermissionBar::permissionDenied()
+{
+    Q_EMIT featurePermissionProvided(m_securityOrigin, m_feature, QWebEnginePage::PermissionDeniedByUser);
+}
+
+void PermissionBar::permissionGranted()
+{
+    Q_EMIT featurePermissionProvided(m_securityOrigin, m_feature, QWebEnginePage::PermissionGrantedByUser);
+}
+
+void PermissionBar::permissionUnknown()
+{
+    Q_EMIT featurePermissionProvided(m_securityOrigin, m_feature, QWebEnginePage::PermissionUnknown);
+}
diff --git a/src/permissionbar.h b/src/permissionbar.h
new file mode 100644
index 00000000..3bf50fab
--- /dev/null
+++ b/src/permissionbar.h
@@ -0,0 +1,83 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtWebEngine module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef PERMISSIONBAR_H
+#define PERMISSIONBAR_H
+
+#include <QWidget>
+#include <QWebEnginePage>
+
+QT_BEGIN_NAMESPACE
+class QLabel;
+class QPushButton;
+QT_END_NAMESPACE
+
+class PermissionBar : public QWidget {
+    Q_OBJECT
+
+public:
+    PermissionBar(QWidget*);
+    void requestPermission(const QUrl &, QWebEnginePage::Feature feature);
+
+Q_SIGNALS:
+    void featurePermissionProvided(const QUrl &securityOrigin, QWebEnginePage::Feature, QWebEnginePage::PermissionPolicy);
+
+private Q_SLOTS:
+    void permissionDenied();
+    void permissionGranted();
+    void permissionUnknown();
+
+private:
+    QWebEnginePage::Feature m_feature;
+    QLabel *m_messageLabel;
+    QUrl m_securityOrigin;
+};
+
+#endif // PERMISSIONBAR_H
diff --git a/src/plaintexteditsearch.cpp b/src/plaintexteditsearch.cpp
index 04c900d6..a1bb8217 100644
--- a/src/plaintexteditsearch.cpp
+++ b/src/plaintexteditsearch.cpp
@@ -19,8 +19,8 @@
 
 #include "plaintexteditsearch.h"
 
-#include <qplaintextedit.h>
-#include <qtextcursor.h>
+#include <QPlainTextEdit>
+#include <QTextCursor>
 
 PlainTextEditSearch::PlainTextEditSearch(QPlainTextEdit *plainTextEdit, QWidget *parent)
     : SearchBar(parent)
@@ -31,7 +31,7 @@ PlainTextEditSearch::PlainTextEditSearch(QPlainTextEdit *plainTextEdit, QWidget
 
 void PlainTextEditSearch::findNext()
 {
-    find(0);
+    find(QTextDocument::FindFlags());
 }
 
 void PlainTextEditSearch::findPrevious()
diff --git a/src/plaintexteditsearch.h b/src/plaintexteditsearch.h
index 95527517..186f17c9 100644
--- a/src/plaintexteditsearch.h
+++ b/src/plaintexteditsearch.h
@@ -22,7 +22,7 @@
 
 #include "searchbar.h"
 
-#include <qtextdocument.h>
+#include <QTextDocument>
 
 class QPlainTextEdit;
 class PlainTextEditSearch : public SearchBar
@@ -30,9 +30,9 @@ class PlainTextEditSearch : public SearchBar
     Q_OBJECT
 
 public:
-    PlainTextEditSearch(QPlainTextEdit *plainTextEdit, QWidget *parent = 0);
+    PlainTextEditSearch(QPlainTextEdit *plainTextEdit, QWidget *parent = nullptr);
 
-public slots:
+public Q_SLOTS:
     void findNext();
     void findPrevious();
 
diff --git a/src/qwebplugins/endorphinwebplugin.cpp b/src/qwebplugins/endorphinwebplugin.cpp
deleted file mode 100644
index 6a389a81..00000000
--- a/src/qwebplugins/endorphinwebplugin.cpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "endorphinwebplugin.h"
-
-EndorphinWebPlugin::EndorphinWebPlugin()
-{
-}
-
-EndorphinWebPlugin::~EndorphinWebPlugin()
-{
-}
-
-bool EndorphinWebPlugin::isAnonymous() const
-{
-    return false;
-}
diff --git a/src/qwebplugins/endorphinwebplugin.h b/src/qwebplugins/endorphinwebplugin.h
deleted file mode 100644
index 97b1fe90..00000000
--- a/src/qwebplugins/endorphinwebplugin.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef ENDORPHINWEBPLUGIN_H
-#define ENDORPHINWEBPLUGIN_H
-
-#include <qwebpluginfactory.h>
-
-class EndorphinWebPlugin
-{
-
-public:
-    EndorphinWebPlugin();
-    virtual ~EndorphinWebPlugin();
-
-    virtual QWebPluginFactory::Plugin metaPlugin() = 0;
-    virtual QWidget *create(const QString &mimeType, const QUrl &url,
-                            const QStringList &argumentNames, const QStringList &argumentValues) = 0;
-    virtual void configure() = 0;
-    virtual bool isAnonymous() const;
-};
-
-#endif // ENDORPHINWEBPLUGIN_H
-
diff --git a/src/qwebplugins/qwebplugins.pri b/src/qwebplugins/qwebplugins.pri
deleted file mode 100644
index e663df8f..00000000
--- a/src/qwebplugins/qwebplugins.pri
+++ /dev/null
@@ -1,11 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += \
-  endorphinwebplugin.h \
-  webpluginfactory.h
-
-SOURCES += \
-  endorphinwebplugin.cpp \
-  webpluginfactory.cpp
diff --git a/src/qwebplugins/webpluginfactory.cpp b/src/qwebplugins/webpluginfactory.cpp
deleted file mode 100644
index f6ff9f7a..00000000
--- a/src/qwebplugins/webpluginfactory.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "webpluginfactory.h"
-
-#include <qwidget.h>
-#include <qurl.h>
-#include <qdebug.h>
-
-// #define WEBPLUGINFACTORY_DEBUG
-
-WebPluginFactory::WebPluginFactory(QObject *parent)
-    : QWebPluginFactory(parent)
-    , m_loaded(false)
-{
-}
-
-WebPluginFactory::~WebPluginFactory()
-{
-    qDeleteAll(m_plugins);
-    m_plugins.clear();
-}
-
-QObject *WebPluginFactory::create(const QString &mimeType, const QUrl &url, const QStringList &argumentNames, const QStringList &argumentValues) const
-{
-    if (!m_loaded)
-        init();
-
-#ifdef WEBPLUGINFACTORY_DEBUG
-    qDebug() << "WebPluginFactory::" << __FUNCTION__ << mimeType << url << argumentNames << argumentValues;
-#endif
-    EndorphinWebPlugin *plugin = m_pluginsCache[mimeType];
-    if (plugin)
-        return plugin->create(mimeType, url, argumentNames, argumentValues);
-#ifdef WEBPLUGINFACTORY_DEBUG
-    qDebug() << "WebPluginFactory::" << __FUNCTION__ << "No match";
-#endif
-    return 0;
-}
-
-QList<QWebPluginFactory::Plugin> WebPluginFactory::plugins() const
-{
-#ifdef WEBPLUGINFACTORY_DEBUG
-    qDebug() << "WebPluginFactory::" << __FUNCTION__;
-#endif
-    if (!m_loaded)
-        init();
-    QList<QWebPluginFactory::Plugin> plugins;
-    foreach (EndorphinWebPlugin *plugin, m_plugins) {
-        QWebPluginFactory::Plugin pluginInfo = plugin->metaPlugin();
-        if (!plugin->isAnonymous())
-            plugins.append(pluginInfo);
-    }
-    return plugins;
-}
-
-void WebPluginFactory::refreshPlugins()
-{
-#ifdef WEBPLUGINFACTORY_DEBUG
-    qDebug() << "WebPluginFactory::" << __FUNCTION__;
-#endif
-    init();
-    QWebPluginFactory::refreshPlugins();
-}
-
-void WebPluginFactory::init() const
-{
-    m_loaded = true;
-    m_pluginsCache.clear();
-    qDeleteAll(m_plugins);
-    m_plugins.clear();
-    foreach (EndorphinWebPlugin *plugin, m_plugins) {
-        foreach (const QWebPluginFactory::MimeType &pluginMimeType, plugin->metaPlugin().mimeTypes)
-            m_pluginsCache.insert(pluginMimeType.name, plugin);
-    }
-}
diff --git a/src/qwebplugins/webpluginfactory.h b/src/qwebplugins/webpluginfactory.h
deleted file mode 100644
index b6859b6c..00000000
--- a/src/qwebplugins/webpluginfactory.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef WEBPLUGINFACTORY_H
-#define WEBPLUGINFACTORY_H
-
-#include <qwebpluginfactory.h>
-#include <qhash.h>
-
-#include "endorphinwebplugin.h"
-
-class WebPluginFactory : public QWebPluginFactory
-{
-    Q_OBJECT
-
-public:
-    WebPluginFactory(QObject *parent = 0);
-    ~WebPluginFactory();
-
-    QObject *create(const QString &mimeType, const QUrl &url,
-                    const QStringList &argumentNames, const QStringList &argumentValues) const;
-    QList<QWebPluginFactory::Plugin> plugins() const;
-    void refreshPlugins();
-
-private:
-    void init() const;
-    mutable bool m_loaded;
-    mutable QList<EndorphinWebPlugin*> m_plugins;
-    mutable QHash<QString, EndorphinWebPlugin*> m_pluginsCache;
-};
-
-#endif // WEBPLUGINFACTORY_H
-
diff --git a/src/savepagedialog.cpp b/src/savepagedialog.cpp
new file mode 100644
index 00000000..6023e2a5
--- /dev/null
+++ b/src/savepagedialog.cpp
@@ -0,0 +1,139 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "savepagedialog.h"
+#include "ui_savepagedialog.h"
+
+#include <QtCore/QDir>
+#include <QtWidgets/QFileDialog>
+
+const QWebEngineDownloadItem::SavePageFormat SavePageDialog::m_indexToFormatTable[] = {
+    QWebEngineDownloadItem::SingleHtmlSaveFormat,
+    QWebEngineDownloadItem::CompleteHtmlSaveFormat,
+    QWebEngineDownloadItem::MimeHtmlSaveFormat
+};
+
+SavePageDialog::SavePageDialog(QWidget *parent, QWebEngineDownloadItem::SavePageFormat format,
+                               const QString &filePath)
+    : QDialog(parent)
+    , ui(new Ui::SavePageDialog)
+{
+    ui->setupUi(this);
+    ui->formatComboBox->setCurrentIndex(formatToIndex(format));
+    setFilePath(filePath);
+}
+
+SavePageDialog::~SavePageDialog()
+{
+    delete ui;
+}
+
+QWebEngineDownloadItem::SavePageFormat SavePageDialog::pageFormat() const
+{
+    return indexToFormat(ui->formatComboBox->currentIndex());
+}
+
+QString SavePageDialog::filePath() const
+{
+    return QDir::fromNativeSeparators(ui->filePathLineEdit->text());
+}
+
+void SavePageDialog::on_chooseFilePathButton_clicked()
+{
+    QFileInfo fi(filePath());
+    QFileDialog dlg(this, tr("Save Page As"), fi.absolutePath());
+    dlg.setAcceptMode(QFileDialog::AcceptSave);
+    dlg.setDefaultSuffix(suffixOfFormat(pageFormat()));
+    dlg.selectFile(fi.absoluteFilePath());
+    if (dlg.exec() != QDialog::Accepted)
+        return;
+    setFilePath(dlg.selectedFiles().first());
+    ensureFileSuffix(pageFormat());
+}
+
+void SavePageDialog::on_formatComboBox_currentIndexChanged(int idx)
+{
+    ensureFileSuffix(indexToFormat(idx));
+}
+
+int SavePageDialog::formatToIndex(QWebEngineDownloadItem::SavePageFormat format)
+{
+    for (auto i : m_indexToFormatTable) {
+        if (m_indexToFormatTable[i] == format)
+            return i;
+    }
+    Q_UNREACHABLE();
+}
+
+QWebEngineDownloadItem::SavePageFormat SavePageDialog::indexToFormat(int idx)
+{
+    Q_ASSERT(idx >= 0 && size_t(idx) < (sizeof(m_indexToFormatTable)
+                                        / sizeof(QWebEngineDownloadItem::SavePageFormat)));
+    return m_indexToFormatTable[idx];
+}
+
+QString SavePageDialog::suffixOfFormat(QWebEngineDownloadItem::SavePageFormat format)
+{
+    if (format == QWebEngineDownloadItem::MimeHtmlSaveFormat)
+        return QStringLiteral(".mhtml");
+    return QStringLiteral(".html");
+}
+
+void SavePageDialog::setFilePath(const QString &filePath)
+{
+    ui->filePathLineEdit->setText(QDir::toNativeSeparators(filePath));
+}
+
+void SavePageDialog::ensureFileSuffix(QWebEngineDownloadItem::SavePageFormat format)
+{
+    QFileInfo fi(filePath());
+    setFilePath(fi.absolutePath() + QChar('/') + fi.completeBaseName()
+                + suffixOfFormat(format));
+}
diff --git a/src/savepagedialog.h b/src/savepagedialog.h
new file mode 100644
index 00000000..03bb8935
--- /dev/null
+++ b/src/savepagedialog.h
@@ -0,0 +1,90 @@
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef SAVEPAGEDIALOG_H
+#define SAVEPAGEDIALOG_H
+
+#include <QtWidgets/QDialog>
+#include <QtWebEngineWidgets/QWebEngineDownloadItem>
+
+QT_BEGIN_NAMESPACE
+namespace Ui {
+class SavePageDialog;
+}
+QT_END_NAMESPACE
+
+class SavePageDialog : public QDialog
+{
+    Q_OBJECT
+
+public:
+    explicit SavePageDialog(QWidget *parent, QWebEngineDownloadItem::SavePageFormat format,
+                            const QString &filePath);
+    ~SavePageDialog();
+
+    QWebEngineDownloadItem::SavePageFormat pageFormat() const;
+    QString filePath() const;
+
+private Q_SLOTS:
+    void on_chooseFilePathButton_clicked();
+    void on_formatComboBox_currentIndexChanged(int idx);
+
+private:
+    static int formatToIndex(QWebEngineDownloadItem::SavePageFormat format);
+    static QWebEngineDownloadItem::SavePageFormat indexToFormat(int idx);
+    static QString suffixOfFormat(QWebEngineDownloadItem::SavePageFormat format);
+    void setFilePath(const QString &filePath);
+    void ensureFileSuffix(QWebEngineDownloadItem::SavePageFormat format);
+
+    static const QWebEngineDownloadItem::SavePageFormat m_indexToFormatTable[];
+    Ui::SavePageDialog *ui;
+};
+
+#endif // SAVEPAGEDIALOG_H
diff --git a/src/savepagedialog.ui b/src/savepagedialog.ui
new file mode 100644
index 00000000..9aa7cbe5
--- /dev/null
+++ b/src/savepagedialog.ui
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>SavePageDialog</class>
+ <widget class="QDialog" name="SavePageDialog">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>121</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Dialog</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>&amp;Format:</string>
+       </property>
+       <property name="buddy">
+        <cstring>formatComboBox</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="formatComboBox">
+       <item>
+        <property name="text">
+         <string>Single HTML</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Complete HTML</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>MIME HTML</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label_2">
+       <property name="text">
+        <string>&amp;Save to:</string>
+       </property>
+       <property name="buddy">
+        <cstring>filePathLineEdit</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <layout class="QHBoxLayout" name="horizontalLayout">
+       <item>
+        <widget class="QLineEdit" name="filePathLineEdit"/>
+       </item>
+       <item>
+        <widget class="QToolButton" name="chooseFilePathButton">
+         <property name="text">
+          <string>...</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>12</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <tabstops>
+  <tabstop>formatComboBox</tabstop>
+  <tabstop>filePathLineEdit</tabstop>
+  <tabstop>chooseFilePathButton</tabstop>
+ </tabstops>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>SavePageDialog</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>227</x>
+     <y>104</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>120</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>SavePageDialog</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>295</x>
+     <y>110</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>120</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
diff --git a/src/searchbar.cpp b/src/searchbar.cpp
index e2ed93d0..fd28790c 100644
--- a/src/searchbar.cpp
+++ b/src/searchbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,16 +19,17 @@
 
 #include "searchbar.h"
 
-#include <qevent.h>
-#include <qtimeline.h>
-#include <qshortcut.h>
+#include <QEvent>
+#include <QTimeLine>
+#include <QShortcut>
+#include <QResizeEvent>
 
-#include <qdebug.h>
+#include <QDebug>
 
 SearchBar::SearchBar(QWidget *parent)
     : QWidget(parent)
-    , m_object(0)
-    , m_widget(0)
+    , m_object(nullptr)
+    , m_widget(nullptr)
     , m_timeLine(new QTimeLine(150, this))
 {
     initializeSearchWidget();
@@ -61,9 +62,9 @@ void SearchBar::initializeSearchWidget()
     m_widget->setContentsMargins(0, 0, 0, 0);
     ui.setupUi(m_widget);
     ui.previousButton->setText(m_widget->layoutDirection()
-                == Qt::LeftToRight? QChar(9664): QChar(9654));
+                               == Qt::LeftToRight? QChar(9664): QChar(9654));
     ui.nextButton->setText(m_widget->layoutDirection()
-                == Qt::LeftToRight? QChar(9654): QChar(9664));
+                           == Qt::LeftToRight? QChar(9654): QChar(9664));
     ui.searchInfo->setText(QString());
     setMinimumWidth(m_widget->minimumWidth());
     setMaximumWidth(m_widget->maximumWidth());
diff --git a/src/searchbar.h b/src/searchbar.h
index 21865282..4b61e436 100644
--- a/src/searchbar.h
+++ b/src/searchbar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #ifndef SEARCHBAR_H
 #define SEARCHBAR_H
 
-#include <qwidget.h>
+#include <QWidget>
 
 #include "ui_searchbanner.h"
 
@@ -33,11 +33,11 @@ class SearchBar : public QWidget
     Q_OBJECT
 
 public:
-    SearchBar(QWidget *parent = 0);
+    SearchBar(QWidget *parent = nullptr);
     void setSearchObject(QObject *object);
     QObject *searchObject() const;
 
-public slots:
+public Q_SLOTS:
     void animateHide();
     void clear();
     void showFind();
@@ -48,7 +48,7 @@ public slots:
     void resizeEvent(QResizeEvent *event);
     Ui_SearchBanner ui;
 
-private slots:
+private Q_SLOTS:
     void frameChanged(int frame);
 
 private:
diff --git a/src/searchbutton.cpp b/src/searchbutton.cpp
index 89ba0a34..c053c974 100644
--- a/src/searchbutton.cpp
+++ b/src/searchbutton.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,10 +19,10 @@
 
 #include "searchbutton.h"
 
-#include <qcompleter.h>
-#include <qevent.h>
-#include <qlineedit.h>
-#include <qpainter.h>
+#include <QCompleter>
+#include <QEvent>
+#include <QLineEdit>
+#include <QPainter>
 #include <QPainterPath>
 
 SearchButton::SearchButton(QWidget *parent)
diff --git a/src/searchbutton.h b/src/searchbutton.h
index 347cac53..18802553 100644
--- a/src/searchbutton.h
+++ b/src/searchbutton.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
 #ifndef SEARCHBUTTON_H
 #define SEARCHBUTTON_H
 
-#include <qabstractbutton.h>
+#include <QAbstractButton>
 
 class QCompleter;
 class SearchButton : public QAbstractButton
@@ -28,7 +28,7 @@ class SearchButton : public QAbstractButton
     Q_OBJECT
 
 public:
-    SearchButton(QWidget *parent = 0);
+    SearchButton(QWidget *parent = nullptr);
     void setImage(const QImage &image);
     void setShowMenuTriangle(bool show);
     bool showMenuTriangle() const;
diff --git a/src/searchlineedit.cpp b/src/searchlineedit.cpp
index f6dd469a..5d1e9610 100644
--- a/src/searchlineedit.cpp
+++ b/src/searchlineedit.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes
+ * Copyright (c) 2020, Aaron Dewes
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/src/searchlineedit.h b/src/searchlineedit.h
index 9b7f4ec7..13b95dda 100644
--- a/src/searchlineedit.h
+++ b/src/searchlineedit.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes
+ * Copyright (c) 2020, Aaron Dewes
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,7 +38,7 @@ class SearchLineEdit : public LineEdit
     Q_OBJECT
 
 public:
-    SearchLineEdit(QWidget *parent = 0);
+    SearchLineEdit(QWidget *parent = nullptr);
 
     ClearButton *clearButton() const;
     SearchButton *searchButton() const;
diff --git a/src/settings.cpp b/src/settings.cpp
index 6d9c6743..efcf1da3 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,44 +63,34 @@
 #include "settings.h"
 
 #include "acceptlanguagedialog.h"
-#include "autofilldialog.h"
-#include "autofillmanager.h"
 #include "browserapplication.h"
 #include "browsermainwindow.h"
-#include "cookiedialog.h"
-#include "cookieexceptionsdialog.h"
-#include "cookiejar.h"
 #include "historymanager.h"
-#include "networkaccessmanager.h"
 #include "tabwidget.h"
-#include "webpluginfactory.h"
 #include "webpage.h"
 #include "webview.h"
 
-#include <qdesktopservices.h>
-#include <qfile.h>
-#include <qfontdialog.h>
-#include <qmetaobject.h>
-#include <qmessagebox.h>
-#include <qsettings.h>
-#include <qfiledialog.h>
+#include <QDesktopServices>
+#include <QFile>
+#include <QFontDialog>
+#include <QMetaObject>
+#include <QMessageBox>
+#include <QSettings>
+#include <QFileDialog>
 
 SettingsDialog::SettingsDialog(QWidget *parent)
     : QDialog(parent)
     , m_cacheEnabled(false)
 {
     setupUi(this);
-    connect(exceptionsButton, SIGNAL(clicked()), this, SLOT(showExceptions()));
     connect(setHomeToCurrentPageButton, SIGNAL(clicked()), this, SLOT(setHomeToCurrentPage()));
-    connect(cookiesButton, SIGNAL(clicked()), this, SLOT(showCookies()));
     connect(standardFontButton, SIGNAL(clicked()), this, SLOT(chooseFont()));
     connect(fixedFontButton, SIGNAL(clicked()), this, SLOT(chooseFixedFont()));
     connect(languageButton, SIGNAL(clicked()), this, SLOT(chooseAcceptLanguage()));
     connect(downloadDirectoryButton, SIGNAL(clicked()), this, SLOT(chooseDownloadDirectory()));
     connect(externalDownloadBrowse, SIGNAL(clicked()), this, SLOT(chooseDownloadProgram()));
     connect(styleSheetBrowseButton, SIGNAL(clicked()), this, SLOT(chooseStyleSheet()));
-
-    connect(editAutoFillUserButton, SIGNAL(clicked()), this, SLOT(editAutoFillUser()));
+    connect(newSettings, SIGNAL(clicked()), this, SLOT(openModernSettings()));
 
     loadDefaults();
     loadFromSettings();
@@ -108,29 +98,24 @@ SettingsDialog::SettingsDialog(QWidget *parent)
 
 void SettingsDialog::loadDefaults()
 {
-    QWebSettings *defaultSettings = QWebSettings::globalSettings();
-    QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont);
-    int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize);
+    QWebEngineSettings *defaultSettings = QWebEngineSettings::globalSettings();
+    QString standardFontFamily = defaultSettings->fontFamily(QWebEngineSettings::StandardFont);
+    int standardFontSize = defaultSettings->fontSize(QWebEngineSettings::DefaultFontSize);
     m_standardFont = QFont(standardFontFamily, standardFontSize);
-    standardLabel->setText(QString(QLatin1String("%1 %2")).arg(m_standardFont.family()).arg(m_standardFont.pointSize()));
+    standardLabel->setText(QString(QStringLiteral("%1 %2")).arg(m_standardFont.family()).arg(m_standardFont.pointSize()));
 
-    QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont);
-    int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize);
+    QString fixedFontFamily = defaultSettings->fontFamily(QWebEngineSettings::FixedFont);
+    int fixedFontSize = defaultSettings->fontSize(QWebEngineSettings::DefaultFixedFontSize);
     m_fixedFont = QFont(fixedFontFamily, fixedFontSize);
-    fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(m_fixedFont.family()).arg(m_fixedFont.pointSize()));
+    fixedLabel->setText(QString(QStringLiteral("%1 %2")).arg(m_fixedFont.family()).arg(m_fixedFont.pointSize()));
 
     downloadsLocation->setText(QStandardPaths::writableLocation(QStandardPaths::DesktopLocation));
 
-    blockPopupWindows->setChecked(!defaultSettings->testAttribute(QWebSettings::JavascriptCanOpenWindows));
-    enableJavascript->setChecked(defaultSettings->testAttribute(QWebSettings::JavascriptEnabled));
-    enablePlugins->setChecked(defaultSettings->testAttribute(QWebSettings::PluginsEnabled));
-    enableImages->setChecked(defaultSettings->testAttribute(QWebSettings::AutoLoadImages));
-    enableLocalStorage->setChecked(defaultSettings->testAttribute(QWebSettings::LocalStorageEnabled));
-    clickToFlash->setChecked(false);
-    cookieSessionCombo->setCurrentIndex(0);
-    filterTrackingCookiesCheckbox->setChecked(false);
+    blockPopupWindows->setChecked(!defaultSettings->testAttribute(QWebEngineSettings::JavascriptCanOpenWindows));
+    enableJavascript->setChecked(defaultSettings->testAttribute(QWebEngineSettings::JavascriptEnabled));
+    enableImages->setChecked(defaultSettings->testAttribute(QWebEngineSettings::AutoLoadImages));
+    enableLocalStorage->setChecked(defaultSettings->testAttribute(QWebEngineSettings::LocalStorageEnabled));
 
-    autoFillPasswordFormsCheckBox->setChecked(false);
     minimFontSizeCheckBox->setChecked(false);
     minimumFontSizeSpinBox->setValue(9);
 }
@@ -138,308 +123,251 @@ void SettingsDialog::loadDefaults()
 void SettingsDialog::loadFromSettings()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("Settings"));
-    tabWidget->setCurrentIndex(settings.value(QLatin1String("currentTab"), 0).toInt());
+    settings.beginGroup(QStringLiteral("Settings"));
+    tabWidget->setCurrentIndex(settings.value(QStringLiteral("currentTab"), 0).toInt());
     settings.endGroup();
 
-    settings.beginGroup(QLatin1String("MainWindow"));
-    QString defaultHome = QLatin1String("about:home");
-    homeLineEdit->setText(settings.value(QLatin1String("home"), defaultHome).toString());
-    startupBehavior->setCurrentIndex(settings.value(QLatin1String("startupBehavior"), 0).toInt());
+    settings.beginGroup(QStringLiteral("MainWindow"));
+    QString defaultHome = QStringLiteral("about:home");
+    homeLineEdit->setText(settings.value(QStringLiteral("home"), defaultHome).toString());
+    startupBehavior->setCurrentIndex(settings.value(QStringLiteral("startupBehavior"), 0).toInt());
     settings.endGroup();
 
-    settings.beginGroup(QLatin1String("history"));
-    int historyExpire = settings.value(QLatin1String("historyLimit")).toInt();
+    settings.beginGroup(QStringLiteral("history"));
+    int historyExpire = settings.value(QStringLiteral("historyLimit")).toInt();
     int idx = 0;
     switch (historyExpire) {
-    case 1: idx = 0; break;
-    case 7: idx = 1; break;
-    case 14: idx = 2; break;
-    case 30: idx = 3; break;
-    case 365: idx = 4; break;
-    case -1: idx = 5; break;
-    case -2: idx = 6; break;
+    case 1:
+        idx = 0;
+        break;
+    case 7:
+        idx = 1;
+        break;
+    case 14:
+        idx = 2;
+        break;
+    case 30:
+        idx = 3;
+        break;
+    case 365:
+        idx = 4;
+        break;
+    case -1:
+        idx = 5;
+        break;
+    case -2:
+        idx = 6;
+        break;
     default:
         idx = 5;
     }
     expireHistory->setCurrentIndex(idx);
     settings.endGroup();
 
-    settings.beginGroup(QLatin1String("urlloading"));
-    bool search = settings.value(QLatin1String("searchEngineFallback"), false).toBool();
+    settings.beginGroup(QStringLiteral("urlloading"));
+    bool search = settings.value(QStringLiteral("searchEngineFallback"), true).toBool();
     searchEngineFallback->setChecked(search);
     settings.endGroup();
 
-    settings.beginGroup(QLatin1String("downloadmanager"));
-    bool alwaysPromptForFileName = settings.value(QLatin1String("alwaysPromptForFileName"), false).toBool();
+    settings.beginGroup(QStringLiteral("downloadmanager"));
+    bool alwaysPromptForFileName = settings.value(QStringLiteral("alwaysPromptForFileName"), false).toBool();
     downloadAsk->setChecked(alwaysPromptForFileName);
-    QString downloadDirectory = settings.value(QLatin1String("downloadDirectory"), downloadsLocation->text()).toString();
+    QString downloadDirectory = settings.value(QStringLiteral("downloadDirectory"), downloadsLocation->text()).toString();
     downloadsLocation->setText(downloadDirectory);
-    externalDownloadButton->setChecked(settings.value(QLatin1String("external"), false).toBool());
-    externalDownloadPath->setText(settings.value(QLatin1String("externalPath")).toString());
+    externalDownloadButton->setChecked(settings.value(QStringLiteral("external"), false).toBool());
+    externalDownloadPath->setText(settings.value(QStringLiteral("externalPath")).toString());
     settings.endGroup();
 
     // Appearance
-    settings.beginGroup(QLatin1String("websettings"));
-    m_fixedFont = settings.value(QLatin1String("fixedFont"), m_fixedFont).value<QFont>();
-    m_standardFont = settings.value(QLatin1String("standardFont"), m_standardFont).value<QFont>();
-
-    standardLabel->setText(QString(QLatin1String("%1 %2")).arg(m_standardFont.family()).arg(m_standardFont.pointSize()));
-    fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(m_fixedFont.family()).arg(m_fixedFont.pointSize()));
-
-    blockPopupWindows->setChecked(settings.value(QLatin1String("blockPopupWindows"), blockPopupWindows->isChecked()).toBool());
-    enableJavascript->setChecked(settings.value(QLatin1String("enableJavascript"), enableJavascript->isChecked()).toBool());
-    enablePlugins->setChecked(settings.value(QLatin1String("enablePlugins"), enablePlugins->isChecked()).toBool());
-    enableImages->setChecked(settings.value(QLatin1String("enableImages"), enableImages->isChecked()).toBool());
-    enableLocalStorage->setChecked(settings.value(QLatin1String("enableLocalStorage"), enableLocalStorage->isChecked()).toBool());
-    userStyleSheet->setText(QString::fromUtf8(settings.value(QLatin1String("userStyleSheet")).toUrl().toEncoded()));
-    int minimumFontSize = settings.value(QLatin1String("minimumFontSize"), 0).toInt();
+    settings.beginGroup(QStringLiteral("websettings"));
+    m_fixedFont = settings.value(QStringLiteral("fixedFont"), m_fixedFont).value<QFont>();
+    m_standardFont = settings.value(QStringLiteral("standardFont"), m_standardFont).value<QFont>();
+
+    standardLabel->setText(QString(QStringLiteral("%1 %2")).arg(m_standardFont.family()).arg(m_standardFont.pointSize()));
+    fixedLabel->setText(QString(QStringLiteral("%1 %2")).arg(m_fixedFont.family()).arg(m_fixedFont.pointSize()));
+
+    blockPopupWindows->setChecked(settings.value(QStringLiteral("blockPopupWindows"), blockPopupWindows->isChecked()).toBool());
+    enableJavascript->setChecked(settings.value(QStringLiteral("enableJavascript"), enableJavascript->isChecked()).toBool());
+    enableImages->setChecked(settings.value(QStringLiteral("enableImages"), enableImages->isChecked()).toBool());
+    enableLocalStorage->setChecked(settings.value(QStringLiteral("enableLocalStorage"), enableLocalStorage->isChecked()).toBool());
+    userStyleSheet->setText(QString::fromUtf8(settings.value(QStringLiteral("userStyleSheet")).toUrl().toEncoded()));
+    int minimumFontSize = settings.value(QStringLiteral("minimumFontSize"), 0).toInt();
     minimFontSizeCheckBox->setChecked(minimumFontSize != 0);
     if (minimumFontSize != 0)
         minimumFontSizeSpinBox->setValue(minimumFontSize);
     settings.endGroup();
-
-    // Privacy
-    settings.beginGroup(QLatin1String("cookies"));
-
-    QByteArray value = settings.value(QLatin1String("acceptCookies"), QLatin1String("AcceptOnlyFromSitesNavigatedTo")).toByteArray();
-    QMetaEnum acceptPolicyEnum = CookieJar::staticMetaObject.enumerator(CookieJar::staticMetaObject.indexOfEnumerator("AcceptPolicy"));
-    CookieJar::AcceptPolicy acceptCookies = acceptPolicyEnum.keyToValue(value) == -1 ?
-                        CookieJar::AcceptOnlyFromSitesNavigatedTo :
-                        static_cast<CookieJar::AcceptPolicy>(acceptPolicyEnum.keyToValue(value));
-    switch (acceptCookies) {
-    case CookieJar::AcceptAlways:
-        acceptCombo->setCurrentIndex(0);
-        break;
-    case CookieJar::AcceptNever:
-        acceptCombo->setCurrentIndex(1);
-        break;
-    case CookieJar::AcceptOnlyFromSitesNavigatedTo:
-        acceptCombo->setCurrentIndex(2);
-        break;
-    }
-
-    value = settings.value(QLatin1String("keepCookiesUntil"), QLatin1String("Expire")).toByteArray();
-    QMetaEnum keepPolicyEnum = CookieJar::staticMetaObject.enumerator(CookieJar::staticMetaObject.indexOfEnumerator("KeepPolicy"));
-    CookieJar::KeepPolicy keepCookies = keepPolicyEnum.keyToValue(value) == -1 ?
-                        CookieJar::KeepUntilExpire :
-                        static_cast<CookieJar::KeepPolicy>(keepPolicyEnum.keyToValue(value));
-    switch (keepCookies) {
-    case CookieJar::KeepUntilExpire:
-        keepUntilCombo->setCurrentIndex(0);
-        break;
-    case CookieJar::KeepUntilExit:
-        keepUntilCombo->setCurrentIndex(1);
-        break;
-    case CookieJar::KeepUntilTimeLimit:
-        keepUntilCombo->setCurrentIndex(2);
-        break;
-    }
-    int sessionLength = settings.value(QLatin1String("sessionLength"), -1).toInt();
-    switch (sessionLength) {
-    case 1: cookieSessionCombo->setCurrentIndex(1); break;
-    case 2: cookieSessionCombo->setCurrentIndex(2); break;
-    case 3: cookieSessionCombo->setCurrentIndex(3); break;
-    case 7: cookieSessionCombo->setCurrentIndex(4); break;
-    case 30: cookieSessionCombo->setCurrentIndex(5); break;
-    default:
-    case 0: cookieSessionCombo->setCurrentIndex(0); break;
+    // UI Appearance
+    settings.beginGroup(QStringLiteral("appearance"));
+    urlBarType->setCurrentIndex(settings.value(QStringLiteral("urlBarType"), 0).toInt());
+    settings.endGroup();
+    if(urlBarType->currentIndex() == 1) {
+        // Required so URL bar accepts search terms
+        settings.beginGroup(QStringLiteral("urlloading"));
+        settings.setValue(QStringLiteral("searchEngineFallback"), true);
+        searchEngineFallback->setChecked(true);
+        searchEngineFallback->setEnabled(false);
+    } else {
+        searchEngineFallback->setEnabled(true);
     }
-    filterTrackingCookiesCheckbox->setChecked(settings.value(QLatin1String("filterTrackingCookies"), false).toBool());
     settings.endGroup();
 
     // Network
-    settings.beginGroup(QLatin1String("network"));
-    m_cacheEnabled = settings.value(QLatin1String("cacheEnabled"), true).toBool();
+    settings.beginGroup(QStringLiteral("network"));
+    m_cacheEnabled = settings.value(QStringLiteral("cacheEnabled"), true).toBool();
     networkCache->setChecked(m_cacheEnabled);
-    networkCacheMaximumSizeSpinBox->setValue(settings.value(QLatin1String("maximumCacheSize"), 50).toInt());
+    networkCacheMaximumSizeSpinBox->setValue(settings.value(QStringLiteral("maximumCacheSize"), 50).toInt());
     settings.endGroup();
 
     // Proxy
-    settings.beginGroup(QLatin1String("proxy"));
-    proxySupport->setChecked(settings.value(QLatin1String("enabled"), false).toBool());
-    proxyType->setCurrentIndex(settings.value(QLatin1String("type"), 0).toInt());
-    proxyHostName->setText(settings.value(QLatin1String("hostName")).toString());
-    proxyPort->setValue(settings.value(QLatin1String("port"), 1080).toInt());
-    proxyUserName->setText(settings.value(QLatin1String("userName")).toString());
-    proxyPassword->setText(settings.value(QLatin1String("password")).toString());
+    settings.beginGroup(QStringLiteral("proxy"));
+    proxySupport->setChecked(settings.value(QStringLiteral("enabled"), false).toBool());
+    proxyType->setCurrentIndex(settings.value(QStringLiteral("type"), 0).toInt());
+    proxyHostName->setText(settings.value(QStringLiteral("hostName")).toString());
+    proxyPort->setValue(settings.value(QStringLiteral("port"), 1080).toInt());
+    proxyUserName->setText(settings.value(QStringLiteral("userName")).toString());
+    proxyPassword->setText(settings.value(QStringLiteral("password")).toString());
     settings.endGroup();
 
     // Tabs
-    settings.beginGroup(QLatin1String("tabs"));
-    selectTabsWhenCreated->setChecked(settings.value(QLatin1String("selectNewTabs"), false).toBool());
-    confirmClosingMultipleTabs->setChecked(settings.value(QLatin1String("confirmClosingMultipleTabs"), true).toBool());
-    oneCloseButton->setChecked(settings.value(QLatin1String("oneCloseButton"),false).toBool());
-    quitAsLastTabClosed->setChecked(settings.value(QLatin1String("quitAsLastTabClosed"), true).toBool());
-    openTargetBlankLinksIn->setCurrentIndex(settings.value(QLatin1String("openTargetBlankLinksIn"), TabWidget::NewSelectedTab).toInt());
-    openLinksFromAppsIn->setCurrentIndex(settings.value(QLatin1String("openLinksFromAppsIn"), TabWidget::NewSelectedTab).toInt());
+    settings.beginGroup(QStringLiteral("tabs"));
+    selectTabsWhenCreated->setChecked(settings.value(QStringLiteral("selectNewTabs"), false).toBool());
+    confirmClosingMultipleTabs->setChecked(settings.value(QStringLiteral("confirmClosingMultipleTabs"), true).toBool());
+    oneCloseButton->setChecked(settings.value(QStringLiteral("oneCloseButton"),false).toBool());
+    quitAsLastTabClosed->setChecked(settings.value(QStringLiteral("quitAsLastTabClosed"), true).toBool());
+    openTargetBlankLinksIn->setCurrentIndex(settings.value(QStringLiteral("openTargetBlankLinksIn"), TabWidget::NewSelectedTab).toInt());
+    openLinksFromAppsIn->setCurrentIndex(settings.value(QStringLiteral("openLinksFromAppsIn"), TabWidget::NewSelectedTab).toInt());
     settings.endGroup();
 
     // Accessibility
-    settings.beginGroup(QLatin1String("WebView"));
-    enableAccessKeys->setChecked(settings.value(QLatin1String("enableAccessKeys"), true).toBool());
-    settings.endGroup();
-
-    settings.beginGroup(QLatin1String("autofill"));
-    autoFillPasswordFormsCheckBox->setChecked(settings.value(QLatin1String("passwordForms"), true).toBool());
+    settings.beginGroup(QStringLiteral("WebView"));
+    enableAccessKeys->setChecked(settings.value(QStringLiteral("enableAccessKeys"), true).toBool());
     settings.endGroup();
 }
 
 void SettingsDialog::saveToSettings()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("Settings"));
-    settings.setValue(QLatin1String("currentTab"), tabWidget->currentIndex());
+    settings.beginGroup(QStringLiteral("Settings"));
+    settings.setValue(QStringLiteral("currentTab"), tabWidget->currentIndex());
     settings.endGroup();
 
-    settings.beginGroup(QLatin1String("MainWindow"));
-    settings.setValue(QLatin1String("home"), homeLineEdit->text());
-    settings.setValue(QLatin1String("startupBehavior"), startupBehavior->currentIndex());
+    settings.beginGroup(QStringLiteral("MainWindow"));
+    settings.setValue(QStringLiteral("home"), homeLineEdit->text());
+    settings.setValue(QStringLiteral("startupBehavior"), startupBehavior->currentIndex());
     settings.endGroup();
 
-    settings.beginGroup(QLatin1String("downloadmanager"));
-    settings.setValue(QLatin1String("alwaysPromptForFileName"), downloadAsk->isChecked());
-    settings.setValue(QLatin1String("downloadDirectory"), downloadsLocation->text());
-    settings.setValue(QLatin1String("external"), externalDownloadButton->isChecked());
-    settings.setValue(QLatin1String("externalPath"), externalDownloadPath->text());
+    settings.beginGroup(QStringLiteral("downloadmanager"));
+    settings.setValue(QStringLiteral("alwaysPromptForFileName"), downloadAsk->isChecked());
+    settings.setValue(QStringLiteral("downloadDirectory"), downloadsLocation->text());
+    settings.setValue(QStringLiteral("external"), externalDownloadButton->isChecked());
+    settings.setValue(QStringLiteral("externalPath"), externalDownloadPath->text());
     settings.endGroup();
 
-    settings.beginGroup(QLatin1String("history"));
+    settings.beginGroup(QStringLiteral("history"));
     int historyExpire = expireHistory->currentIndex();
     int idx = -1;
     switch (historyExpire) {
-    case 0: idx = 1; break;
-    case 1: idx = 7; break;
-    case 2: idx = 14; break;
-    case 3: idx = 30; break;
-    case 4: idx = 365; break;
-    case 5: idx = -1; break;
-    case 6: idx = -2; break;
+    case 0:
+        idx = 1;
+        break;
+    case 1:
+        idx = 7;
+        break;
+    case 2:
+        idx = 14;
+        break;
+    case 3:
+        idx = 30;
+        break;
+    case 4:
+        idx = 365;
+        break;
+    case 5:
+        idx = -1;
+        break;
+    case 6:
+        idx = -2;
+        break;
     }
-    settings.setValue(QLatin1String("historyLimit"), idx);
+    settings.setValue(QStringLiteral("historyLimit"), idx);
     settings.endGroup();
 
-    settings.beginGroup(QLatin1String("urlloading"));
-    settings.setValue(QLatin1String("searchEngineFallback"), searchEngineFallback->isChecked());
+    settings.beginGroup(QStringLiteral("urlloading"));
+    settings.setValue(QStringLiteral("searchEngineFallback"), searchEngineFallback->isChecked());
     settings.endGroup();
 
     // Appearance
-    settings.beginGroup(QLatin1String("websettings"));
-    settings.setValue(QLatin1String("fixedFont"), m_fixedFont);
-    settings.setValue(QLatin1String("standardFont"), m_standardFont);
-
-    settings.setValue(QLatin1String("blockPopupWindows"), blockPopupWindows->isChecked());
-    settings.setValue(QLatin1String("enableJavascript"), enableJavascript->isChecked());
-    settings.setValue(QLatin1String("enablePlugins"), enablePlugins->isChecked());
-    settings.setValue(QLatin1String("enableImages"), enableImages->isChecked());
-    settings.setValue(QLatin1String("enableLocalStorage"), enableLocalStorage->isChecked());
+    settings.beginGroup(QStringLiteral("websettings"));
+    settings.setValue(QStringLiteral("fixedFont"), m_fixedFont);
+    settings.setValue(QStringLiteral("standardFont"), m_standardFont);
+
+    settings.setValue(QStringLiteral("blockPopupWindows"), blockPopupWindows->isChecked());
+    settings.setValue(QStringLiteral("enableJavascript"), enableJavascript->isChecked());
+    settings.setValue(QStringLiteral("enableImages"), enableImages->isChecked());
+    settings.setValue(QStringLiteral("enableLocalStorage"), enableLocalStorage->isChecked());
     QString userStyleSheetString = userStyleSheet->text();
     if (QFile::exists(userStyleSheetString))
-        settings.setValue(QLatin1String("userStyleSheet"), QUrl::fromLocalFile(userStyleSheetString));
+        settings.setValue(QStringLiteral("userStyleSheet"), QUrl::fromLocalFile(userStyleSheetString));
     else
-        settings.setValue(QLatin1String("userStyleSheet"), QUrl::fromEncoded(userStyleSheetString.toUtf8()));
-    settings.setValue(QLatin1String("enableClickToFlash"), clickToFlash->isChecked());
+        settings.setValue(QStringLiteral("userStyleSheet"), QUrl::fromEncoded(userStyleSheetString.toUtf8()));
 
     if (minimFontSizeCheckBox->isChecked())
-        settings.setValue(QLatin1String("minimumFontSize"), minimumFontSizeSpinBox->value());
+        settings.setValue(QStringLiteral("minimumFontSize"), minimumFontSizeSpinBox->value());
     else
-        settings.setValue(QLatin1String("minimumFontSize"), 0);
+        settings.setValue(QStringLiteral("minimumFontSize"), 0);
     settings.endGroup();
-
-    // Privacy
-    settings.beginGroup(QLatin1String("cookies"));
-    CookieJar::AcceptPolicy acceptCookies;
-    switch (acceptCombo->currentIndex()) {
-    default:
-    case 0:
-        acceptCookies = CookieJar::AcceptAlways;
-        break;
-    case 1:
-        acceptCookies = CookieJar::AcceptNever;
-        break;
-    case 2:
-        acceptCookies = CookieJar::AcceptOnlyFromSitesNavigatedTo;
-        break;
-    }
-
-    QMetaEnum acceptPolicyEnum = CookieJar::staticMetaObject.enumerator(CookieJar::staticMetaObject.indexOfEnumerator("AcceptPolicy"));
-    settings.setValue(QLatin1String("acceptCookies"), QLatin1String(acceptPolicyEnum.valueToKey(acceptCookies)));
-
-    CookieJar::KeepPolicy keepPolicy;
-    switch (keepUntilCombo->currentIndex()) {
-    default:
-    case 0:
-        keepPolicy = CookieJar::KeepUntilExpire;
-        break;
-    case 1:
-        keepPolicy = CookieJar::KeepUntilExit;
-        break;
-    case 2:
-        keepPolicy = CookieJar::KeepUntilTimeLimit;
-        break;
-    }
-
-    QMetaEnum keepPolicyEnum = CookieJar::staticMetaObject.enumerator(CookieJar::staticMetaObject.indexOfEnumerator("KeepPolicy"));
-    settings.setValue(QLatin1String("keepCookiesUntil"), QLatin1String(keepPolicyEnum.valueToKey(keepPolicy)));
-    int sessionLength = cookieSessionCombo->currentIndex();
-    switch (sessionLength) {
-    case 1: sessionLength = 1; break;
-    case 2: sessionLength = 2; break;
-    case 3: sessionLength = 3; break;
-    case 4: sessionLength = 7; break;
-    case 5: sessionLength = 30; break;
-    default:
-    case 0: sessionLength = -1; break;
+    // UI Appearance
+    settings.beginGroup(QStringLiteral("appearance"));
+    settings.setValue(QStringLiteral("urlBarType"), urlBarType->currentIndex());
+    settings.endGroup();
+    if(urlBarType->currentIndex() == 1) {
+        // Required so URL bar accepts search terms
+        settings.beginGroup(QStringLiteral("urlloading"));
+        settings.setValue(QStringLiteral("searchEngineFallback"), true);
+        searchEngineFallback->setChecked(true);
+        searchEngineFallback->setEnabled(false);
+    } else {
+        searchEngineFallback->setEnabled(true);
     }
-    settings.setValue(QLatin1String("sessionLength"), sessionLength);
-    settings.setValue(QLatin1String("filterTrackingCookies"), filterTrackingCookiesCheckbox->isChecked());
     settings.endGroup();
 
+
     // Network
-    settings.beginGroup(QLatin1String("network"));
-    settings.setValue(QLatin1String("cacheEnabled"), networkCache->isChecked());
-    settings.setValue(QLatin1String("maximumCacheSize"), networkCacheMaximumSizeSpinBox->value());
+    settings.beginGroup(QStringLiteral("network"));
+    settings.setValue(QStringLiteral("cacheEnabled"), networkCache->isChecked());
+    settings.setValue(QStringLiteral("maximumCacheSize"), networkCacheMaximumSizeSpinBox->value());
     settings.endGroup();
 
     // proxy
-    settings.beginGroup(QLatin1String("proxy"));
-    settings.setValue(QLatin1String("enabled"), proxySupport->isChecked());
-    settings.setValue(QLatin1String("type"), proxyType->currentIndex());
-    settings.setValue(QLatin1String("hostName"), proxyHostName->text());
-    settings.setValue(QLatin1String("port"), proxyPort->text());
-    settings.setValue(QLatin1String("userName"), proxyUserName->text());
-    settings.setValue(QLatin1String("password"), proxyPassword->text());
+    settings.beginGroup(QStringLiteral("proxy"));
+    settings.setValue(QStringLiteral("enabled"), proxySupport->isChecked());
+    settings.setValue(QStringLiteral("type"), proxyType->currentIndex());
+    settings.setValue(QStringLiteral("hostName"), proxyHostName->text());
+    settings.setValue(QStringLiteral("port"), proxyPort->text());
+    settings.setValue(QStringLiteral("userName"), proxyUserName->text());
+    settings.setValue(QStringLiteral("password"), proxyPassword->text());
     settings.endGroup();
 
     // Tabs
-    settings.beginGroup(QLatin1String("tabs"));
-    settings.setValue(QLatin1String("selectNewTabs"), selectTabsWhenCreated->isChecked());
-    settings.setValue(QLatin1String("confirmClosingMultipleTabs"), confirmClosingMultipleTabs->isChecked());
-    settings.setValue(QLatin1String("oneCloseButton"), oneCloseButton->isChecked());
-    settings.setValue(QLatin1String("quitAsLastTabClosed"), quitAsLastTabClosed->isChecked());
-    settings.setValue(QLatin1String("openTargetBlankLinksIn"), openTargetBlankLinksIn->currentIndex());
-    settings.setValue(QLatin1String("openLinksFromAppsIn"), openLinksFromAppsIn->currentIndex());
-    settings.endGroup();
-
-    settings.beginGroup(QLatin1String("autofill"));
-    settings.setValue(QLatin1String("passwordForms"), autoFillPasswordFormsCheckBox->isChecked());
+    settings.beginGroup(QStringLiteral("tabs"));
+    settings.setValue(QStringLiteral("selectNewTabs"), selectTabsWhenCreated->isChecked());
+    settings.setValue(QStringLiteral("confirmClosingMultipleTabs"), confirmClosingMultipleTabs->isChecked());
+    settings.setValue(QStringLiteral("oneCloseButton"), oneCloseButton->isChecked());
+    settings.setValue(QStringLiteral("quitAsLastTabClosed"), quitAsLastTabClosed->isChecked());
+    settings.setValue(QStringLiteral("openTargetBlankLinksIn"), openTargetBlankLinksIn->currentIndex());
+    settings.setValue(QStringLiteral("openLinksFromAppsIn"), openLinksFromAppsIn->currentIndex());
     settings.endGroup();
 
     // Accessibility
-    settings.beginGroup(QLatin1String("WebView"));
-    settings.setValue(QLatin1String("enableAccessKeys"), enableAccessKeys->isChecked());
+    settings.beginGroup(QStringLiteral("WebView"));
+    settings.setValue(QStringLiteral("enableAccessKeys"), enableAccessKeys->isChecked());
     settings.endGroup();
 
     BrowserApplication::instance()->loadSettings();
-    BrowserApplication::networkAccessManager()->loadSettings();
-    BrowserApplication::cookieJar()->loadSettings();
     BrowserApplication::historyManager()->loadSettings();
-    BrowserApplication::autoFillManager()->loadSettings();
-
-    WebPage::webPluginFactory()->refreshPlugins();
 
     QList<BrowserMainWindow*> list = BrowserApplication::instance()->mainWindows();
-    foreach (BrowserMainWindow *mainWindow, list) {
+    Q_FOREACH (BrowserMainWindow *mainWindow, list) {
         mainWindow->tabWidget()->loadSettings();
     }
 }
@@ -450,18 +378,6 @@ void SettingsDialog::accept()
     QDialog::accept();
 }
 
-void SettingsDialog::showCookies()
-{
-    CookieDialog dialog(BrowserApplication::cookieJar(), this);
-    dialog.exec();
-}
-
-void SettingsDialog::showExceptions()
-{
-    CookieExceptionsDialog dialog(BrowserApplication::cookieJar(), this);
-    dialog.exec();
-}
-
 void SettingsDialog::chooseDownloadDirectory()
 {
     QString fileName = QFileDialog::getExistingDirectory(this, tr("Choose Directory"), downloadsLocation->text());
@@ -471,8 +387,8 @@ void SettingsDialog::chooseDownloadDirectory()
 void SettingsDialog::chooseDownloadProgram()
 {
     QString fileName = QFileDialog::getOpenFileName(this, tr("Choose Program"), externalDownloadPath->text());
-    if (fileName.contains(QLatin1Char(' ')))
-        fileName = QString(QLatin1String("\"%1\"")).arg(fileName);
+    if (fileName.contains(QChar(' ')))
+        fileName = QString(QStringLiteral("\"%1\"")).arg(fileName);
     externalDownloadPath->setText(fileName);
 }
 
@@ -482,7 +398,7 @@ void SettingsDialog::chooseFont()
     QFont font = QFontDialog::getFont(&ok, m_standardFont, this);
     if (ok) {
         m_standardFont = font;
-        standardLabel->setText(QString(QLatin1String("%1 %2")).arg(font.family()).arg(font.pointSize()));
+        standardLabel->setText(QString(QStringLiteral("%1 %2")).arg(font.family()).arg(font.pointSize()));
     }
 }
 
@@ -492,7 +408,7 @@ void SettingsDialog::chooseFixedFont()
     QFont font = QFontDialog::getFont(&ok, m_fixedFont, this);
     if (ok) {
         m_fixedFont = font;
-        fixedLabel->setText(QString(QLatin1String("%1 %2")).arg(font.family()).arg(font.pointSize()));
+        fixedLabel->setText(QString(QStringLiteral("%1 %2")).arg(font.family()).arg(font.pointSize()));
     }
 }
 
@@ -517,9 +433,8 @@ void SettingsDialog::chooseStyleSheet()
     userStyleSheet->setText(QString::fromUtf8(QUrl::fromLocalFile(fileName).toEncoded()));
 }
 
-void SettingsDialog::editAutoFillUser()
-{
-    AutoFillDialog dialog;
-    dialog.exec();
+void SettingsDialog::openModernSettings() {
+    BrowserMainWindow *mw = static_cast<BrowserMainWindow*>(parent());
+    mw->tabWidget()->loadUrl(QUrl("qrc:/settings.html"), TabWidget::NewSelectedTab, "Settings");
+    close();
 }
-
diff --git a/src/settings.h b/src/settings.h
index fae23c3b..c0c18402 100644
--- a/src/settings.h
+++ b/src/settings.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
 #ifndef SETTINGS_H
 #define SETTINGS_H
 
-#include <qdialog.h>
+#include <QDialog>
 #include "ui_settings.h"
 
 class SettingsDialog : public QDialog, public Ui_Settings
@@ -71,17 +71,15 @@ class SettingsDialog : public QDialog, public Ui_Settings
     Q_OBJECT
 
 public:
-    SettingsDialog(QWidget *parent = 0);
+    SettingsDialog(QWidget *parent = nullptr);
     void accept();
 
-private slots:
+private Q_SLOTS:
     void loadDefaults();
     void loadFromSettings();
     void saveToSettings();
 
     void setHomeToCurrentPage();
-    void showCookies();
-    void showExceptions();
 
     void chooseDownloadDirectory();
     void chooseDownloadProgram();
@@ -90,7 +88,7 @@ private slots:
     void chooseAcceptLanguage();
 
     void chooseStyleSheet();
-    void editAutoFillUser();
+    void openModernSettings();
 
 private:
     QFont m_standardFont;
diff --git a/src/settings.ui b/src/settings.ui
index 43275b52..1d62f94f 100644
--- a/src/settings.ui
+++ b/src/settings.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>677</width>
-    <height>442</height>
+    <height>445</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -29,78 +29,86 @@
      <property name="currentIndex">
       <number>2</number>
      </property>
+     <widget class="QWidget" name="moving_info">
+      <property name="enabled">
+       <bool>true</bool>
+      </property>
+      <attribute name="title">
+       <string>Information</string>
+      </attribute>
+      <widget class="QWidget" name="gridLayoutWidget">
+       <property name="geometry">
+        <rect>
+         <x>10</x>
+         <y>10</y>
+         <width>641</width>
+         <height>341</height>
+        </rect>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_8">
+        <item row="0" column="0">
+         <layout class="QGridLayout" name="gridLayout_9">
+          <item row="3" column="1">
+           <widget class="QPushButton" name="newSettings">
+            <property name="text">
+             <string>Open the new settings</string>
+            </property>
+           </widget>
+          </item>
+          <item row="1" column="1">
+           <widget class="QLabel" name="moving_Heading">
+            <property name="font">
+             <font>
+              <family>Open Sans Light</family>
+              <pointsize>25</pointsize>
+              <weight>50</weight>
+              <bold>false</bold>
+              <stylestrategy>PreferDefault</stylestrategy>
+              <kerning>true</kerning>
+             </font>
+            </property>
+            <property name="text">
+             <string>The settings are moving!</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="1">
+           <widget class="QLabel" name="moving_Explained">
+            <property name="text">
+             <string>The settings here will be moved soon.  We're modernizing and redesigning this browser currently, and we're moving the settings into a web page. In the future, the settings will only be accessible at endorphin://settings. You can already try using the experimental version by pressing the button below, but not all settings are available there yet.</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignCenter</set>
+            </property>
+            <property name="wordWrap">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </widget>
      <widget class="QWidget" name="tab">
       <attribute name="title">
        <string>General</string>
       </attribute>
       <layout class="QGridLayout" name="gridLayout_4">
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_7">
-         <property name="text">
-          <string>On startup:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1" colspan="2">
-        <widget class="QComboBox" name="startupBehavior">
-         <item>
-          <property name="text">
-           <string>Show my home page</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Show a blank page</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Restore windows and tabs from last time</string>
-          </property>
-         </item>
-        </widget>
-       </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_3">
+       <item row="3" column="0" colspan="3">
+        <widget class="QCheckBox" name="searchEngineFallback">
          <property name="text">
-          <string>Home Page:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-         </property>
-        </widget>
-       </item>
-       <item row="1" column="1">
-        <widget class="QLineEdit" name="homeLineEdit">
-         <property name="layoutDirection">
-          <enum>Qt::LeftToRight</enum>
+          <string>Use the default search engine as fallback when the URL given by the user is invalid</string>
          </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <widget class="QPushButton" name="setHomeToCurrentPageButton">
-         <property name="text">
-          <string>Set to current page</string>
+         <property name="checked">
+          <bool>false</bool>
          </property>
         </widget>
        </item>
-       <item row="2" column="2">
-        <spacer name="horizontalSpacer">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>280</width>
-           <height>18</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="3" column="0">
+       <item row="2" column="0">
         <widget class="QLabel" name="label_4">
          <property name="text">
           <string>Remove history items:</string>
@@ -110,63 +118,7 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="1">
-        <widget class="QComboBox" name="expireHistory">
-         <item>
-          <property name="text">
-           <string>After one day</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>After one week</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>After two weeks</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>After one month</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>After one year</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>Manually</string>
-          </property>
-         </item>
-         <item>
-          <property name="text">
-           <string>On application exit</string>
-          </property>
-         </item>
-        </widget>
-       </item>
-       <item row="4" column="0" colspan="3">
-        <widget class="QCheckBox" name="searchEngineFallback">
-         <property name="text">
-          <string>Use the default search engine as fallback when the URL given by the user is invalid</string>
-         </property>
-         <property name="checked">
-          <bool>false</bool>
-         </property>
-        </widget>
-       </item>
        <item row="5" column="0" colspan="3">
-        <widget class="QCheckBox" name="enableAccessKeys">
-         <property name="text">
-          <string>Enable access keys</string>
-         </property>
-        </widget>
-       </item>
-       <item row="6" column="0" colspan="3">
         <widget class="QGroupBox" name="groupBox_2">
          <property name="title">
           <string>Downloads</string>
@@ -228,22 +180,108 @@
             </item>
            </layout>
           </item>
-          <item>
-           <spacer>
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>608</width>
-              <height>15</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
          </layout>
         </widget>
        </item>
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_7">
+         <property name="text">
+          <string>On startup:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="2">
+        <widget class="QPushButton" name="setHomeToCurrentPageButton">
+         <property name="text">
+          <string>Set to current page</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1">
+        <widget class="QLineEdit" name="homeLineEdit">
+         <property name="layoutDirection">
+          <enum>Qt::LeftToRight</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_3">
+         <property name="text">
+          <string>Home Page:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" colspan="2">
+        <widget class="QComboBox" name="startupBehavior">
+         <item>
+          <property name="text">
+           <string>Show my home page</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Show a blank page</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Restore windows and tabs from last time</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="3">
+        <widget class="QCheckBox" name="enableAccessKeys">
+         <property name="text">
+          <string>Enable access keys</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" colspan="2">
+        <widget class="QComboBox" name="expireHistory">
+         <item>
+          <property name="text">
+           <string>After one day</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>After one week</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>After two weeks</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>After one month</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>After one year</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Manually</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>On application exit</string>
+          </property>
+         </item>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_3">
@@ -261,19 +299,33 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="1" colspan="2">
-        <widget class="QLabel" name="standardLabel">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
+       <item row="1" column="0">
+        <widget class="QLabel" name="label_6">
+         <property name="text">
+          <string>Fixed-width font:</string>
+         </property>
+         <property name="alignment">
+          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="4">
+        <widget class="QPushButton" name="fixedFontButton">
+         <property name="text">
+          <string>Select...</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" colspan="3">
+        <widget class="QLabel" name="fixedLabel">
+         <property name="autoFillBackground">
+          <bool>true</bool>
          </property>
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
          <property name="text">
-          <string notr="true">Times 16</string>
+          <string notr="true">Courier 13</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
@@ -287,40 +339,52 @@
          </property>
         </widget>
        </item>
-       <item row="1" column="0">
-        <widget class="QLabel" name="label_6">
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="minimFontSizeCheckBox">
          <property name="text">
-          <string>Fixed-width font:</string>
-         </property>
-         <property name="alignment">
-          <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <string>Minimum Font size:</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="1" colspan="2">
-        <widget class="QLabel" name="fixedLabel">
+       <item row="0" column="1" colspan="3">
+        <widget class="QLabel" name="standardLabel">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="autoFillBackground">
+          <bool>true</bool>
+         </property>
          <property name="frameShape">
           <enum>QFrame::StyledPanel</enum>
          </property>
          <property name="text">
-          <string notr="true">Courier 13</string>
+          <string notr="true">Times 16</string>
          </property>
          <property name="alignment">
           <set>Qt::AlignCenter</set>
          </property>
         </widget>
        </item>
-       <item row="1" column="4">
-        <widget class="QPushButton" name="fixedFontButton">
+       <item row="2" column="0" colspan="4">
+        <widget class="QLabel" name="label_8">
          <property name="text">
-          <string>Select...</string>
+          <string>Preferred languages for viewing webpages in:</string>
          </property>
         </widget>
        </item>
-       <item row="2" column="0" colspan="3">
-        <widget class="QLabel" name="label_8">
-         <property name="text">
-          <string>Preferred languages for viewing webpages in:</string>
+       <item row="3" column="1">
+        <widget class="QSpinBox" name="minimumFontSizeSpinBox">
+         <property name="enabled">
+          <bool>false</bool>
+         </property>
+         <property name="minimum">
+          <number>1</number>
+         </property>
+         <property name="value">
+          <number>9</number>
          </property>
         </widget>
        </item>
@@ -331,14 +395,31 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="minimFontSizeCheckBox">
+       <item row="4" column="0">
+        <widget class="QLabel" name="label">
          <property name="text">
-          <string>Minimum Font size:</string>
+          <string>URL bar type</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="3">
+       <item row="4" column="1" colspan="4">
+        <widget class="QComboBox" name="urlBarType">
+         <property name="currentIndex">
+          <number>0</number>
+         </property>
+         <item>
+          <property name="text">
+           <string>Seperate Search and URL bar</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>One input for URL and search term</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="5" column="2">
         <spacer name="verticalSpacer">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -351,19 +432,6 @@
          </property>
         </spacer>
        </item>
-       <item row="3" column="1">
-        <widget class="QSpinBox" name="minimumFontSizeSpinBox">
-         <property name="enabled">
-          <bool>false</bool>
-         </property>
-         <property name="minimum">
-          <number>1</number>
-         </property>
-         <property name="value">
-          <number>9</number>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="tab_2">
@@ -377,10 +445,10 @@
           <string>Web Content</string>
          </property>
          <layout class="QGridLayout" name="gridLayout_5">
-          <item row="0" column="0" colspan="2">
-           <widget class="QCheckBox" name="blockPopupWindows">
+          <item row="3" column="0" colspan="2">
+           <widget class="QCheckBox" name="enableLocalStorage">
             <property name="text">
-             <string>Block Popup Windows</string>
+             <string>Persistent Data Storage</string>
             </property>
             <property name="checked">
              <bool>true</bool>
@@ -388,51 +456,6 @@
            </widget>
           </item>
           <item row="1" column="0" colspan="2">
-           <widget class="QCheckBox" name="enablePlugins">
-            <property name="text">
-             <string>Enable Plugins</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <spacer name="horizontalSpacer_3">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeType">
-             <enum>QSizePolicy::Fixed</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="2" column="1">
-           <widget class="QCheckBox" name="clickToFlash">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip">
-             <string>If you enable this option, no flash objects will be loaded by default. Instead, each will be replaced by a button, allowing you to control which objects to load, and which not. </string>
-            </property>
-            <property name="text">
-             <string>Use ClickToFlash on flash plugins</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0" colspan="2">
            <widget class="QCheckBox" name="enableJavascript">
             <property name="text">
              <string>Enable Javascript</string>
@@ -442,169 +465,24 @@
             </property>
            </widget>
           </item>
-          <item row="4" column="0" colspan="2">
-           <widget class="QCheckBox" name="enableImages">
-            <property name="text">
-             <string>View Images</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="5" column="0" colspan="2">
-           <widget class="QCheckBox" name="enableLocalStorage">
-            <property name="text">
-             <string>Persistent Data Storage</string>
-            </property>
-            <property name="checked">
-             <bool>true</bool>
-            </property>
-           </widget>
-          </item>
-         </layout>
-        </widget>
-       </item>
-       <item>
-        <widget class="QGroupBox" name="cookiesGroupBox">
-         <property name="title">
-          <string>Cookies</string>
-         </property>
-         <layout class="QGridLayout">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Accept Cookies:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QComboBox" name="acceptCombo">
-            <item>
-             <property name="text">
-              <string>Always</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Never</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>Only from sites you navigate to</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="0" column="2">
-           <widget class="QPushButton" name="exceptionsButton">
-            <property name="text">
-             <string>Exceptions...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Keep Cookies Until:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QComboBox" name="keepUntilCombo">
-            <item>
-             <property name="text">
-              <string>They expire</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>I exit the application</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>At most 90 days</string>
-             </property>
-            </item>
-           </widget>
-          </item>
-          <item row="1" column="2">
-           <widget class="QPushButton" name="cookiesButton">
-            <property name="text">
-             <string>Cookies...</string>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="0">
-           <spacer name="horizontalSpacer_4">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-          <item row="3" column="1">
-           <widget class="QCheckBox" name="filterTrackingCookiesCheckbox">
-            <property name="text">
-             <string>Filter Tracking Cookies</string>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="cookieSessionLabel">
-            <property name="text">
-             <string>A cookie session ends:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="1">
-           <widget class="QComboBox" name="cookieSessionCombo">
-            <item>
-             <property name="text">
-              <string>When I exit the application</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>1 day</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>2 days</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>3 days</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>7 days</string>
-             </property>
-            </item>
-            <item>
-             <property name="text">
-              <string>30 days</string>
-             </property>
-            </item>
+          <item row="0" column="0" colspan="2">
+           <widget class="QCheckBox" name="blockPopupWindows">
+            <property name="text">
+             <string>Block Popup Windows</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
+           </widget>
+          </item>
+          <item row="2" column="0" colspan="2">
+           <widget class="QCheckBox" name="enableImages">
+            <property name="text">
+             <string>View Images</string>
+            </property>
+            <property name="checked">
+             <bool>true</bool>
+            </property>
            </widget>
           </item>
          </layout>
@@ -773,17 +651,14 @@
           <bool>true</bool>
          </property>
          <layout class="QGridLayout" name="gridLayout_6">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label_9">
-            <property name="text">
-             <string>Type:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+          <item row="2" column="1" colspan="4">
+           <widget class="QLineEdit" name="proxyUserName">
+            <property name="layoutDirection">
+             <enum>Qt::LeftToRight</enum>
             </property>
            </widget>
           </item>
-          <item row="0" column="1" colspan="2">
+          <item row="0" column="1" colspan="4">
            <widget class="QComboBox" name="proxyType">
             <item>
              <property name="text">
@@ -802,6 +677,16 @@
             </item>
            </widget>
           </item>
+          <item row="2" column="0">
+           <widget class="QLabel" name="label_12">
+            <property name="text">
+             <string>User Name:</string>
+            </property>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            </property>
+           </widget>
+          </item>
           <item row="1" column="0">
            <widget class="QLabel" name="label_10">
             <property name="text">
@@ -812,14 +697,17 @@
             </property>
            </widget>
           </item>
-          <item row="1" column="1" colspan="2">
-           <widget class="QLineEdit" name="proxyHostName">
+          <item row="4" column="1" colspan="4">
+           <widget class="QLineEdit" name="proxyPassword">
             <property name="layoutDirection">
              <enum>Qt::LeftToRight</enum>
             </property>
+            <property name="echoMode">
+             <enum>QLineEdit::Password</enum>
+            </property>
            </widget>
           </item>
-          <item row="2" column="0">
+          <item row="1" column="3">
            <widget class="QLabel" name="label_11">
             <property name="text">
              <string>Port:</string>
@@ -829,138 +717,67 @@
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QSpinBox" name="proxyPort">
-            <property name="maximum">
-             <number>65535</number>
+          <item row="4" column="0">
+           <widget class="QLabel" name="label_13">
+            <property name="text">
+             <string>Password:</string>
             </property>
-            <property name="value">
-             <number>1080</number>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
-          <item row="2" column="2">
-           <spacer name="horizontalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
+          <item row="1" column="1" colspan="2">
+           <widget class="QLineEdit" name="proxyHostName">
+            <property name="minimumSize">
+             <size>
+              <width>430</width>
+              <height>0</height>
+             </size>
             </property>
             <property name="sizeHint" stdset="0">
              <size>
-              <width>293</width>
-              <height>20</height>
+              <width>139</width>
+              <height>36</height>
              </size>
             </property>
-           </spacer>
-          </item>
-          <item row="3" column="0">
-           <widget class="QLabel" name="label_12">
-            <property name="text">
-             <string>User Name:</string>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-            </property>
-           </widget>
-          </item>
-          <item row="3" column="1" colspan="2">
-           <widget class="QLineEdit" name="proxyUserName">
             <property name="layoutDirection">
              <enum>Qt::LeftToRight</enum>
             </property>
            </widget>
           </item>
-          <item row="4" column="0">
-           <widget class="QLabel" name="label_13">
-            <property name="text">
-             <string>Password:</string>
+          <item row="1" column="4">
+           <widget class="QSpinBox" name="proxyPort">
+            <property name="maximum">
+             <number>65535</number>
             </property>
-            <property name="alignment">
-             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+            <property name="value">
+             <number>1080</number>
             </property>
            </widget>
           </item>
-          <item row="4" column="1" colspan="2">
-           <widget class="QLineEdit" name="proxyPassword">
-            <property name="layoutDirection">
-             <enum>Qt::LeftToRight</enum>
+          <item row="0" column="0">
+           <widget class="QLabel" name="label_9">
+            <property name="text">
+             <string>Type:</string>
             </property>
-            <property name="echoMode">
-             <enum>QLineEdit::Password</enum>
+            <property name="alignment">
+             <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
             </property>
            </widget>
           </item>
-          <item row="5" column="0">
-           <spacer name="verticalSpacer_2">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>8</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
          </layout>
         </widget>
        </item>
-      </layout>
-     </widget>
-     <widget class="QWidget" name="tab_7">
-      <attribute name="title">
-       <string>AutoFill</string>
-      </attribute>
-      <layout class="QGridLayout" name="gridLayout_8">
-       <item row="0" column="0">
-        <widget class="QLabel" name="label_16">
-         <property name="text">
-          <string>AutoFill web forms:</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="1">
-        <widget class="QCheckBox" name="autoFillPasswordFormsCheckBox">
-         <property name="sizePolicy">
-          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-           <horstretch>0</horstretch>
-           <verstretch>0</verstretch>
-          </sizepolicy>
-         </property>
-         <property name="text">
-          <string>User names and passwords</string>
-         </property>
-        </widget>
-       </item>
-       <item row="0" column="2">
-        <widget class="QPushButton" name="editAutoFillUserButton">
-         <property name="text">
-          <string>Edit...</string>
-         </property>
-        </widget>
-       </item>
-       <item row="2" column="1">
-        <spacer name="verticalSpacer_5">
+       <item>
+        <spacer name="verticalSpacer_2">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
          <property name="sizeHint" stdset="0">
           <size>
            <width>20</width>
-           <height>244</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
-       <item row="1" column="3">
-        <spacer name="horizontalSpacer_6">
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
+           <height>8</height>
           </size>
          </property>
         </spacer>
@@ -1025,23 +842,10 @@
             </property>
            </widget>
           </item>
-          <item row="0" column="2">
-           <spacer name="horizontalSpacer_5">
-            <property name="orientation">
-             <enum>Qt::Horizontal</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>40</width>
-              <height>20</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
          </layout>
         </widget>
        </item>
-       <item row="2" column="2">
+       <item row="2" column="0" colspan="4">
         <spacer name="verticalSpacer_3">
          <property name="orientation">
           <enum>Qt::Vertical</enum>
@@ -1063,7 +867,6 @@
  <tabstops>
   <tabstop>startupBehavior</tabstop>
   <tabstop>homeLineEdit</tabstop>
-  <tabstop>setHomeToCurrentPageButton</tabstop>
   <tabstop>expireHistory</tabstop>
   <tabstop>searchEngineFallback</tabstop>
   <tabstop>downloadAsk</tabstop>
@@ -1073,15 +876,8 @@
   <tabstop>fixedFontButton</tabstop>
   <tabstop>languageButton</tabstop>
   <tabstop>blockPopupWindows</tabstop>
-  <tabstop>enablePlugins</tabstop>
-  <tabstop>clickToFlash</tabstop>
   <tabstop>enableJavascript</tabstop>
   <tabstop>enableImages</tabstop>
-  <tabstop>acceptCombo</tabstop>
-  <tabstop>exceptionsButton</tabstop>
-  <tabstop>keepUntilCombo</tabstop>
-  <tabstop>cookiesButton</tabstop>
-  <tabstop>filterTrackingCookiesCheckbox</tabstop>
   <tabstop>selectTabsWhenCreated</tabstop>
   <tabstop>confirmClosingMultipleTabs</tabstop>
   <tabstop>oneCloseButton</tabstop>
@@ -1091,7 +887,6 @@
   <tabstop>proxySupport</tabstop>
   <tabstop>proxyType</tabstop>
   <tabstop>proxyHostName</tabstop>
-  <tabstop>proxyPort</tabstop>
   <tabstop>proxyUserName</tabstop>
   <tabstop>proxyPassword</tabstop>
   <tabstop>userStyleSheet</tabstop>
@@ -1134,162 +929,146 @@
    </hints>
   </connection>
   <connection>
-   <sender>downloadDestination</sender>
+   <sender>externalDownloadButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>downloadsLocation</receiver>
+   <receiver>externalDownloadPath</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>79</x>
-     <y>289</y>
+     <x>161</x>
+     <y>315</y>
     </hint>
     <hint type="destinationlabel">
-     <x>280</x>
-     <y>291</y>
+     <x>388</x>
+     <y>315</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>enablePlugins</sender>
+   <sender>externalDownloadButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>clickToFlash</receiver>
-   <slot>setEnabled(bool)</slot>
+   <receiver>downloadDirectoryButton</receiver>
+   <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>104</x>
-     <y>125</y>
+     <x>194</x>
+     <y>311</y>
     </hint>
     <hint type="destinationlabel">
-     <x>162</x>
-     <y>154</y>
+     <x>569</x>
+     <y>276</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>minimFontSizeCheckBox</sender>
+   <sender>externalDownloadButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>minimumFontSizeSpinBox</receiver>
+   <receiver>externalDownloadBrowse</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>31</x>
-     <y>153</y>
+     <x>161</x>
+     <y>315</y>
     </hint>
     <hint type="destinationlabel">
-     <x>189</x>
-     <y>151</y>
+     <x>554</x>
+     <y>315</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>downloadDestination</sender>
+   <sender>externalDownloadButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>downloadDirectoryButton</receiver>
-   <slot>setEnabled(bool)</slot>
+   <receiver>downloadAsk</receiver>
+   <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>182</x>
-     <y>282</y>
+     <x>102</x>
+     <y>311</y>
     </hint>
     <hint type="destinationlabel">
-     <x>620</x>
-     <y>292</y>
+     <x>105</x>
+     <y>252</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>externalDownloadButton</sender>
+   <sender>minimFontSizeCheckBox</sender>
    <signal>toggled(bool)</signal>
-   <receiver>externalDownloadPath</receiver>
+   <receiver>minimumFontSizeSpinBox</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>161</x>
-     <y>315</y>
+     <x>31</x>
+     <y>153</y>
     </hint>
     <hint type="destinationlabel">
-     <x>388</x>
-     <y>315</y>
+     <x>189</x>
+     <y>151</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>externalDownloadButton</sender>
+   <sender>downloadDestination</sender>
    <signal>toggled(bool)</signal>
-   <receiver>externalDownloadBrowse</receiver>
+   <receiver>downloadDirectoryButton</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>161</x>
-     <y>315</y>
+     <x>182</x>
+     <y>282</y>
     </hint>
     <hint type="destinationlabel">
-     <x>554</x>
-     <y>315</y>
+     <x>620</x>
+     <y>292</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>externalDownloadButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>downloadAsk</receiver>
+   <receiver>downloadDestination</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>102</x>
-     <y>311</y>
+     <x>170</x>
+     <y>313</y>
     </hint>
     <hint type="destinationlabel">
-     <x>105</x>
-     <y>252</y>
+     <x>169</x>
+     <y>285</y>
     </hint>
    </hints>
   </connection>
   <connection>
-   <sender>externalDownloadButton</sender>
+   <sender>downloadDestination</sender>
    <signal>toggled(bool)</signal>
    <receiver>downloadsLocation</receiver>
-   <slot>setDisabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>198</x>
-     <y>315</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>386</x>
-     <y>279</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>externalDownloadButton</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>downloadDestination</receiver>
-   <slot>setDisabled(bool)</slot>
+   <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>170</x>
-     <y>313</y>
+     <x>79</x>
+     <y>289</y>
     </hint>
     <hint type="destinationlabel">
-     <x>169</x>
-     <y>285</y>
+     <x>280</x>
+     <y>291</y>
     </hint>
    </hints>
   </connection>
   <connection>
    <sender>externalDownloadButton</sender>
    <signal>toggled(bool)</signal>
-   <receiver>downloadDirectoryButton</receiver>
+   <receiver>downloadsLocation</receiver>
    <slot>setDisabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>194</x>
-     <y>311</y>
+     <x>198</x>
+     <y>315</y>
     </hint>
     <hint type="destinationlabel">
-     <x>569</x>
-     <y>276</y>
+     <x>386</x>
+     <y>279</y>
     </hint>
    </hints>
   </connection>
diff --git a/src/sourcehighlighter.cpp b/src/sourcehighlighter.cpp
deleted file mode 100644
index d61ffa07..00000000
--- a/src/sourcehighlighter.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright 2008 Christian Franke <cfchris6@ts2server.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "sourcehighlighter.h"
-
-#include <qpalette.h>
-
-SourceHighlighter::SourceHighlighter(QTextDocument *document)
-    : QSyntaxHighlighter(document)
-{
-    QPalette palette;
-    QColor foreground = palette.text().color();
-    QColor background = palette.base().color();
-
-    QTextCharFormat entityFormat;
-    QColor entityColor;
-    entityColor.setRed((foreground.red() + background.red()) / 2);
-    entityColor.setGreen(
-            (foreground.green() + background.green()) / 2);
-    entityColor.setBlue(
-            (foreground.blue() + background.blue()) / 2);
-    if (abs(entityColor.red() - background.red()) > 80)
-        entityColor.setRed(foreground.red());
-    else if (abs(entityColor.green()-background.green()) > 80)
-        entityColor.setGreen(foreground.green());
-    else entityColor.setBlue(foreground.blue());
-    entityFormat.setForeground(entityColor);
-    entityFormat.setFontWeight(QFont::Normal);
-    setFormatFor(Entity, entityFormat);
-
-    QTextCharFormat tagFormat;
-    QColor tagColor;
-    tagColor.setRed(foreground.red() + (background.red() - foreground.red()) / 4);
-    tagColor.setGreen(
-            foreground.green() + (background.green() - foreground.green()) / 4);
-    tagColor.setBlue(
-            foreground.blue() + (background.blue() - foreground.blue()) / 4);
-    tagFormat.setForeground(tagColor);
-    tagFormat.setFontWeight(QFont::Bold);
-    setFormatFor(Tag, tagFormat);
-
-    QTextCharFormat commentFormat;
-    QColor commentColor;
-    commentColor.setRed(background.red() + (foreground.red() - background.red()) / 3);
-    commentColor.setGreen(
-            background.green() + (foreground.green() - background.green()) / 3);
-    commentColor.setBlue(
-            background.blue() + (foreground.blue() - background.blue()) / 3);
-    commentFormat.setForeground(commentColor);
-    commentFormat.setFontWeight(QFont::Normal);
-    setFormatFor(Comment, commentFormat);
-
-    QTextCharFormat attributeFormat;
-    QColor attributeColor;
-    attributeColor.setRed((foreground.red() + background.red()) / 2);
-    attributeColor.setGreen(
-            (foreground.green() + background.green()) / 2);
-    attributeColor.setBlue(
-            (foreground.blue() + background.blue()) / 2);
-    if (abs(attributeColor.red() - background.red()) > 80)
-        attributeColor.setRed(background.red());
-    else if (abs(attributeColor.green() - background.green()) > 80)
-        attributeColor.setGreen(background.green());
-    else attributeColor.setBlue(background.blue());
-    attributeFormat.setForeground(attributeColor);
-    attributeFormat.setFontWeight(QFont::Normal);
-    setFormatFor(Attribute, attributeFormat);
-}
-
-QTextCharFormat SourceHighlighter::getFormatFor(Construct construct)
-{
-    return formats[construct];
-}
-
-void SourceHighlighter::setFormatFor(Construct construct,
-                         QTextCharFormat &format)
-{
-    formats[construct] = format;
-}
-
-void SourceHighlighter::highlightBlock(const QString &text)
-{
-    int state = previousBlockState();
-    int len = text.length();
-    int start = 0;
-    int pos = 0;
-    QRegExp regex;
-
-    while (pos >= 0 && pos < len && len > 0) {
-        switch (state) {
-        default:
-        case Normal:
-            regex.setPattern(QLatin1String("[<&]"));
-            pos = regex.indexIn(text, pos);
-            if (pos >= 0) {
-                if (text.at(pos) == QLatin1Char('<')) {
-                    start = pos;
-                    if (text.mid(pos, 4) == QLatin1String("<!--")) {
-                        state = InComment;
-                    } else {
-                        state = InTag;
-                    }
-                    ++pos;
-                } else if (text.at(pos) == QLatin1Char('&')) {
-                    regex.setPattern(QLatin1String("&[a-zA-Z0-9]+;"));
-                    if (regex.indexIn(text, pos) == pos) {
-                        setFormat(pos, regex.matchedLength(), formats[Entity]);
-                    }
-                    ++pos;
-                }
-            }
-            break;
-        case InComment:
-            regex.setPattern(QLatin1String("-->"));
-            pos = regex.indexIn(text, pos);
-            if (pos >= 0) {
-                state = Normal;
-                pos += 3;
-                setFormat(start, pos - start, formats[Comment]);
-                ++pos;
-            } else {
-                setFormat(start, len - start, formats[Comment]);
-            }
-            break;
-         case InTag:
-            regex.setPattern(QLatin1String("[>\"]"));
-            pos = regex.indexIn(text, pos);
-            if (pos >= 0) {
-                if (text.at(pos) == QLatin1Char('>')) {
-                    state = Normal;
-                    ++pos;
-                    setFormat(start, pos - start, formats[Tag]);
-                } else if (text.at(pos) == QLatin1Char('"')) {
-                    setFormat(start, pos - start, formats[Tag]);
-                    start = pos;
-                    state = InAttribute;
-                    ++pos;
-                }
-            } else {
-                setFormat(start, len-start, formats[Tag]);
-            }
-            break;
-        case InAttribute:
-            regex.setPattern(QLatin1String("\""));
-            pos = regex.indexIn(text, pos);
-            if (pos >= 0) {
-                setFormat(start, pos - start, formats[Attribute]);
-                state = InTag;
-                start = ++pos;
-            } else {
-                setFormat(start, len - start, formats[Attribute]);
-            }
-            break;
-        }
-    }
-    setCurrentBlockState(state);
-}
diff --git a/src/sourcehighlighter.h b/src/sourcehighlighter.h
deleted file mode 100644
index d6783e68..00000000
--- a/src/sourcehighlighter.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright 2008 Christian Franke <cfchris6@ts2server.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef SOURCEHIGHLIGHTER_H
-#define SOURCEHIGHLIGHTER_H
-
-#include <qsyntaxhighlighter.h>
-
-class SourceHighlighter : public QSyntaxHighlighter
-{
-    Q_OBJECT
-
-public:
-    enum Construct {
-        Entity,
-        Tag,
-        Comment,
-        Attribute,
-        LastConstruct = Attribute
-    };
-    SourceHighlighter(QTextDocument *document);
-
-    QTextCharFormat getFormatFor(Construct construct);
-    void setFormatFor(Construct construct, QTextCharFormat &format);
-
-protected:
-    enum State {
-        Normal = -1,
-        InComment,
-        InTag,
-        InAttribute
-    };
-    void highlightBlock(const QString &text);
-
-private:
-    QTextCharFormat formats[LastConstruct + 1];
-};
-
-#endif
diff --git a/src/sourceviewer.cpp b/src/sourceviewer.cpp
deleted file mode 100644
index b90d5f11..00000000
--- a/src/sourceviewer.cpp
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright 2008 Christian Franke <cfchris6@ts2server.com>
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "sourceviewer.h"
-
-#include <qlayout.h>
-#include <qmenubar.h>
-#include <qnetworkcookie.h>
-#include <qnetworkreply.h>
-#include <qnetworkrequest.h>
-#include <qplaintextedit.h>
-#include <qshortcut.h>
-#include <qsettings.h>
-#include <qwebframe.h>
-#include <qwebpage.h>
-
-#include "browserapplication.h"
-#include "networkaccessmanager.h"
-#include "plaintexteditsearch.h"
-#include "sourcehighlighter.h"
-
-SourceViewer::SourceViewer(const QString &source, const QString &title,
-                           const QUrl &url, QWidget *parent)
-    : QDialog(parent)
-    , m_edit(new QPlainTextEdit(tr("Loading..."), this))
-    , m_highlighter(new SourceHighlighter(m_edit->document()))
-    , m_plainTextEditSearch(new PlainTextEditSearch(m_edit, this))
-    , m_layout(new QVBoxLayout(this))
-    , m_menuBar(new QMenuBar(this))
-    , m_editMenu(new QMenu(tr("&Edit"), m_menuBar))
-    , m_findAction(new QAction(tr("&Find"), m_editMenu))
-    , m_source(source)
-{
-    setWindowTitle(tr("Source of Page %1").arg(title));
-
-    QSettings settings;
-    settings.beginGroup(QLatin1String("SourceViewer"));
-    QSize size = settings.value(QLatin1String("size"), QSize(640, 480)).toSize();
-    resize(size);
-
-    m_edit->setLineWrapMode(QPlainTextEdit::WidgetWidth);
-    m_edit->setReadOnly(true);
-    QFont font = m_edit->font();
-    font.setFamily(QLatin1String("Monospace"));
-    m_edit->setFont(font);
-    m_edit->setLineWidth(0);
-    m_edit->setFrameShape(QFrame::NoFrame);
-
-    m_menuBar->addMenu(m_editMenu);
-    m_editMenu->addAction(m_findAction);
-    m_findAction->setShortcuts(QKeySequence::Find);
-    connect(m_findAction, SIGNAL(triggered()),
-            m_plainTextEditSearch, SLOT(showFind()));
-
-    m_layout->setSpacing(0);
-    m_layout->setContentsMargins(0, 0, 0, 0);
-    m_layout->addWidget(m_menuBar);
-    m_layout->addWidget(m_plainTextEditSearch);
-    m_layout->addWidget(m_edit);
-    setLayout(m_layout);
-
-    QNetworkRequest request(url);
-    request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
-    m_reply = BrowserApplication::networkAccessManager()->get(request);
-    connect(m_reply, SIGNAL(finished()), this, SLOT(loadingFinished()));
-    m_reply->setParent(this);
-}
-
-SourceViewer::~SourceViewer()
-{
-    QSettings settings;
-    settings.beginGroup(QLatin1String("SourceViewer"));
-    settings.setValue(QLatin1String("size"), size());
-}
-
-void SourceViewer::loadingFinished()
-{
-    QWebPage page;
-    QByteArray response = m_reply->readAll();
-    page.mainFrame()->setContent(response, QString(), m_reply->request().url());
-
-    /* If original request was POST or a different problem is there, fall
-       back to modified version of QWebFrame.toHtml() */
-    if (page.mainFrame()->toHtml() != m_source)
-        m_edit->setPlainText(m_source);
-    else
-        m_edit->setPlainText(QLatin1String(response));
-
-    m_reply->close();
-}
diff --git a/src/sourceviewer.h b/src/sourceviewer.h
deleted file mode 100644
index a4b654a3..00000000
--- a/src/sourceviewer.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2008 Christian Franke <cfchris6@ts2server.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#ifndef SOURCEVIEWER_H
-#define SOURCEVIEWER_H
-
-#include <qdialog.h>
-
-class QVBoxLayout;
-class SourceHighlighter;
-class PlainTextEditSearch;
-class QPlainTextEdit;
-class QMenuBar;
-class QMenu;
-class QUrl;
-class QAction;
-class QNetworkReply;
-class SourceViewer : public QDialog
-{
-    Q_OBJECT
-
-public:
-    SourceViewer(const QString &source, const QString &title,
-                 const QUrl &url, QWidget *parent = 0);
-    ~SourceViewer();
-
-private:
-    QPlainTextEdit *m_edit;
-    SourceHighlighter *m_highlighter;
-    PlainTextEditSearch *m_plainTextEditSearch;
-    QVBoxLayout *m_layout;
-    QMenuBar *m_menuBar;
-    QMenu *m_editMenu;
-    QAction *m_findAction;
-    QMenu *m_viewMenu;
-    QNetworkReply *m_reply;
-    QString m_source;
-
-private slots:
-    void loadingFinished();
-};
-
-#endif
diff --git a/src/src.pri b/src/src.pri
deleted file mode 100644
index 92681683..00000000
--- a/src/src.pri
+++ /dev/null
@@ -1,135 +0,0 @@
-CONFIG += qt warn_on
-contains(QT_BUILD_PARTS, tools): CONFIG += uitools
-else : DEFINES += QT_NO_UITOOLS
-
-win32|os2 : Debug : CONFIG += console
-
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-
-QT += webkit network webkitwidgets printsupport uitools
-
-# Share object files for faster compiling
-RCC_DIR     = $$PWD/.rcc
-UI_DIR      = $$PWD/.ui
-MOC_DIR     = $$PWD/.moc
-OBJECTS_DIR = $$PWD/.obj
-
-exists(../.git/HEAD) {
-    GITVERSION=$$system(git log -n1 --pretty=format:%h)
-    !isEmpty(GITVERSION) {
-        GITCHANGENUMBER=$$system(git log --pretty=format:%h | wc -l)
-        DEFINES += GITVERSION=\"\\\"$$GITVERSION\\\"\"
-        DEFINES += GITCHANGENUMBER=\"\\\"$$GITCHANGENUMBER\\\"\"
-    }
-}
-
-VPATH += $$PWD
-
-FORMS += \
-    aboutdialog.ui \
-    autofilldialog.ui \
-    acceptlanguagedialog.ui \
-    downloaditem.ui \
-    downloads.ui \
-    searchbanner.ui \
-    settings.ui
-
-HEADERS += \
-    aboutdialog.h \
-    acceptlanguagedialog.h \
-    autosaver.h \
-    autofilldialog.h \
-    autofillmanager.h \
-    browserapplication.h \
-    browsermainwindow.h \
-    clearprivatedata.h \
-    clearbutton.h \
-    downloadmanager.h \
-    modelmenu.h \
-    modeltoolbar.h \
-    plaintexteditsearch.h \
-    searchbar.h \
-    searchbutton.h \
-    searchlineedit.h \
-    settings.h \
-    sourcehighlighter.h \
-    sourceviewer.h \
-    tabbar.h \
-    tabwidget.h \
-    toolbarsearch.h \
-    webactionmapper.h \
-    webpage.h \
-    webview.h \
-    webviewsearch.h
-
-SOURCES += \
-    aboutdialog.cpp \
-    acceptlanguagedialog.cpp \
-    autosaver.cpp \
-    autofilldialog.cpp \
-    autofillmanager.cpp \
-    browserapplication.cpp \
-    browsermainwindow.cpp \
-    clearprivatedata.cpp \
-    clearbutton.cpp \
-    downloadmanager.cpp \
-    modelmenu.cpp \
-    modeltoolbar.cpp \
-    plaintexteditsearch.cpp \
-    searchbar.cpp \
-    searchbutton.cpp \
-    searchlineedit.cpp \
-    settings.cpp \
-    sourcehighlighter.cpp \
-    sourceviewer.cpp \
-    tabbar.cpp \
-    tabwidget.cpp \
-    toolbarsearch.cpp \
-    webactionmapper.cpp \
-    webpage.cpp \
-    webview.cpp \
-    webviewsearch.cpp
-
-include(adblock/adblock.pri)
-include(bookmarks/bookmarks.pri)
-include(history/history.pri)
-include(locationbar/locationbar.pri)
-include(network/network.pri)
-include(opensearch/opensearch.pri)
-include(qwebplugins/qwebplugins.pri)
-include(utils/utils.pri)
-include(useragent/useragent.pri)
-
-RESOURCES += \
-    $$PWD/data/data.qrc \
-    $$PWD/data/graphics/graphics.qrc \
-    $$PWD/data/searchengines/searchengines.qrc \
-    $$PWD/htmls/htmls.qrc
-
-DISTFILES += ../AUTHORS \
-    ../ChangeLog \
-    ../LICENSE.GPL2 \
-    ../LICENSE.GPL3 \
-    ../README
-
-win32 {
-    RC_FILE = $$PWD/browser.rc
-    LIBS += -luser32
-}
-
-mac {
-    ICON = browser.icns
-    QMAKE_INFO_PLIST = $$PWD/Info_mac.plist
-}
-
-include(../webkittrunk.pri)
-
-unix {
-    PKGDATADIR = $$DATADIR/endorphin
-    DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
-}
-
-win32 {
-    LIBS += -ladvapi32
-}
diff --git a/src/src.pro b/src/src.pro
deleted file mode 100644
index 7a50418f..00000000
--- a/src/src.pro
+++ /dev/null
@@ -1,63 +0,0 @@
-TEMPLATE = app
-
-TARGET = endorphin
-mac {
-    TARGET = Endorphin
-    QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.10
-}
-
-DEFINES += \
-    QT_STRICT_ITERATORS \
-
-include(../install.pri)
-
-include(src.pri)
-
-SOURCES += main.cpp
-
-DESTDIR = ../
-
-include(locale/locale.pri)
-
-!mac {
-unix {
-    INSTALLS += translations desktop iconxpm iconsvg icon16 icon32 icon128 man man-compress
-
-    translations.path = $$PKGDATADIR
-    translations.files += .qm/locale
-
-    desktop.path = $$DATADIR/applications
-    desktop.files += endorphin.desktop
-
-    iconxpm.path = $$DATADIR/pixmaps
-    iconxpm.files += data/endorphin.xpm
-
-    iconsvg.path = $$DATADIR/icons/hicolor/scalable/apps
-    iconsvg.files += data/endorphin.svg
-
-    icon16.path = $$DATADIR/icons/hicolor/16x16/apps
-    icon16.files += data/16x16/endorphin.png
-
-    icon32.path = $$DATADIR/icons/hicolor/32x32/apps
-    icon32.files += data/32x32/endorphin.png
-
-    icon128.path = $$DATADIR/icons/hicolor/128x128/apps
-    icon128.files += data/128x128/endorphin.png
-
-    man.path = $$DATADIR/man/man1
-    man.files += data/endorphin.1
-
-    man-compress.path = $$DATADIR/man/man1
-    man-compress.extra = "" "gzip -9 -f \$(INSTALL_ROOT)/$$DATADIR/man/man1/endorphin.1" ""
-    man-compress.depends = install_man
-
-    GNOME_DEFAULT_APPS_PATH = $$system(pkg-config --variable=defappsdir gnome-default-applications)
-
-    !isEmpty(GNOME_DEFAULT_APPS_PATH) {
-        INSTALLS += gnome-default-app
-
-        gnome-default-app.path = $$GNOME_DEFAULT_APPS_PATH
-        gnome-default-app.files = data/endorphin.xml
-    }
-}
-}
diff --git a/src/tabbar.cpp b/src/tabbar.cpp
index c08e7819..771ba42b 100644
--- a/src/tabbar.cpp
+++ b/src/tabbar.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -64,17 +64,17 @@
 
 #include "tabwidget.h"
 
-#include <qaction.h>
-#include <qapplication.h>
-#include <qclipboard.h>
-#include <qevent.h>
-#include <qmenu.h>
-#include <qstyle.h>
-#include <qurl.h>
+#include <QAction>
+#include <QApplication>
+#include <QClipboard>
+#include <QEvent>
+#include <QMenu>
+#include <QStyle>
+#include <QUrl>
 #include <QMimeData>
 #include <QDrag>
 
-#include <qdebug.h>
+#include <QDebug>
 
 TabShortcut::TabShortcut(int tab, const QKeySequence &key, QWidget *parent)
     : QShortcut(key, parent)
@@ -89,7 +89,7 @@ int TabShortcut::tab()
 
 TabBar::TabBar(QWidget *parent)
     : QTabBar(parent)
-    , m_viewTabBarAction(0)
+    , m_viewTabBarAction(nullptr)
     , m_showTabBarWhenOneTab(true)
 {
     setContextMenuPolicy(Qt::CustomContextMenu);
@@ -99,7 +99,7 @@ TabBar::TabBar(QWidget *parent)
     connect(this, SIGNAL(customContextMenuRequested(const QPoint &)),
             this, SLOT(contextMenuRequested(const QPoint &)));
 
-    QString alt = QLatin1String("Ctrl+%1");
+    QString alt = QStringLiteral("Ctrl+%1");
     for (int i = 0; i < 9; ++i) {
         int key = i + 1;
         TabShortcut *tabShortCut = new TabShortcut(i, alt.arg(key), this);
@@ -132,7 +132,7 @@ QAction *TabBar::viewTabBarAction() const
 
 QTabBar::ButtonPosition TabBar::freeSide()
 {
-    QTabBar::ButtonPosition side = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, 0, this);
+    QTabBar::ButtonPosition side = (QTabBar::ButtonPosition)style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, nullptr, this);
     side = (side == QTabBar::LeftSide) ? QTabBar::RightSide : QTabBar::LeftSide;
     return side;
 }
@@ -199,7 +199,7 @@ void TabBar::cloneTab()
 {
     if (QAction *action = qobject_cast<QAction*>(sender())) {
         int index = action->data().toInt();
-        emit cloneTab(index);
+        Q_EMIT cloneTab(index);
     }
 }
 
@@ -207,7 +207,7 @@ void TabBar::closeTab()
 {
     if (QAction *action = qobject_cast<QAction*>(sender())) {
         int index = action->data().toInt();
-        emit closeTab(index);
+        Q_EMIT closeTab(index);
     }
 }
 
@@ -215,15 +215,15 @@ void TabBar::closeOtherTabs()
 {
     if (QAction *action = qobject_cast<QAction*>(sender())) {
         int index = action->data().toInt();
-        emit closeOtherTabs(index);
+        Q_EMIT closeOtherTabs(index);
     }
 }
 
 void TabBar::mouseDoubleClickEvent(QMouseEvent *event)
 {
     if (event->button() == Qt::LeftButton
-        && tabAt(event->pos()) == -1) {
-        emit newTab();
+            && tabAt(event->pos()) == -1) {
+        Q_EMIT newTab();
         return;
     }
     QTabBar::mouseDoubleClickEvent(event);
@@ -234,12 +234,12 @@ void TabBar::mouseReleaseEvent(QMouseEvent *event)
     if (event->button() == Qt::MidButton) {
         int index = tabAt(event->pos());
         if (index != -1) {
-            emit closeTab(index);
+            Q_EMIT closeTab(index);
             return;
         } else {
             QUrl url(QApplication::clipboard()->text(QClipboard::Selection));
             if (!url.isEmpty() && url.isValid() && !url.scheme().isEmpty())
-                emit loadUrl(url, TabWidget::NewTab);
+                Q_EMIT loadUrl(url, TabWidget::NewTab);
         }
     }
 
@@ -259,8 +259,8 @@ void TabBar::mouseMoveEvent(QMouseEvent *event)
         int diffX = event->pos().x() - m_dragStartPos.x();
         int diffY = event->pos().y() - m_dragStartPos.y();
         if ((event->pos() - m_dragStartPos).manhattanLength() > QApplication::startDragDistance()
-            && diffX < 3 && diffX > -3
-            && diffY < -10) {
+                && diffX < 3 && diffX > -3
+                && diffY < -10) {
             QDrag *drag = new QDrag(this);
             QMimeData *mimeData = new QMimeData;
             QList<QUrl> urls;
@@ -269,7 +269,7 @@ void TabBar::mouseMoveEvent(QMouseEvent *event)
             urls.append(url);
             mimeData->setUrls(urls);
             mimeData->setText(tabText(index));
-            mimeData->setData(QLatin1String("action"), "tab-reordering");
+            mimeData->setData(QStringLiteral("action"), "tab-reordering");
             drag->setMimeData(mimeData);
             drag->exec();
         }
@@ -300,9 +300,9 @@ void TabBar::dropEvent(QDropEvent *event)
         int index = tabAt(event->pos());
         if (-1 != index) {
             setCurrentIndex(index);
-            emit loadUrl(url, TabWidget::CurrentTab);
+            Q_EMIT loadUrl(url, TabWidget::CurrentTab);
         } else {
-            emit loadUrl(url, TabWidget::NewSelectedTab);
+            Q_EMIT loadUrl(url, TabWidget::NewSelectedTab);
         }
     }
 
@@ -313,14 +313,14 @@ QSize TabBar::tabSizeHint(int index) const
 {
     QSize sizeHint = QTabBar::tabSizeHint(index);
     QFontMetrics fm = fontMetrics();
-    return sizeHint.boundedTo(QSize(fm.horizontalAdvance(QLatin1Char('M')) * 18, sizeHint.height()));
+    return sizeHint.boundedTo(QSize(fm.horizontalAdvance(QChar('M')) * 18, sizeHint.height()));
 }
 
 void TabBar::reloadTab()
 {
     if (QAction *action = qobject_cast<QAction*>(sender())) {
         int index = action->data().toInt();
-        emit reloadTab(index);
+        Q_EMIT reloadTab(index);
     }
 }
 
@@ -345,3 +345,12 @@ void TabBar::updateVisibility()
     updateViewToolBarAction();
 }
 
+void TabBar::wheelEvent(QWheelEvent *event)
+{
+    int index = currentIndex();
+    if (index != -1) {
+        index += event->angleDelta().y() > 0 ? -1 : 1;
+        if (index >= 0 && index < count())
+            setCurrentIndex(index);
+    }
+}
diff --git a/src/tabbar.h b/src/tabbar.h
index 8438c60a..4336b46a 100644
--- a/src/tabbar.h
+++ b/src/tabbar.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
 #ifndef TABBAR_H
 #define TABBAR_H
 
-#include <qtabbar.h>
+#include <QTabBar>
 
 #include "tabwidget.h"
 
@@ -74,7 +74,7 @@ class TabBar : public QTabBar
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void newTab();
     void cloneTab(int index);
     void closeTab(int index);
@@ -84,12 +84,13 @@ class TabBar : public QTabBar
     void loadUrl(const QUrl &url, TabWidget::OpenUrlIn tab);
 
 public:
-    TabBar(QWidget *parent = 0);
+    TabBar(QWidget *parent = nullptr);
 
     bool showTabBarWhenOneTab() const;
     void setShowTabBarWhenOneTab(bool enabled);
     QAction *viewTabBarAction() const;
     QTabBar::ButtonPosition freeSide();
+    void wheelEvent(QWheelEvent *event) override;
 
 protected:
     void mouseDoubleClickEvent(QMouseEvent *event);
@@ -102,7 +103,7 @@ class TabBar : public QTabBar
     void tabInserted(int position);
     void tabRemoved(int position);
 
-private slots:
+private Q_SLOTS:
     void selectTabAction();
     void cloneTab();
     void closeTab();
@@ -122,7 +123,7 @@ private slots:
 };
 
 
-#include <qshortcut.h>
+#include <QShortcut>
 
 /*
      Shortcut to switch directly to a tab by index
diff --git a/src/tabwidget.cpp b/src/tabwidget.cpp
index 008c49e6..874a7744 100644
--- a/src/tabwidget.cpp
+++ b/src/tabwidget.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -7,7 +7,7 @@
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the iQ_WS_X11mplied warranty of
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
@@ -59,6 +59,32 @@
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ****************************************************************************/
+/*
+** The URL validation regex is licensed under the following license:
+**
+** Copyright (c) 2010-2018 Diego Perini (http://www.iport.it)
+**
+** Permission is hereby granted, free of charge, to any person
+** obtaining a copy of this software and associated documentation
+** files (the "Software"), to deal in the Software without
+** restriction, including without limitation the rights to use,
+** copy, modify, merge, publish, distribute, sublicense, and/or sell
+** copies of the Software, and to permit persons to whom the
+** Software is furnished to do so, subject to the following
+** conditions:
+**
+** The above copyright notice and this permission notice shall be
+** included in all copies or substantial portions of the Software.
+**
+** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+** OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+** NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+** HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+** WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+** FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+** OTHER DEALINGS IN THE SOFTWARE.
+*/
 
 #include "tabwidget.h"
 
@@ -68,8 +94,9 @@
 #include "bookmarksmodel.h"
 #include "browserapplication.h"
 #include "browsermainwindow.h"
+#include "downloadmanager.h"
 #include "history.h"
-#include "historycompleter.h"
+#include "locationcompleter.h"
 #include "historymanager.h"
 #include "locationbar.h"
 #include "opensearchengine.h"
@@ -80,38 +107,43 @@
 #include "webpage.h"
 #include "webview.h"
 #include "webviewsearch.h"
-
-#include <qcompleter.h>
-#include <qdir.h>
-#include <qevent.h>
-#include <qlistview.h>
-#include <qmenu.h>
-#include <qmessagebox.h>
-#include <qmovie.h>
-#include <qsettings.h>
-#include <qstackedwidget.h>
-#include <qstyle.h>
-#include <qtoolbutton.h>
-#include <qwebhistory.h>
-
-#include <qdebug.h>
+#include "savepagedialog.h"
+
+#include <QCompleter>
+#include <QDir>
+#include <QEvent>
+#include <QListView>
+#include <QMenu>
+#include <QMessageBox>
+#include <QMovie>
+#include <QSettings>
+#include <QStackedWidget>
+#include <QStyle>
+#include <QToolButton>
+#include <QWebEnginePage>
+#include <QWebEngineProfile>
+#include <QWebEngineDownloadItem>
+#include <QRegularExpression>
+
+#include <QDebug>
 
 //#define USERMODIFIEDBEHAVIOR_DEBUG
 
-TabWidget::TabWidget(QWidget *parent)
+TabWidget::TabWidget(QWidget *parent, QWebEngineProfile *profile)
     : QTabWidget(parent)
-    , m_recentlyClosedTabsAction(0)
-    , m_newTabAction(0)
-    , m_closeTabAction(0)
-    , m_bookmarkTabsAction(0)
-    , m_nextTabAction(0)
-    , m_previousTabAction(0)
-    , m_recentlyClosedTabsMenu(0)
-    , m_lineEditCompleter(0)
-    , m_locationBars(0)
+    , m_recentlyClosedTabsAction(nullptr)
+    , m_newTabAction(nullptr)
+    , m_closeTabAction(nullptr)
+    , m_bookmarkTabsAction(nullptr)
+    , m_nextTabAction(nullptr)
+    , m_previousTabAction(nullptr)
+    , m_recentlyClosedTabsMenu(nullptr)
+    , m_lineEditCompleter(nullptr)
+    , m_locationBars(nullptr)
     , m_tabBar(new TabBar(this))
-    , addTabButton(0)
-    , closeTabButton(0)
+    , addTabButton(nullptr)
+    , closeTabButton(nullptr)
+    , m_profile(profile)
 {
     setElideMode(Qt::ElideRight);
 
@@ -120,21 +152,20 @@ TabWidget::TabWidget(QWidget *parent)
 
     connect(m_tabBar, SIGNAL(loadUrl(const QUrl&, TabWidget::OpenUrlIn)),
             this, SLOT(loadUrl(const QUrl&, TabWidget::OpenUrlIn)));
-    connect(m_tabBar, SIGNAL(newTab()), this, SLOT(newTab()));
+    connect(m_tabBar, &TabBar::newTab, this, &TabWidget::newTab);
     connect(m_tabBar, SIGNAL(closeTab(int)), this, SLOT(closeTab(int)));
     connect(m_tabBar, SIGNAL(cloneTab(int)), this, SLOT(cloneTab(int)));
     connect(m_tabBar, SIGNAL(closeOtherTabs(int)), this, SLOT(closeOtherTabs(int)));
     connect(m_tabBar, SIGNAL(reloadTab(int)), this, SLOT(reloadTab(int)));
-    connect(m_tabBar, SIGNAL(reloadAllTabs()), this, SLOT(reloadAllTabs()));
+    connect(m_tabBar, &TabBar::reloadAllTabs, this, &TabWidget::reloadAllTabs);
     setTabBar(m_tabBar);
     setDocumentMode(true);
-    connect(m_tabBar, SIGNAL(tabMoved(int, int)),
-            this, SLOT(moveTab(int, int)));
+    connect(m_tabBar, &TabBar::tabMoved, this, &TabWidget::moveTab);
 
     // Actions
     m_newTabAction = new QAction(this);
     m_newTabAction->setShortcuts(QKeySequence::AddTab);
-    connect(m_newTabAction, SIGNAL(triggered()), this, SLOT(newTab()));
+    connect(m_newTabAction, &QAction::triggered, this, &TabWidget::newTab);
 
     m_closeTabAction = new QAction(this);
     m_closeTabAction->setShortcuts(QKeySequence::Close);
@@ -142,10 +173,10 @@ TabWidget::TabWidget(QWidget *parent)
 #if !defined(Q_WS_X11)
     m_closeTabAction->setIconVisibleInMenu(false);
 #endif
-    connect(m_closeTabAction, SIGNAL(triggered()), this, SLOT(closeTab()));
+    connect(m_closeTabAction, &QAction::triggered, this, &TabWidget::closeTab);
 
     m_bookmarkTabsAction = new QAction(this);
-    connect(m_bookmarkTabsAction, SIGNAL(triggered()), this, SLOT(bookmarkTabs()));
+    connect(m_bookmarkTabsAction, &QAction::triggered, this, &TabWidget::bookmarkTabs);
 
     m_newTabAction->setIcon(QIcon(QLatin1String(":graphics/addtab.png")));
 #if !defined(Q_WS_X11)
@@ -153,18 +184,18 @@ TabWidget::TabWidget(QWidget *parent)
 #endif
 
     m_nextTabAction = new QAction(this);
-    connect(m_nextTabAction, SIGNAL(triggered()), this, SLOT(nextTab()));
+    connect(m_nextTabAction, &QAction::triggered, this, &TabWidget::nextTab);
 
     m_previousTabAction = new QAction(this);
-    connect(m_previousTabAction, SIGNAL(triggered()), this, SLOT(previousTab()));
+    connect(m_previousTabAction, &QAction::triggered, this, &TabWidget::previousTab);
 #if defined(Q_WS_X11)
     m_previousTabAction->setIcon(QIcon::fromTheme(QLatin1String("go-previous")));
     m_nextTabAction->setIcon(QIcon::fromTheme(QLatin1String("go-next")));
 #endif
 
     m_recentlyClosedTabsMenu = new QMenu(this);
-    connect(m_recentlyClosedTabsMenu, SIGNAL(aboutToShow()),
-            this, SLOT(aboutToShowRecentTabsMenu()));
+    connect(m_recentlyClosedTabsMenu, &QMenu::aboutToShow,
+            this, &TabWidget::aboutToShowRecentTabsMenu);
     connect(m_recentlyClosedTabsMenu, SIGNAL(triggered(QAction *)),
             this, SLOT(aboutToShowRecentTriggeredAction(QAction *)));
     m_recentlyClosedTabsAction = new QAction(this);
@@ -176,24 +207,41 @@ TabWidget::TabWidget(QWidget *parent)
     addTabButton->setDefaultAction(m_newTabAction);
     addTabButton->setAutoRaise(true);
     addTabButton->setToolButtonStyle(Qt::ToolButtonIconOnly);
-    addTabButton->setIconSize(QSize(50, 100));
 #endif
 
-    connect(m_tabBar, SIGNAL(tabCloseRequested(int)),
-            this, SLOT(closeTab(int)));
+    connect(m_tabBar, &TabBar::tabCloseRequested,
+            this, &TabWidget::closeTab);
     connect(this, SIGNAL(currentChanged(int)),
             this, SLOT(currentChanged(int)));
 
+    connect(this, &TabWidget::currentChanged,
+            this, &TabWidget::currentChanged);
+
     m_locationBars = new QStackedWidget(this);
 
-    connect(BrowserApplication::historyManager(), SIGNAL(historyCleared()),
-        this, SLOT(historyCleared()));
+    connect(BrowserApplication::historyManager(), &HistoryManager::historyCleared,
+            this, &TabWidget::historyCleared);
 
     // Initialize Actions' labels
     retranslate();
     loadSettings();
+    initScripts();
 }
 
+void TabWidget::initScripts() {
+    QFile file(":qwebchannel.js");
+        if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
+            qDebug() << "Couldn't read qwebchannel.js, window.external and window.endorphin won't be available";
+    QTextStream out(&file);
+
+    QWebEngineScript script;
+    script.setName("WebChannel loader");
+    script.setInjectionPoint(QWebEngineScript::DocumentCreation);
+    script.setRunsOnSubFrames(true);
+    script.setWorldId(QWebEngineScript::MainWorld);
+    script.setSourceCode(out.readAll());
+    m_profile->scripts()->insert(script);
+}
 void TabWidget::historyCleared()
 {
     m_recentlyClosedTabs.clear();
@@ -233,7 +281,7 @@ void TabWidget::moveTab(int fromIndex, int toIndex)
     m_locationBars->insertWidget(toIndex, lineEdit);
 }
 
-void TabWidget::addWebAction(QAction *action, QWebPage::WebAction webAction)
+void TabWidget::addWebAction(QAction *action, QWebEnginePage::WebAction webAction)
 {
     if (!action)
         return;
@@ -250,29 +298,29 @@ void TabWidget::currentChanged(int index)
 
     WebView *oldWebView = this->webView(m_locationBars->currentIndex());
     if (oldWebView) {
-        disconnect(oldWebView, SIGNAL(statusBarMessage(const QString&)),
-                   this, SIGNAL(showStatusBarMessage(const QString&)));
-        disconnect(oldWebView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
-                   this, SIGNAL(linkHovered(const QString&)));
-        disconnect(oldWebView, SIGNAL(loadProgress(int)),
-                   this, SIGNAL(loadProgress(int)));
+        disconnect(oldWebView->page(), &WebPage::linkHovered,
+                   this, &TabWidget::linkHovered);
+        disconnect(oldWebView, &WebView::loadProgress,
+                   this, &TabWidget::loadProgress);
+        disconnect(oldWebView->page()->profile(), &QWebEngineProfile::downloadRequested,
+                   this, &TabWidget::downloadRequested);
     }
 
-    connect(webView, SIGNAL(statusBarMessage(const QString&)),
-            this, SIGNAL(showStatusBarMessage(const QString&)));
-    connect(webView->page(), SIGNAL(linkHovered(const QString&, const QString&, const QString&)),
-            this, SIGNAL(linkHovered(const QString&)));
-    connect(webView, SIGNAL(loadProgress(int)),
-            this, SIGNAL(loadProgress(int)));
+    connect(webView->page(), &WebPage::linkHovered,
+            this, &TabWidget::linkHovered);
+    connect(webView, &WebView::loadProgress,
+            this, &TabWidget::loadProgress);
+    connect(webView->page()->profile(), &QWebEngineProfile::downloadRequested,
+            this, &TabWidget::downloadRequested);
 
     for (int i = 0; i < m_actions.count(); ++i) {
         WebActionMapper *mapper = m_actions[i];
         mapper->updateCurrent(webView->page());
     }
-    emit setCurrentTitle(webView->title());
+    Q_EMIT setCurrentTitle(webView->title());
     m_locationBars->setCurrentIndex(index);
-    emit loadProgress(webView->progress());
-    emit showStatusBarMessage(webView->lastStatusBarText());
+    Q_EMIT loadProgress(webView->progress());
+    Q_EMIT showStatusBarMessage(webView->lastStatusBarText());
     if (webView->url().isEmpty() && webView->hasFocus()) {
         m_locationBars->currentWidget()->setFocus();
     } else if (!webView->url().isEmpty()) {
@@ -336,7 +384,7 @@ WebView *TabWidget::webView(int index) const
     if (WebViewWithSearch *webViewWithSearch = qobject_cast<WebViewWithSearch*>(widget)) {
         return webViewWithSearch->m_webView;
     }
-    return 0;
+    return nullptr;
 }
 
 WebViewSearch *TabWidget::webViewSearch(int index) const
@@ -345,7 +393,7 @@ WebViewSearch *TabWidget::webViewSearch(int index) const
     if (WebViewWithSearch *webViewWithSearch = qobject_cast<WebViewWithSearch*>(widget)) {
         return webViewWithSearch->m_webViewSearch;
     }
-    return 0;
+    return nullptr;
 }
 
 int TabWidget::webViewIndex(WebView *webView) const
@@ -370,13 +418,16 @@ WebView *TabWidget::makeNewTab(bool makeCurrent)
     // line edit
     LocationBar *locationBar = new LocationBar;
     if (!m_lineEditCompleter) {
-        HistoryCompletionModel *completionModel = new HistoryCompletionModel(this);
+        LocationCompletionModel *completionModel = new LocationCompletionModel(this);
         completionModel->setSourceModel(BrowserApplication::historyManager()->historyFilterModel());
-        m_lineEditCompleter = new HistoryCompleter(completionModel, this);
+        m_lineEditCompleter = new LocationCompleter(completionModel, this);
         connect(m_lineEditCompleter, SIGNAL(activated(const QString &)),
                 this, SLOT(loadString(const QString &)));
         // Should this be in Qt by default?
         QAbstractItemView *popup = m_lineEditCompleter->popup();
+        popup->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+        popup->verticalScrollBar()->hide();
+        popup->verticalScrollBar()->resize(0, 0);
         QListView *listView = qobject_cast<QListView*>(popup);
         if (listView) {
             // Urls are always LeftToRight
@@ -385,7 +436,7 @@ WebView *TabWidget::makeNewTab(bool makeCurrent)
         }
     }
     locationBar->setCompleter(m_lineEditCompleter);
-    connect(locationBar, SIGNAL(returnPressed()), this, SLOT(lineEditReturnPressed()));
+    connect(locationBar, &LocationBar::returnPressed, this, &TabWidget::lineEditReturnPressed);
     m_locationBars->addWidget(locationBar);
     m_locationBars->setSizePolicy(locationBar->sizePolicy());
 
@@ -395,33 +446,21 @@ WebView *TabWidget::makeNewTab(bool makeCurrent)
 
     // webview
     WebView *webView = new WebView;
+    webView->setPage(new WebPage(m_profile, webView));
     locationBar->setWebView(webView);
-    connect(webView, SIGNAL(loadStarted()),
-            this, SLOT(webViewLoadStarted()));
-    connect(webView, SIGNAL(loadProgress(int)),
-                this, SLOT(webViewLoadProgress(int)));
+    connect(webView, &WebView::loadStarted, this, &TabWidget::webViewLoadStarted);
+    connect(webView, &WebView::loadProgress, this, &TabWidget::webViewLoadProgress);
     connect(webView, SIGNAL(loadFinished(bool)),
             this, SLOT(webViewLoadFinished(bool)));
-    connect(webView, SIGNAL(iconChanged()),
-            this, SLOT(webViewIconChanged()));
-    connect(webView, SIGNAL(titleChanged(const QString &)),
-            this, SLOT(webViewTitleChanged(const QString &)));
-    connect(webView, SIGNAL(urlChanged(const QUrl &)),
-            this, SLOT(webViewUrlChanged(const QUrl &)));
+    connect(webView, &WebView::iconChanged, this, &TabWidget::webViewIconChanged);
+    connect(webView, &WebView::titleChanged, this, &TabWidget::webViewTitleChanged);
+    connect(webView, &WebView::urlChanged, this, &TabWidget::webViewUrlChanged);
     connect(webView, SIGNAL(search(const QUrl&, TabWidget::OpenUrlIn)),
             this, SLOT(loadUrl(const QUrl&, TabWidget::OpenUrlIn)));
-    connect(webView->page(), SIGNAL(windowCloseRequested()),
-            this, SLOT(windowCloseRequested()));
-    connect(webView->page(), SIGNAL(printRequested(QWebFrame *)),
-            this, SIGNAL(printRequested(QWebFrame *)));
-    connect(webView->page(), SIGNAL(geometryChangeRequested(const QRect &)),
-            this, SLOT(geometryChangeRequestedCheck(const QRect &)));
-    connect(webView->page(), SIGNAL(menuBarVisibilityChangeRequested(bool)),
-            this, SLOT(menuBarVisibilityChangeRequestedCheck(bool)));
-    connect(webView->page(), SIGNAL(statusBarVisibilityChangeRequested(bool)),
-            this, SLOT(statusBarVisibilityChangeRequestedCheck(bool)));
-    connect(webView->page(), SIGNAL(toolBarVisibilityChangeRequested(bool)),
-            this, SLOT(toolBarVisibilityChangeRequestedCheck(bool)));
+    connect(webView->page(), &WebPage::windowCloseRequested, this, &TabWidget::windowCloseRequested);
+    connect(webView->page(), &WebPage::printRequested, this, &TabWidget::printRequested);
+    connect(webView->page(), &WebPage::geometryChangeRequested, this, &TabWidget::geometryChangeRequestedCheck);
+    connect(webView, &WebView::devToolsRequested, this, &TabWidget::devToolsRequested);
 
     WebViewWithSearch *webViewWithSearch = new WebViewWithSearch(webView, this);
     addTab(webViewWithSearch, tr("Untitled"));
@@ -436,32 +475,14 @@ WebView *TabWidget::makeNewTab(bool makeCurrent)
 
     if (count() == 1)
         currentChanged(currentIndex());
-    emit tabsChanged();
+    Q_EMIT tabsChanged();
     return webView;
 }
 
 void TabWidget::geometryChangeRequestedCheck(const QRect &geometry)
 {
     if (count() == 1)
-        emit geometryChangeRequested(geometry);
-}
-
-void TabWidget::menuBarVisibilityChangeRequestedCheck(bool visible)
-{
-    if (count() == 1)
-        emit menuBarVisibilityChangeRequested(visible);
-}
-
-void TabWidget::statusBarVisibilityChangeRequestedCheck(bool visible)
-{
-    if (count() == 1)
-        emit statusBarVisibilityChangeRequested(visible);
-}
-
-void TabWidget::toolBarVisibilityChangeRequestedCheck(bool visible)
-{
-    if (count() == 1)
-        emit toolBarVisibilityChangeRequested(visible);
+        Q_EMIT geometryChangeRequested(geometry);
 }
 
 void TabWidget::reloadAllTabs()
@@ -558,8 +579,17 @@ void TabWidget::closeTab(int index)
 
     bool hasFocus = false;
     WebView *tab = webView(index);
+    hasFocus = tab->hasFocus();
+
+    if (m_profile == QWebEngineProfile::defaultProfile()) {
+        m_recentlyClosedTabsAction->setEnabled(true);
+        m_recentlyClosedTabs.prepend(tab->url());
+        if (m_recentlyClosedTabs.size() >= TabWidget::m_recentlyClosedTabsSize)
+            m_recentlyClosedTabs.removeLast();
+    }
 
     if (tab && !tab->url().isEmpty()) {
+        /*
         if (tab->isModified()) {
             QMessageBox closeConfirmation(tab);
             closeConfirmation.setWindowFlags(Qt::Sheet);
@@ -573,6 +603,7 @@ void TabWidget::closeTab(int index)
             if (closeConfirmation.exec() == QMessageBox::No)
                 return;
         }
+        */
         hasFocus = tab->hasFocus();
 
         m_recentlyClosedTabsAction->setEnabled(true);
@@ -590,32 +621,60 @@ void TabWidget::closeTab(int index)
 
     QWidget *webViewWithSearch = widget(index);
     removeTab(index);
-    webViewWithSearch->setParent(0);
+    webViewWithSearch->setParent(nullptr);
     webViewWithSearch->deleteLater();
 
-    emit tabsChanged();
+    Q_EMIT tabsChanged();
     if (hasFocus && count() > 0 && currentWebView())
         currentWebView()->setFocus();
     if (count() == 0)
-        emit lastTabClosed();
+        Q_EMIT lastTabClosed();
+}
+
+void TabWidget::setProfile(QWebEngineProfile *profile)
+{
+    m_profile = profile;
+    for (int i = 0; i < count(); ++i) {
+        QWidget *tabWidget = widget(i);
+        if (WebView *tab = qobject_cast<WebView*>(tabWidget)) {
+            WebPage* webPage = new WebPage(m_profile, tab);
+            setupPage(webPage);
+            webPage->load(tab->page()->url());
+            tab->setPage(webPage);
+        }
+    }
+}
+
+void TabWidget::setupPage(QWebEnginePage* page)
+{
+    connect(page, &QWebEnginePage::windowCloseRequested,
+            this, &TabWidget::windowCloseRequested);
+    connect(page, &QWebEnginePage::geometryChangeRequested,
+            this, &TabWidget::geometryChangeRequested);
+
+    // webview actions
+    for (int i = 0; i < m_actions.count(); ++i) {
+        WebActionMapper *mapper = m_actions[i];
+        mapper->addChild(page->action(mapper->webAction()));
+    }
 }
 
 QLabel *TabWidget::animationLabel(int index, bool addMovie)
 {
     if (-1 == index)
-        return 0;
+        return nullptr;
     QTabBar::ButtonPosition side = m_tabBar->freeSide();
     QLabel *loadingAnimation = qobject_cast<QLabel*>(m_tabBar->tabButton(index, side));
     if (!loadingAnimation) {
         loadingAnimation = new QLabel(this);
     }
     if (addMovie && !loadingAnimation->movie()) {
-        QMovie *movie = new QMovie(QLatin1String(":graphics/loading.gif"), QByteArray(), loadingAnimation);
+        QMovie *movie = new QMovie(QStringLiteral(":graphics/loading.gif"), QByteArray(), loadingAnimation);
         movie->setSpeed(50);
         loadingAnimation->setMovie(movie);
         movie->start();
     }
-    m_tabBar->setTabButton(index, side, 0);
+    m_tabBar->setTabButton(index, side, nullptr);
     m_tabBar->setTabButton(index, side, loadingAnimation);
     return loadingAnimation;
 }
@@ -633,7 +692,7 @@ void TabWidget::webViewLoadStarted()
     if (index != currentIndex())
         return;
 
-    emit showStatusBarMessage(tr("Loading..."));
+    Q_EMIT showStatusBarMessage(tr("Loading..."));
 }
 
 void TabWidget::webViewLoadProgress(int progress)
@@ -642,13 +701,14 @@ void TabWidget::webViewLoadProgress(int progress)
     int index = webViewIndex(webView);
 
     if (index != currentIndex()
-        || index < 0)
+            || index < 0)
         return;
 
-    double totalBytes = (double) webView->webPage()->totalBytes() / 1024;
+    //double totalBytes = (double) webView->webPage()->totalBytes() / 1024;
 
-    QString message = tr("Loading %1% (%2 %3)...").arg(progress).arg(totalBytes, 0, 'f', 2).arg(QLatin1String("kB"));
-    emit showStatusBarMessage(message);
+    //QString message = tr("Loading %1% (%2 %3)...").arg(progress).arg(totalBytes, 0, 'f', 2).arg(QStringLiteral("kB"));
+    QString message = tr("Loading ...");
+    Q_EMIT showStatusBarMessage(message);
 }
 
 void TabWidget::webViewLoadFinished(bool ok)
@@ -672,9 +732,9 @@ void TabWidget::webViewLoadFinished(bool ok)
         return;
 
     if (ok)
-        emit showStatusBarMessage(tr("Finished loading"));
+        Q_EMIT showStatusBarMessage(tr("Finished loading"));
     else
-        emit showStatusBarMessage(tr("Failed to load"));
+        Q_EMIT showStatusBarMessage(tr("Failed to load"));
 }
 
 void TabWidget::webViewIconChanged()
@@ -687,7 +747,7 @@ void TabWidget::webViewIconChanged()
         QLabel *label = animationLabel(index, false);
         QMovie *movie = label->movie();
         delete movie;
-        label->setMovie(0);
+        label->setMovie(nullptr);
         label->setPixmap(icon.pixmap(16, 16));
 #endif
     }
@@ -702,11 +762,11 @@ void TabWidget::webViewTitleChanged(const QString &title)
     QString tabTitle = title;
     if (title.isEmpty())
         tabTitle = QString::fromUtf8(webView->url().toEncoded());
-    tabTitle.replace(QLatin1Char('&'), QLatin1String("&&"));
+    tabTitle.replace(QChar('&'), QStringLiteral("&&"));
     setTabText(index, tabTitle);
     setTabToolTip(index, tabTitle);
     if (currentIndex() == index)
-        emit setCurrentTitle(title);
+        Q_EMIT setCurrentTitle(title);
     BrowserApplication::historyManager()->updateHistoryEntry(webView->url(), title);
 }
 
@@ -714,10 +774,13 @@ void TabWidget::webViewUrlChanged(const QUrl &url)
 {
     WebView *webView = qobject_cast<WebView*>(sender());
     int index = webViewIndex(webView);
-    if (-1 == index)
-        return;
-    m_tabBar->setTabData(index, url);
-    emit tabsChanged();
+    if (-1 != index) {
+        m_tabBar->setTabData(index, url);
+        HistoryManager *manager = BrowserApplication::historyManager();
+        if (url.isValid())
+            manager->addHistoryEntry(url.toString());
+    }
+    Q_EMIT tabsChanged();
 }
 
 void TabWidget::openLastTab()
@@ -807,9 +870,9 @@ QUrl TabWidget::guessUrlFromString(const QString &string)
 
     url = QUrl::fromUserInput(string);
 
-    if (url.scheme() == QLatin1String("about")
-        && url.path() == QLatin1String("home"))
-        url = QUrl(QLatin1String("qrc:/startpage.html"));
+    if (url.scheme() == QStringLiteral("about")
+            && url.path() == QStringLiteral("home"))
+        url = QUrl(QStringLiteral("endorphin://startpage"));
 
     // QUrl::isValid() is too much tolerant.
     // We actually want to check if the url conforms to the RFC, which QUrl::isValid() doesn't state.
@@ -817,13 +880,13 @@ QUrl TabWidget::guessUrlFromString(const QString &string)
         return url;
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("urlloading"));
-    bool search = settings.value(QLatin1String("searchEngineFallback"), false).toBool();
+    settings.beginGroup(QStringLiteral("urlloading"));
+    bool search = settings.value(QStringLiteral("searchEngineFallback"), true).toBool();
 
     if (search) {
         url = ToolbarSearch::openSearchManager()->currentEngine()->searchUrl(string.trimmed());
     } else {
-        QString urlString = QLatin1String("http://") + string.trimmed();
+        QString urlString = QStringLiteral("http://") + string.trimmed();
         url = QUrl::fromEncoded(urlString.toUtf8(), QUrl::TolerantMode);
     }
 
@@ -850,14 +913,14 @@ void TabWidget::loadSettings()
     }
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("tabs"));
-    bool newTabButtonInRightCorner = settings.value(QLatin1String("newTabButtonInRightCorner"), true).toBool();
+    settings.beginGroup(QStringLiteral("tabs"));
+    bool newTabButtonInRightCorner = settings.value(QStringLiteral("newTabButtonInRightCorner"), true).toBool();
 #ifndef Q_WS_MAC
     setCornerWidget(addTabButton, newTabButtonInRightCorner ? Qt::TopRightCorner : Qt::TopLeftCorner);
     addTabButton->show();
 #endif
 
-    bool oneCloseButton = settings.value(QLatin1String("oneCloseButton"), false).toBool();
+    bool oneCloseButton = settings.value(QStringLiteral("oneCloseButton"), false).toBool();
     if (oneCloseButton) {
         if (!closeTabButton) {
             closeTabButton = new QToolButton(this);
@@ -868,7 +931,7 @@ void TabWidget::loadSettings()
         setCornerWidget(closeTabButton, newTabButtonInRightCorner ? Qt::TopLeftCorner : Qt::TopRightCorner);
         closeTabButton->setVisible(oneCloseButton);
     } else {
-        setCornerWidget(0, newTabButtonInRightCorner ? Qt::TopLeftCorner : Qt::TopRightCorner);
+        setCornerWidget(nullptr, newTabButtonInRightCorner ? Qt::TopLeftCorner : Qt::TopRightCorner);
     }
     m_tabBar->setTabsClosable(!oneCloseButton);
 }
@@ -891,8 +954,8 @@ TabWidget::OpenUrlIn TabWidget::modifyWithUserBehavior(OpenUrlIn tab) {
             tab = NewWindow;
         } else {
             QSettings settings;
-            settings.beginGroup(QLatin1String("tabs"));
-            bool select = settings.value(QLatin1String("selectNewTabs"), false).toBool();
+            settings.beginGroup(QStringLiteral("tabs"));
+            bool select = settings.value(QStringLiteral("selectNewTabs"), false).toBool();
             if (modifiers & Qt::ShiftModifier)
                 tab = !select ? NewSelectedTab : NewNotSelectedTab;
             else
@@ -902,7 +965,7 @@ TabWidget::OpenUrlIn TabWidget::modifyWithUserBehavior(OpenUrlIn tab) {
 #ifdef USERMODIFIEDBEHAVIOR_DEBUG
     qDebug() << __FUNCTION__ << "end" << modifiers << buttons << tab;
 #endif
-    BrowserApplication::instance()->setEventKeyboardModifiers(0);
+    BrowserApplication::instance()->setEventKeyboardModifiers(Qt::NoModifier);
     BrowserApplication::instance()->setEventMouseButtons(Qt::NoButton);
     return tab;
 }
@@ -933,45 +996,45 @@ void TabWidget::loadUrl(const QUrl &url, OpenUrlIn tab, const QString &title)
  */
 WebView *TabWidget::getView(OpenUrlIn tab, WebView *currentView)
 {
-    WebView *webView = 0;
+    WebView *webView = nullptr;
     switch (tab) {
-        case NewWindow: {
+    case NewWindow: {
 #ifdef USERMODIFIEDBEHAVIOR_DEBUG
-            qDebug() << __FUNCTION__ << "NewWindow";
+        qDebug() << __FUNCTION__ << "NewWindow";
 #endif
-            BrowserMainWindow *newMainWindow = BrowserApplication::instance()->newMainWindow();
-            webView = newMainWindow->currentTab();
-            webView->setFocus();
-            break;
-        }
+        BrowserMainWindow *newMainWindow = BrowserApplication::instance()->newMainWindow();
+        webView = newMainWindow->currentTab();
+        webView->setFocus();
+        break;
+    }
 
-        case NewSelectedTab: {
+    case NewSelectedTab: {
 #ifdef USERMODIFIEDBEHAVIOR_DEBUG
-            qDebug() << __FUNCTION__ << "NewSelectedTab";
+        qDebug() << __FUNCTION__ << "NewSelectedTab";
 #endif
-            webView = makeNewTab(true);
-            webView->setFocus();
-            break;
-        }
+        webView = makeNewTab(true);
+        webView->setFocus();
+        break;
+    }
 
-        case NewNotSelectedTab: {
+    case NewNotSelectedTab: {
 #ifdef USERMODIFIEDBEHAVIOR_DEBUG
-            qDebug() << __FUNCTION__ << "NewNotSelectedTab";
+        qDebug() << __FUNCTION__ << "NewNotSelectedTab";
 #endif
-            webView = makeNewTab(false);
-            break;
-        }
+        webView = makeNewTab(false);
+        break;
+    }
 
-        case CurrentTab:
-        default:
+    case CurrentTab:
+    default:
 #ifdef USERMODIFIEDBEHAVIOR_DEBUG
-            qDebug() << __FUNCTION__ << "CurrentTab";
+        qDebug() << __FUNCTION__ << "CurrentTab";
 #endif
-            webView = currentView;
-            if (!webView)
-                return 0;
-            webView->setFocus();
-            break;
+        webView = currentView;
+        if (!webView)
+            return nullptr;
+        webView->setFocus();
+        break;
     }
     return webView;
 }
@@ -1075,3 +1138,19 @@ void TabWidget::createTab(const QByteArray &historyState, TabWidget::OpenUrlIn t
     }
 }
 
+void TabWidget::downloadRequested(QWebEngineDownloadItem *download)
+{
+    if (download->savePageFormat() != QWebEngineDownloadItem::UnknownSaveFormat) {
+        QString file = QDir::cleanPath(download->downloadDirectory() + QDir::separator() + download->downloadFileName());
+        SavePageDialog dlg(this, download->savePageFormat(), file);
+        if (dlg.exec() != SavePageDialog::Accepted)
+            return;
+        download->setSavePageFormat(dlg.pageFormat());
+        QFileInfo *info = new QFileInfo(dlg.filePath());
+        download->setDownloadFileName(info->fileName());
+        download->setDownloadDirectory(info->absolutePath());
+    }
+
+    BrowserApplication::downloadManager()->download(download);
+    download->accept();
+}
diff --git a/src/tabwidget.h b/src/tabwidget.h
index 644d23be..5e0b506a 100644
--- a/src/tabwidget.h
+++ b/src/tabwidget.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -65,8 +65,8 @@
 
 #include <qtabwidget.h>
 
-#include <QtWebKitWidgets>
-#include <qurl.h>
+#include <QtWebEngineWidgets>
+#include <QUrl>
 
 QT_BEGIN_NAMESPACE
 class QCompleter;
@@ -82,7 +82,7 @@ class WebView;
 class WebActionMapper;
 class WebViewSearch;
 class QToolButton;
-
+class QWebEngineDownloadItem;
 /*!
     TabWidget that contains WebViews and a stack widget of associated line edits.
 
@@ -93,7 +93,7 @@ class TabWidget : public QTabWidget
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     // tab widget signals
     void tabsChanged();
     void lastTabClosed();
@@ -104,10 +104,8 @@ class TabWidget : public QTabWidget
     void linkHovered(const QString &link);
     void loadProgress(int progress);
     void geometryChangeRequested(const QRect &geometry);
-    void menuBarVisibilityChangeRequested(bool visible);
-    void statusBarVisibilityChangeRequested(bool visible);
-    void toolBarVisibilityChangeRequested(bool visible);
-    void printRequested(QWebFrame *frame);
+    void printRequested();
+    void devToolsRequested(QWebEnginePage *source);
 
 public:
     enum OpenUrlIn {
@@ -119,12 +117,14 @@ class TabWidget : public QTabWidget
         NewTab = NewNotSelectedTab
     };
 
-    TabWidget(QWidget *parent = 0);
+    TabWidget(QWidget *parent = nullptr, QWebEngineProfile *profile = QWebEngineProfile::defaultProfile());
 
     void loadSettings();
-    TabBar *tabBar() { return m_tabBar; }
+    TabBar *tabBar() {
+        return m_tabBar;
+    }
     void clear();
-    void addWebAction(QAction *action, QWebPage::WebAction webAction);
+    void addWebAction(QAction *action, QWebEnginePage::WebAction webAction);
 
     QAction *newTabAction() const;
     QAction *closeTabAction() const;
@@ -148,10 +148,15 @@ class TabWidget : public QTabWidget
     static OpenUrlIn modifyWithUserBehavior(OpenUrlIn tab);
     WebView *getView(OpenUrlIn tab, WebView *currentView);
 
+    void setProfile(QWebEngineProfile *profile);
+
+    void initScripts();
+    QWebEngineProfile* profile();
+
 protected:
     void changeEvent(QEvent *event);
 
-public slots:
+public Q_SLOTS:
     void loadString(const QString &string, OpenUrlIn tab = CurrentTab);
     void loadUrlFromUser(const QUrl &url, const QString &title = QString());
     void loadUrl(const QUrl &url, TabWidget::OpenUrlIn tab = CurrentTab, const QString &title = QString());
@@ -166,7 +171,7 @@ public slots:
     void previousTab();
     void bookmarkTabs();
 
-private slots:
+private Q_SLOTS:
     void currentChanged(int index);
     void openLastTab();
     void aboutToShowRecentTabsMenu();
@@ -181,12 +186,12 @@ private slots:
     void windowCloseRequested();
     void moveTab(int fromIndex, int toIndex);
     void geometryChangeRequestedCheck(const QRect &geometry);
-    void menuBarVisibilityChangeRequestedCheck(bool visible);
-    void statusBarVisibilityChangeRequestedCheck(bool visible);
-    void toolBarVisibilityChangeRequestedCheck(bool visible);
     void historyCleared();
+    void downloadRequested(QWebEngineDownloadItem *download);
 
 private:
+    void setupPage(QWebEnginePage* page);
+
     static QUrl guessUrlFromString(const QString &url);
     QLabel *animationLabel(int index, bool addMovie);
     void retranslate();
@@ -209,6 +214,8 @@ private slots:
     TabBar *m_tabBar;
     QToolButton *addTabButton;
     QToolButton *closeTabButton;
+
+    QWebEngineProfile *m_profile;
 };
 
 #endif // TABWIDGET_H
diff --git a/src/toolbarsearch.cpp b/src/toolbarsearch.cpp
index d105ada5..84638f45 100644
--- a/src/toolbarsearch.cpp
+++ b/src/toolbarsearch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -64,9 +64,7 @@
 #include "toolbarsearch.h"
 
 #include "autosaver.h"
-#include "browserapplication.h"
 #include "browsermainwindow.h"
-#include "networkaccessmanager.h"
 #include "opensearchengine.h"
 #include "opensearchengineaction.h"
 #include "opensearchmanager.h"
@@ -74,17 +72,18 @@
 #include "webpage.h"
 #include "webview.h"
 
-#include <qabstractitemview.h>
-#include <qcompleter.h>
-#include <qcoreapplication.h>
-#include <qmenu.h>
-#include <qsettings.h>
-#include <qstandarditemmodel.h>
-#include <qtimer.h>
-#include <qurl.h>
-#include <qwebsettings.h>
+#include <QAbstractItemView>
+#include <QCompleter>
+#include <QCoreApplication>
+#include <QMenu>
+#include <QSettings>
+#include <QStandardItemModel>
+#include <QTimer>
+#include <QUrl>
+#include <QWebEngineSettings>
+#include <QNetworkAccessManager>
 
-OpenSearchManager *ToolbarSearch::s_openSearchManager = 0;
+OpenSearchManager *ToolbarSearch::s_openSearchManager = nullptr;
 
 /*
     ToolbarSearch is a search widget that also contains a small history
@@ -96,10 +95,10 @@ ToolbarSearch::ToolbarSearch(QWidget *parent)
     , m_autosaver(new AutoSaver(this))
     , m_maxSavedSearches(10)
     , m_model(new QStandardItemModel(this))
-    , m_suggestionsItem(0)
-    , m_recentSearchesItem(0)
-    , m_suggestTimer(0)
-    , m_completer(0)
+    , m_suggestionsItem(nullptr)
+    , m_recentSearchesItem(nullptr)
+    , m_suggestTimer(nullptr)
+    , m_completer(nullptr)
 {
     connect(openSearchManager(), SIGNAL(currentEngineChanged()),
             this, SLOT(currentEngineChanged()));
@@ -193,20 +192,20 @@ ToolbarSearch::~ToolbarSearch()
 void ToolbarSearch::save()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("toolbarsearch"));
-    settings.setValue(QLatin1String("recentSearches"), m_recentSearches);
-    settings.setValue(QLatin1String("maximumSaved"), m_maxSavedSearches);
+    settings.beginGroup(QStringLiteral("toolbarsearch"));
+    settings.setValue(QStringLiteral("recentSearches"), m_recentSearches);
+    settings.setValue(QStringLiteral("maximumSaved"), m_maxSavedSearches);
     settings.endGroup();
 }
 
 void ToolbarSearch::load()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("toolbarsearch"));
-    m_recentSearches = settings.value(QLatin1String("recentSearches")).toStringList();
-    m_maxSavedSearches = settings.value(QLatin1String("maximumSaved"), m_maxSavedSearches).toInt();
+    settings.beginGroup(QStringLiteral("toolbarsearch"));
+    m_recentSearches = settings.value(QStringLiteral("recentSearches")).toStringList();
+    m_maxSavedSearches = settings.value(QStringLiteral("maximumSaved"), m_maxSavedSearches).toInt();
 
-    m_suggestionsEnabled = settings.value(QLatin1String("useSuggestions"), true).toBool();
+    m_suggestionsEnabled = settings.value(QStringLiteral("useSuggestions"), true).toBool();
     if (m_suggestionsEnabled) {
         connect(this, SIGNAL(textEdited(const QString &)),
                 this, SLOT(textEdited(const QString &)));
@@ -239,7 +238,7 @@ void ToolbarSearch::getSuggestions()
         return;
 
     if (!engine->networkAccessManager())
-        engine->setNetworkAccessManager(BrowserApplication::networkAccessManager());
+        engine->setNetworkAccessManager(new QNetworkAccessManager());
 
     engine->requestSuggestions(text());
 }
@@ -253,24 +252,24 @@ void ToolbarSearch::searchNow()
 
     QString searchText = text();
 
-    QWebSettings *globalSettings = QWebSettings::globalSettings();
-    if (!globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) {
-        QStringList newList = m_recentSearches;
-        if (newList.contains(searchText))
-            newList.removeAt(newList.indexOf(searchText));
-        newList.prepend(searchText);
-        if (newList.size() >= m_maxSavedSearches)
-            newList.removeLast();
-
-        m_recentSearches = newList;
-        m_autosaver->changeOccurred();
-    }
+//    QWebEngineSettings *globalSettings = QWebEngineSettings::globalSettings();
+//    if (!globalSettings->testAttribute(QWebEngineSettings::PrivateBrowsingEnabled)) {
+    QStringList newList = m_recentSearches;
+    if (newList.contains(searchText))
+        newList.removeAt(newList.indexOf(searchText));
+    newList.prepend(searchText);
+    if (newList.size() >= m_maxSavedSearches)
+        newList.removeLast();
+
+    m_recentSearches = newList;
+    m_autosaver->changeOccurred();
+//    }
 
     QUrl searchUrl = engine->searchUrl(searchText);
     TabWidget::OpenUrlIn tab = TabWidget::CurrentTab;
     if (qApp->keyboardModifiers() == Qt::AltModifier)
         tab = TabWidget::NewSelectedTab;
-    emit search(searchUrl, tab);
+    Q_EMIT search(searchUrl, tab);
 }
 
 void ToolbarSearch::newSuggestions(const QStringList &suggestions)
@@ -316,33 +315,33 @@ void ToolbarSearch::showEnginesMenu()
             action->setChecked(true);
         }
     }
+    /*
+        WebView *webView = BrowserMainWindow::parentWindow(this)->currentTab();
+        QList<WebPageLinkedResource> engines = webView->webPage()->linkedResources(QStringLiteral("search"));
 
-    WebView *webView = BrowserMainWindow::parentWindow(this)->currentTab();
-    QList<WebPageLinkedResource> engines = webView->webPage()->linkedResources(QLatin1String("search"));
-
-    if (!engines.empty())
-        menu.addSeparator();
+        if (!engines.empty())
+            menu.addSeparator();
 
-    for (int i = 0; i < engines.count(); ++i) {
-        WebPageLinkedResource engine = engines.at(i);
+        for (int i = 0; i < engines.count(); ++i) {
+            WebPageLinkedResource engine = engines.at(i);
 
-        QUrl url = engine.href;
-        QString title = engine.title;
-        QString mimetype = engine.type;
+            QUrl url = engine.href;
+            QString title = engine.title;
+            QString mimetype = engine.type;
 
-        if (mimetype != QLatin1String("application/opensearchdescription+xml"))
-            continue;
-        if (url.isEmpty())
-            continue;
+            if (mimetype != QStringLiteral("application/opensearchdescription+xml"))
+                continue;
+            if (url.isEmpty())
+                continue;
 
-        if (title.isEmpty())
-            title = webView->title().isEmpty() ? url.host() : webView->title();
-
-        QAction *action = menu.addAction(tr("Add '%1'").arg(title), this, SLOT(addEngineFromUrl()));
-        action->setData(url);
-        action->setIcon(webView->icon());
-    }
+            if (title.isEmpty())
+                title = webView->title().isEmpty() ? url.host() : webView->title();
 
+            QAction *action = menu.addAction(tr("Add '%1'").arg(title), this, SLOT(addEngineFromUrl()));
+            action->setData(url);
+            action->setIcon(webView->icon());
+        }
+    */
     menu.addSeparator();
     if (BrowserMainWindow *window = BrowserMainWindow::parentWindow(this))
         menu.addAction(window->searchManagerAction());
@@ -377,10 +376,10 @@ void ToolbarSearch::addEngineFromUrl()
 void ToolbarSearch::setupList()
 {
     if (m_suggestions.isEmpty()
-        || (m_model->rowCount() > 0
-            && m_model->item(0) != m_suggestionsItem)) {
+            || (m_model->rowCount() > 0
+                && m_model->item(0) != m_suggestionsItem)) {
         m_model->clear();
-        m_suggestionsItem = 0;
+        m_suggestionsItem = nullptr;
     } else {
         m_model->removeRows(1, m_model->rowCount() - 1);
     }
diff --git a/src/toolbarsearch.h b/src/toolbarsearch.h
index c4d74bce..bc24d75c 100644
--- a/src/toolbarsearch.h
+++ b/src/toolbarsearch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -79,19 +79,19 @@ class ToolbarSearch : public SearchLineEdit
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void search(const QUrl &url, TabWidget::OpenUrlIn tab);
 
 public:
-    ToolbarSearch(QWidget *parent = 0);
+    ToolbarSearch(QWidget *parent = nullptr);
     ~ToolbarSearch();
     static OpenSearchManager *openSearchManager();
 
-public slots:
+public Q_SLOTS:
     void clear();
     void searchNow();
 
-private slots:
+private Q_SLOTS:
     void currentEngineChanged();
     void save();
     void textEdited(const QString &);
diff --git a/src/useragent/useragent.pri b/src/useragent/useragent.pri
deleted file mode 100644
index 01eb3d92..00000000
--- a/src/useragent/useragent.pri
+++ /dev/null
@@ -1,12 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += \
-    useragentmenu.h
-
-SOURCES += \
-    useragentmenu.cpp
-
-RESOURCES += \
-    useragents.qrc
diff --git a/src/useragent/useragentmenu.cpp b/src/useragent/useragentmenu.cpp
index d6fc497b..9f6dd3c4 100644
--- a/src/useragent/useragentmenu.cpp
+++ b/src/useragent/useragentmenu.cpp
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, William C. Witt
- * Copyright (c) 2010, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright (c) 2010, Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,12 +31,12 @@
 
 #include "webpage.h"
 
-#include <qfile.h>
-#include <qinputdialog.h>
-#include <qsettings.h>
+#include <QFile>
+#include <QInputDialog>
+#include <QSettings>
 #include <qxmlstream.h>
 
-#include <qdebug.h>
+#include <QDebug>
 
 UserAgentMenu::UserAgentMenu(QWidget *parent)
     : QMenu(parent)
@@ -54,11 +54,11 @@ void UserAgentMenu::populateMenu()
     defaultUserAgent->setCheckable(true);
     connect(defaultUserAgent, SIGNAL(triggered()), this, SLOT(switchToDefaultUserAgent()));
     QSettings settings;
-    defaultUserAgent->setChecked(settings.value(QLatin1String("userAgent")).toString().isEmpty());
+    defaultUserAgent->setChecked(settings.value(QStringLiteral("userAgent")).toString().isEmpty());
     addAction(defaultUserAgent);
 
     // Add default extra user agents
-    addActionsFromFile(QLatin1String(":/useragents/useragents.xml"));
+    addActionsFromFile(QStringLiteral(":/useragents/useragents.xml"));
 
     // Add other action
     addSeparator();
@@ -70,7 +70,7 @@ void UserAgentMenu::populateMenu()
 
     bool usingCustomUserAgent = true;
     QActionGroup *actionGroup = new QActionGroup(this);
-    foreach (QAction *action, actions()) {
+    Q_FOREACH (QAction *action, actions()) {
         actionGroup->addAction(action);
         if (action->isChecked()) {
             usingCustomUserAgent = false;
@@ -89,14 +89,14 @@ void UserAgentMenu::addActionsFromFile(const QString &fileName)
     QXmlStreamReader xml(&file);
     while (!xml.atEnd()) {
         xml.readNext();
-        if (xml.isStartElement() && xml.name() == QLatin1String("separator")) {
+        if (xml.isStartElement() && xml.name() == QStringLiteral("separator")) {
             addSeparator();
             continue;
         }
-        if (xml.isStartElement() && xml.name() == QLatin1String("useragent")) {
+        if (xml.isStartElement() && xml.name() == QStringLiteral("useragent")) {
             QXmlStreamAttributes attributes = xml.attributes();
-            QString title = attributes.value(QLatin1String("description")).toString();
-            QString userAgent = attributes.value(QLatin1String("useragent")).toString();
+            QString title = attributes.value(QStringLiteral("description")).toString();
+            QString userAgent = attributes.value(QStringLiteral("useragent")).toString();
 
             QAction *action = new QAction(this);
             action->setText(title);
@@ -110,7 +110,7 @@ void UserAgentMenu::addActionsFromFile(const QString &fileName)
     }
     if (xml.hasError()) {
         qDebug() << "Error reading custom user agents" << xml.errorString();
-         // ... do error handling
+        // ... do error handling
     }
 }
 
@@ -130,8 +130,8 @@ void UserAgentMenu::switchToOtherUserAgent()
 {
     bool ok;
     QString text = QInputDialog::getText(this, tr("Custom user agent"),
-                                          tr("User agent:"), QLineEdit::Normal,
-                                          WebPage::userAgent(), &ok, Qt::Sheet);
+                                         tr("User agent:"), QLineEdit::Normal,
+                                         WebPage::userAgent(), &ok, Qt::Sheet);
     if (ok) {
         WebPage::setUserAgent(text);
     }
diff --git a/src/useragent/useragentmenu.h b/src/useragent/useragentmenu.h
index b5ddfc3a..4c0694fd 100644
--- a/src/useragent/useragentmenu.h
+++ b/src/useragent/useragentmenu.h
@@ -1,6 +1,6 @@
 /**
  * Copyright (c) 2010, William C. Witt
- * Copyright (c) 2010, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright (c) 2010, Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -30,16 +30,16 @@
 #ifndef USERAGENTMENU_H
 #define USERAGENTMENU_H
 
-#include <qmenu.h>
+#include <QMenu>
 
 class UserAgentMenu : public QMenu
 {
     Q_OBJECT
 
 public:
-    UserAgentMenu(QWidget *parent = 0);
+    UserAgentMenu(QWidget *parent = nullptr);
 
-private slots:
+private Q_SLOTS:
     void populateMenu();
     void changeUserAgent();
     void switchToDefaultUserAgent();
diff --git a/src/utils/editlistview.cpp b/src/utils/editlistview.cpp
index 68749d18..6ce5c0a6 100644
--- a/src/utils/editlistview.cpp
+++ b/src/utils/editlistview.cpp
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -28,7 +28,8 @@
 
 #include "editlistview.h"
 
-#include <qevent.h>
+#include <QEvent>
+#include <QKeyEvent>
 
 EditListView::EditListView(QWidget *parent)
     : QListView(parent)
diff --git a/src/utils/editlistview.h b/src/utils/editlistview.h
index e719ea1f..8bee8c6f 100644
--- a/src/utils/editlistview.h
+++ b/src/utils/editlistview.h
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,17 +29,17 @@
 #ifndef EDITLISTVIEW_H
 #define EDITLISTVIEW_H
 
-#include <qlistview.h>
+#include <QListView>
 
 class EditListView : public QListView
 {
     Q_OBJECT
 
 public:
-    EditListView(QWidget *parent = 0);
+    EditListView(QWidget *parent = nullptr);
     void keyPressEvent(QKeyEvent *event);
 
-public slots:
+public Q_SLOTS:
     void removeSelected();
     void removeAll();
 };
diff --git a/src/utils/edittableview.cpp b/src/utils/edittableview.cpp
index b2438ded..876441a8 100644
--- a/src/utils/edittableview.cpp
+++ b/src/utils/edittableview.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright (c) 2009, Jakub Wieczorek <faw217@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,7 +29,8 @@
 
 #include "edittableview.h"
 
-#include <qevent.h>
+#include <QKeyEvent>
+#include <QEvent>
 
 EditTableView::EditTableView(QWidget *parent)
     : QTableView(parent)
diff --git a/src/utils/edittableview.h b/src/utils/edittableview.h
index 9ec1a0b0..bb2a144c 100644
--- a/src/utils/edittableview.h
+++ b/src/utils/edittableview.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright (c) 2009, Jakub Wieczorek <faw217@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -30,17 +30,17 @@
 #ifndef EDITTABLEVIEW_H
 #define EDITTABLEVIEW_H
 
-#include <qtableview.h>
+#include <QTableView>
 
 class EditTableView : public QTableView
 {
     Q_OBJECT
 
 public:
-    EditTableView(QWidget *parent = 0);
+    EditTableView(QWidget *parent = nullptr);
     void keyPressEvent(QKeyEvent *event);
 
-public slots:
+public Q_SLOTS:
     void removeSelected();
     void removeAll();
 };
diff --git a/src/utils/edittreeview.cpp b/src/utils/edittreeview.cpp
index d5377146..4afb1eb1 100644
--- a/src/utils/edittreeview.cpp
+++ b/src/utils/edittreeview.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright (c) 2009, Jakub Wieczorek <faw217@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,7 +29,8 @@
 
 #include "edittreeview.h"
 
-#include <qevent.h>
+#include <QEvent>
+#include <QMouseEvent>
 
 EditTreeView::EditTreeView(QWidget *parent)
     : QTreeView(parent)
diff --git a/src/utils/edittreeview.h b/src/utils/edittreeview.h
index 5a037545..5b617e6c 100644
--- a/src/utils/edittreeview.h
+++ b/src/utils/edittreeview.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright (c) 2009, Jakub Wieczorek <faw217@gmail.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -37,10 +37,10 @@ class EditTreeView : public QTreeView
     Q_OBJECT
 
 public:
-    EditTreeView(QWidget *parent = 0);
+    EditTreeView(QWidget *parent = nullptr);
     void keyPressEvent(QKeyEvent *event);
 
-public slots:
+public Q_SLOTS:
     void removeSelected();
     void removeAll();
 
diff --git a/src/utils/explorerstyle.cpp b/src/utils/explorerstyle.cpp
index 9bd1fd3f..6d4f11be 100644
--- a/src/utils/explorerstyle.cpp
+++ b/src/utils/explorerstyle.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -41,10 +41,10 @@
 
 #include <qlibrary.h>
 #include <qpixmapcache.h>
-#include <qmainwindow.h>
-#include <qtoolbar.h>
-#include <qpainter.h>
-#include <qmenubar.h>
+#include <QMainWindow>
+#include <QToolBar>
+#include <QPainter>
+#include <QMenuBar>
 #include <qstyleoption.h>
 
 #include <qt_windows.h>
@@ -56,7 +56,7 @@
 
 typedef HANDLE (WINAPI *PtrOpenThemeData)(HWND hwnd, LPCWSTR pszClassList);
 typedef HRESULT (WINAPI *PtrDrawThemeBackground)(HANDLE hTheme, HDC hdc, int iPartId, int iStateId,
-                                                 const RECT *pRect, OPTIONAL const RECT *pClipRect);
+        const RECT *pRect, OPTIONAL const RECT *pClipRect);
 typedef bool (WINAPI *PtrIsAppThemed)();
 
 static PtrDrawThemeBackground pDrawThemeBackground = 0;
@@ -81,7 +81,7 @@ ExplorerStyle::ExplorerStyle()
     : QWindowsVistaStyle()
 {
 #ifdef Q_OS_WIN
-    QLibrary themeLib(QLatin1String("uxtheme"));
+    QLibrary themeLib(QStringLiteral("uxtheme"));
     themeLib.load();
     if (themeLib.isLoaded()) {  //resolve uxtheme functions
         pIsAppThemed =          (PtrIsAppThemed)themeLib.resolve("IsAppThemed");
@@ -95,8 +95,8 @@ ExplorerStyle::ExplorerStyle()
 void drawRebarBackground(const QRect &rect,  QPainter *painter) {
     if (rect.isEmpty())
         return;
-    QString cacheKey = QLatin1String("q_rebar_") + QString::number(rect.size().width())
-                        + QLatin1Char('x') + QString::number(rect.size().height());
+    QString cacheKey = QStringLiteral("q_rebar_") + QString::number(rect.size().width())
+                       + QChar('x') + QString::number(rect.size().height());
     QPixmap pixmap;
     if (!QPixmapCache::find(cacheKey, pixmap)) {
         pixmap = QPixmap(rect.size());
@@ -116,7 +116,7 @@ void drawRebarBackground(const QRect &rect,  QPainter *painter) {
 }
 
 void ExplorerStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *option,
-                                    QPainter *painter, const QWidget *widget) const
+                                  QPainter *painter, const QWidget *widget) const
 {
     QRect rect = option->rect;
     switch (element) {
@@ -135,7 +135,7 @@ void ExplorerStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *
 
                 //We need the bounding rect for all toolbars
                 QList<QToolBar*> toolbars = qFindChildren<QToolBar*>(window);
-                foreach (const QToolBar *tb, toolbars) {
+                Q_FOREACH (const QToolBar *tb, toolbars) {
                     if (!tb->isFloating()) {
                         QRect rect(tb->mapToParent(tb->rect().topLeft()), tb->rect().size());
                         if (window->toolBarArea(const_cast<QToolBar*>(tb)) == Qt::TopToolBarArea)
@@ -179,7 +179,7 @@ void ExplorerStyle::drawPrimitive(PrimitiveElement element, const QStyleOption *
 }
 
 void ExplorerStyle::drawControl(ControlElement element, const QStyleOption *option,
-                                  QPainter *painter, const QWidget *widget) const
+                                QPainter *painter, const QWidget *widget) const
 {
     QColor shadow = option->palette.dark().color();
     shadow.setAlpha(120);
@@ -233,7 +233,7 @@ void ExplorerStyle::drawControl(ControlElement element, const QStyleOption *opti
                 adjustedToolBar.palette.setBrush(QPalette::All, QPalette::Dark, shadow);
                 QWindowsXPStyle::drawControl(element, &adjustedToolBar, painter, widget);
             }
-        break;
+            break;
         } //fall through
 
     default:
@@ -246,7 +246,7 @@ void ExplorerStyle::drawControl(ControlElement element, const QStyleOption *opti
 }
 
 void ExplorerStyle::drawComplexControl(ComplexControl control, const QStyleOptionComplex *option,
-                                         QPainter *painter, const QWidget *widget) const
+                                       QPainter *painter, const QWidget *widget) const
 {
     if (vista)
         QWindowsVistaStyle::drawComplexControl(control, option, painter, widget);
@@ -255,7 +255,7 @@ void ExplorerStyle::drawComplexControl(ComplexControl control, const QStyleOptio
 }
 
 QSize ExplorerStyle::sizeFromContents(ContentsType type, const QStyleOption *option,
-                                        const QSize &size, const QWidget *widget) const
+                                      const QSize &size, const QWidget *widget) const
 {
     if (vista)
         return QWindowsVistaStyle::sizeFromContents(type, option, size, widget);
@@ -272,7 +272,7 @@ QRect ExplorerStyle::subElementRect(SubElement element, const QStyleOption *opti
 }
 
 QRect ExplorerStyle::subControlRect(ComplexControl control, const QStyleOptionComplex *option,
-                                      SubControl subControl, const QWidget *widget) const
+                                    SubControl subControl, const QWidget *widget) const
 {
     if (vista)
         return QWindowsVistaStyle::subControlRect(control, option, subControl, widget);
@@ -281,7 +281,7 @@ QRect ExplorerStyle::subControlRect(ComplexControl control, const QStyleOptionCo
 }
 
 QStyle::SubControl ExplorerStyle::hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option,
-                                                          const QPoint &pos, const QWidget *widget) const
+        const QPoint &pos, const QWidget *widget) const
 {
     if (vista)
         return QWindowsVistaStyle::hitTestComplexControl(control, option, pos, widget);
diff --git a/src/utils/explorerstyle.h b/src/utils/explorerstyle.h
index f3a51452..fc633ae0 100644
--- a/src/utils/explorerstyle.h
+++ b/src/utils/explorerstyle.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -58,7 +58,7 @@ class ExplorerStyle : public QWindowsVistaStyle
     QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt,
                          SubControl sc, const QWidget *widget) const;
     SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option,
-                           const QPoint &pos, const QWidget *widget = 0) const;
+                                     const QPoint &pos, const QWidget *widget = 0) const;
     QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt,
                            const QWidget *widget = 0) const;
     int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const;
diff --git a/src/utils/languagemanager.cpp b/src/utils/languagemanager.cpp
index eeaf5c3b..03e37626 100644
--- a/src/utils/languagemanager.cpp
+++ b/src/utils/languagemanager.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2008-2009 Diego Iastrubni, elcuco, at, kde.org
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,25 +29,25 @@
 
 #include "languagemanager.h"
 
-#include <qapplication.h>
-#include <qdir.h>
+#include <QApplication>
+#include <QDir>
 #include <qdiriterator.h>
 #include <qfileinfo.h>
-#include <qinputdialog.h>
+#include <QInputDialog>
 #include <qlibraryinfo.h>
-#include <qmessagebox.h>
+#include <QMessageBox>
 #include <qlocale.h>
-#include <qsettings.h>
+#include <QSettings>
 #include <qtranslator.h>
 
-#include <qdebug.h>
+#include <QDebug>
 
 // #define LANGUAGEMANAGER_DEBUG
 
 LanguageManager::LanguageManager(QObject *parent)
     : QObject(parent)
-    , m_sysTranslator(0)
-    , m_appTranslator(0)
+    , m_sysTranslator(nullptr)
+    , m_appTranslator(nullptr)
     , m_loaded(false)
 {
 #ifdef LANGUAGEMANAGER_DEBUG
@@ -89,8 +89,8 @@ bool LanguageManager::isLanguageAvailable(const QString &language) const
 
     // optimization so we don't have to load all the languages
     if (!m_loaded) {
-        foreach (const QString &dir, m_localeDirectories) {
-            QString file = dir + QLatin1Char('/') + language + QLatin1String(".qm");
+        Q_FOREACH (const QString &dir, m_localeDirectories) {
+            QString file = dir + QChar('/') + language + QStringLiteral(".qm");
             if (QFile::exists(file))
                 return true;
         }
@@ -110,9 +110,9 @@ QString LanguageManager::convertStringToLanguageFile(const QString &string) cons
 #endif
     loadAvailableLanguages();
     if (m_languages.contains(string))
-       return string;
+        return string;
     QLocale locale(string);
-    QString fallback = locale.name().split(QLatin1Char('_')).value(0);
+    QString fallback = locale.name().split(QChar('_')).value(0);
     if (!string.contains(fallback))
         return QString();
 #ifdef LANGUAGEMANAGER_DEBUG
@@ -122,8 +122,8 @@ QString LanguageManager::convertStringToLanguageFile(const QString &string) cons
         return fallback;
 
     // See if any language file matches the country
-    foreach (const QString &language, m_languages) {
-        QString country = QLocale(language).name().split(QLatin1Char('_')).value(0);
+    Q_FOREACH (const QString &language, m_languages) {
+        QString country = QLocale(language).name().split(QChar('_')).value(0);
         if (country == fallback)
             return language;
     }
@@ -137,21 +137,20 @@ bool LanguageManager::setCurrentLanguage(const QString &language)
     qDebug() << "LanguageManager::" << __FUNCTION__ << language;
 #endif
     if (m_currentLanguage == language
-        || !isLanguageAvailable(language))
+            || !isLanguageAvailable(language))
         return false;
 
     m_currentLanguage = language;
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("LanguageManager"));
-    settings.setValue(QLatin1String("language"), m_currentLanguage);
+    settings.beginGroup(QStringLiteral("LanguageManager"));
+    settings.setValue(QStringLiteral("language"), m_currentLanguage);
 
     if (m_currentLanguage.isEmpty()) {
         delete m_appTranslator;
         delete m_sysTranslator;
-        m_appTranslator = 0;
-        m_sysTranslator = 0;
-        emit languageChanged(currentLanguage());
+        m_appTranslator = nullptr;
+        m_sysTranslator = nullptr;
         return true;
     }
 
@@ -159,17 +158,17 @@ bool LanguageManager::setCurrentLanguage(const QString &language)
     QString resourceDir = QLibraryInfo::location(QLibraryInfo::TranslationsPath);
     QString languageFile = convertStringToLanguageFile(m_currentLanguage);
     bool loaded = false;
-    foreach (const QString &dir, m_localeDirectories) {
+    Q_FOREACH (const QString &dir, m_localeDirectories) {
         loaded = newAppTranslator->load(languageFile, dir);
         if (loaded)
             break;
     }
 
     QTranslator *newSysTranslator = new QTranslator(this);
-    QString translatorFileName = QLatin1String("qt_") + languageFile;
+    QString translatorFileName = QStringLiteral("qt_") + languageFile;
     if (!newSysTranslator->load(translatorFileName, resourceDir)) {
         delete newSysTranslator;
-        newSysTranslator = 0;
+        newSysTranslator = nullptr;
     }
 
     if (!loaded) {
@@ -189,7 +188,6 @@ bool LanguageManager::setCurrentLanguage(const QString &language)
     qApp->installTranslator(newSysTranslator);
     m_appTranslator = newAppTranslator;
     m_sysTranslator = newSysTranslator;
-    emit languageChanged(currentLanguage());
     return true;
 }
 
@@ -209,9 +207,9 @@ void LanguageManager::loadLanguageFromSettings()
 #endif
 
     QSettings settings;
-    settings.beginGroup(QLatin1String("LanguageManager"));
-    if (settings.contains(QLatin1String("language"))) {
-        QString selectedLanguage = settings.value(QLatin1String("language")).toString();
+    settings.beginGroup(QStringLiteral("LanguageManager"));
+    if (settings.contains(QStringLiteral("language"))) {
+        QString selectedLanguage = settings.value(QStringLiteral("language")).toString();
 #ifdef LANGUAGEMANAGER_DEBUG
         qDebug() << "LanguageManager::" << __FUNCTION__ << "Loading language from settings" << selectedLanguage;
 #endif
@@ -221,7 +219,7 @@ void LanguageManager::loadLanguageFromSettings()
 #ifdef LANGUAGEMANAGER_DEBUG
             qDebug() << "LanguageManager::" << __FUNCTION__ << "Failed to load language";
 #endif
-            settings.remove(QLatin1String("language"));
+            settings.remove(QStringLiteral("language"));
         }
     } else if (!currentLanguage().isEmpty()) {
         setCurrentLanguage(currentLanguage());
@@ -236,9 +234,9 @@ void LanguageManager::chooseNewLanguage()
     loadAvailableLanguages();
     if (m_languages.isEmpty()) {
         QMessageBox messageBox;
-        QLatin1String separator = QLatin1String(", ");
+        QString separator = QStringLiteral(", ");
         messageBox.setText(tr("No translation files are installed at %1.")
-            .arg(m_localeDirectories.join(separator)));
+                           .arg(m_localeDirectories.join(separator)));
         messageBox.setStandardButtons(QMessageBox::Ok);
         messageBox.exec();
         return;
@@ -247,29 +245,29 @@ void LanguageManager::chooseNewLanguage()
     QStringList items;
     int defaultItem = -1;
     QString current = currentLanguage();
-    foreach (const QString &name, m_languages) {
+    Q_FOREACH (const QString &name, m_languages) {
         QLocale locale(name);
-        QString string = QString(QLatin1String("%1, %2 (%3) %4"))
-            .arg(QLocale::languageToString(locale.language()))
-            .arg(QLocale::countryToString(locale.country()))
-            .arg(name)
-            // this is for pretty RTL support
-            .arg(QChar(0x200E)); // LRM = 0x200E
+        QString string = QString(QStringLiteral("%1, %2 (%3) %4"))
+                         .arg(QLocale::languageToString(locale.language()),
+                           QLocale::countryToString(locale.country()),
+                           name,
+                           // this is for pretty RTL support
+                           QChar(0x200E)); // LRM = 0x200E
         if (name == current)
             defaultItem = items.count();
         items << string;
     }
-    items << QLatin1String("English (en_US)");
+    items << QStringLiteral("English (en_US)");
     if (defaultItem == -1)
         defaultItem = items.count() - 1;
 
     bool ok;
-    QString item = QInputDialog::getItem(0,
-        tr("Choose language"),
-        tr("<p>You can run with a different language than<br>"
-        "the operating system default.</p>"
-        "<p>Please choose the language which should be used</p>"),
-        items, defaultItem, false, &ok);
+    QString item = QInputDialog::getItem(nullptr,
+                                         tr("Choose language"),
+                                         tr("<p>You can run with a different language than<br>"
+                                            "the operating system default.</p>"
+                                            "<p>Please choose the language which should be used</p>"),
+                                         items, defaultItem, false, &ok);
     if (!ok)
         return;
 
@@ -289,11 +287,11 @@ void LanguageManager::loadAvailableLanguages() const
     qDebug() << "LanguageManager::" << __FUNCTION__;
 #endif
 
-    foreach (const QString &dir, m_localeDirectories) {
+    Q_FOREACH (const QString &dir, m_localeDirectories) {
         QDirIterator it(dir);
         while (it.hasNext()) {
             QString fileName = it.next();
-            if (!fileName.endsWith(QLatin1String(".qm")))
+            if (!fileName.endsWith(QStringLiteral(".qm")))
                 continue;
             const QFileInfo info = it.fileInfo();
             QString language = info.completeBaseName();
diff --git a/src/utils/languagemanager.h b/src/utils/languagemanager.h
index 76ad3b16..a93d372c 100644
--- a/src/utils/languagemanager.h
+++ b/src/utils/languagemanager.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2008-2009 Diego Iastrubni, elcuco, at, kde.org
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,7 +10,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -30,7 +30,7 @@
 #ifndef LANGUAGEMANAGER_H
 #define LANGUAGEMANAGER_H
 
-#include <qobject.h>
+#include <QObject>
 
 #include <qstringlist.h>
 
@@ -38,13 +38,13 @@ class QTranslator;
 class LanguageManager : public QObject
 {
     Q_OBJECT
-    Q_PROPERTY(QString currentLanguage READ currentLanguage WRITE setCurrentLanguage)
+    Q_PROPERTY(QString currentLanguage READ currentLanguage WRITE setCurrentLanguage NOTIFY languageChanged)
 
-signals:
+Q_SIGNALS:
     void languageChanged(const QString &language);
 
 public:
-    LanguageManager(QObject *parent = 0);
+    LanguageManager(QObject *parent = nullptr);
 
     void addLocaleDirectory(const QString &directory);
     QStringList localeDirectories() const;
@@ -55,7 +55,7 @@ class LanguageManager : public QObject
     QStringList languages() const;
     bool isLanguageAvailable(const QString &language) const;
 
-public slots:
+public Q_SLOTS:
     void loadLanguageFromSettings();
     void chooseNewLanguage();
 
diff --git a/src/utils/lineedit.cpp b/src/utils/lineedit.cpp
index b98183d4..9a11f110 100644
--- a/src/utils/lineedit.cpp
+++ b/src/utils/lineedit.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008 - 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,12 +29,12 @@
 #include "lineedit.h"
 #include "lineedit_p.h"
 
-#include <qevent.h>
-#include <qlayout.h>
+#include <QEvent>
+#include <QLayout>
 #include <qstyleoption.h>
-#include <qpainter.h>
+#include <QPainter>
 
-#include <qdebug.h>
+#include <QDebug>
 
 SideWidget::SideWidget(QWidget *parent)
     : QWidget(parent)
@@ -44,24 +44,24 @@ SideWidget::SideWidget(QWidget *parent)
 bool SideWidget::event(QEvent *event)
 {
     if (event->type() == QEvent::LayoutRequest)
-        emit sizeHintChanged();
+        Q_EMIT sizeHintChanged();
     return QWidget::event(event);
 }
 
 LineEdit::LineEdit(QWidget *parent)
     : QLineEdit(parent)
-    , m_leftLayout(0)
-    , m_rightLayout(0)
+    , m_leftLayout(nullptr)
+    , m_rightLayout(nullptr)
 {
     init();
 }
 
 LineEdit::LineEdit(const QString &contents, QWidget *parent)
     : QLineEdit(contents, parent)
-    , m_leftWidget(0)
-    , m_rightWidget(0)
-    , m_leftLayout(0)
-    , m_rightLayout(0)
+    , m_leftWidget(nullptr)
+    , m_rightWidget(nullptr)
+    , m_leftLayout(nullptr)
+    , m_rightLayout(nullptr)
 {
     init();
 }
diff --git a/src/utils/lineedit.h b/src/utils/lineedit.h
index c42a4d87..a2581da9 100644
--- a/src/utils/lineedit.h
+++ b/src/utils/lineedit.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008 - 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,7 +29,7 @@
 #ifndef LINEEDIT_H
 #define LINEEDIT_H
 
-#include <qlineedit.h>
+#include <QLineEdit>
 
 class QHBoxLayout;
 
@@ -47,7 +47,10 @@ class SideWidget;
 class LineEdit : public QLineEdit
 {
     Q_OBJECT
-    Q_PROPERTY(QString inactiveText READ inactiveText WRITE setInactiveText)
+    Q_PROPERTY(QString inactiveText READ inactiveText WRITE setInactiveText NOTIFY inactiveTextChanged)
+
+Q_SIGNALS:
+    void inactiveTextChanged();
 
 public:
     enum WidgetPosition {
@@ -55,8 +58,8 @@ class LineEdit : public QLineEdit
         RightSide
     };
 
-    LineEdit(QWidget *parent = 0);
-    LineEdit(const QString &contents, QWidget *parent = 0);
+    LineEdit(QWidget *parent = nullptr);
+    LineEdit(const QString &contents, QWidget *parent = nullptr);
 
     void addWidget(QWidget *widget, WidgetPosition position);
     void removeWidget(QWidget *widget);
@@ -72,7 +75,7 @@ class LineEdit : public QLineEdit
     void resizeEvent(QResizeEvent *event);
     bool event(QEvent *event);
 
-protected slots:
+protected Q_SLOTS:
     void updateTextMargins();
 
 private:
diff --git a/src/utils/lineedit_p.h b/src/utils/lineedit_p.h
index a03a5ba2..e5ed2fe5 100644
--- a/src/utils/lineedit_p.h
+++ b/src/utils/lineedit_p.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008 - 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,17 +29,17 @@
 #ifndef LINEEDIT_P_H
 #define LINEEDIT_P_H
 
-#include <qwidget.h>
+#include <QWidget>
 
 class SideWidget : public QWidget
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void sizeHintChanged();
 
 public:
-    SideWidget(QWidget *parent = 0);
+    SideWidget(QWidget *parent = nullptr);
 
 protected:
     bool event(QEvent *event);
diff --git a/src/utils/networkaccessmanagerproxy.cpp b/src/utils/networkaccessmanagerproxy.cpp
deleted file mode 100644
index d44caaa4..00000000
--- a/src/utils/networkaccessmanagerproxy.cpp
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "networkaccessmanagerproxy.h"
-#include "networkaccessmanagerproxy_p.h"
-
-#include "webpageproxy.h"
-
-#include <qnetworkcookie.h>
-#include <qnetworkrequest.h>
-
-NetworkAccessManagerProxy *NetworkAccessManagerProxy::m_primaryManager = 0;
-
-/*
-    NetworkAccessManagerProxy inserts a pointer to the QWebPage in the
-    QNetworkRequest before passing it on.
- */
-NetworkAccessManagerProxy::NetworkAccessManagerProxy(QObject *parent)
-    : QNetworkAccessManager(parent)
-    , m_webPage(0)
-{
-}
-
-void NetworkAccessManagerProxy::setWebPage(WebPageProxy *page)
-{
-    Q_ASSERT(page);
-    m_webPage = page;
-}
-
-void NetworkAccessManagerProxy::setPrimaryNetworkAccessManager(NetworkAccessManagerProxy *manager)
-{
-    Q_ASSERT(manager);
-    m_primaryManager = manager;
-    setCookieJar(new NetworkCookieJarProxy(this));
-
-    connect(this, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)),
-            m_primaryManager, SIGNAL(authenticationRequired(QNetworkReply*, QAuthenticator*)));
-    connect(this, SIGNAL(finished(QNetworkReply *)),
-            m_primaryManager, SIGNAL(finished(QNetworkReply *)));
-    connect(this, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)),
-            m_primaryManager, SIGNAL(proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)));
-#ifndef QT_NO_OPENSSL
-    connect(this, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)),
-            m_primaryManager, SIGNAL(sslErrors(QNetworkReply*, const QList<QSslError>&)));
-#endif
-}
-
-QNetworkReply *NetworkAccessManagerProxy::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData)
-{
-    if (m_primaryManager && m_webPage) {
-        QNetworkRequest pageRequest = request;
-        m_webPage->populateNetworkRequest(pageRequest);
-        return m_primaryManager->createRequest(op, pageRequest, outgoingData);
-    }
-    return QNetworkAccessManager::createRequest(op, request, outgoingData);
-}
-
diff --git a/src/utils/networkaccessmanagerproxy.h b/src/utils/networkaccessmanagerproxy.h
deleted file mode 100644
index 69afc0de..00000000
--- a/src/utils/networkaccessmanagerproxy.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef NETWORKACCESSMANAGERPROXY_H
-#define NETWORKACCESSMANAGERPROXY_H
-
-#include <QNetworkAccessManager>
-
-class WebPageProxy;
-class NetworkAccessManagerProxy : public QNetworkAccessManager
-{
-    Q_OBJECT
-
-public:
-    NetworkAccessManagerProxy(QObject *parent = 0);
-
-    void setPrimaryNetworkAccessManager(NetworkAccessManagerProxy *primaryManager);
-    NetworkAccessManagerProxy *primaryNetworkAccessManager() const { return m_primaryManager; }
-
-    void setWebPage(WebPageProxy *page);
-    WebPageProxy *webPage() const { return m_webPage; };
-
-protected:
-    QNetworkReply *createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData = 0);
-
-private:
-    friend class NetworkCookieJarProxy;
-    static NetworkAccessManagerProxy *m_primaryManager;
-    WebPageProxy *m_webPage;
-
-};
-
-#endif // NETWORKACCESSMANAGERPROXY_H
-
diff --git a/src/utils/networkaccessmanagerproxy_p.h b/src/utils/networkaccessmanagerproxy_p.h
deleted file mode 100644
index 8981bfb7..00000000
--- a/src/utils/networkaccessmanagerproxy_p.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef NETWORKACCESSMANAGERPROXY_P_H
-#define NETWORKACCESSMANAGERPROXY_P_H
-
-#include <QNetworkCookieJar>
-#include <QNetworkCookie>
-
-#include "networkaccessmanagerproxy.h"
-
-class NetworkCookieJarProxy : public QNetworkCookieJar
-{
-    Q_OBJECT
-
-public:
-    NetworkCookieJarProxy(QObject *parent = 0)
-        : QNetworkCookieJar(parent) { }
-
-    inline QList<QNetworkCookie> cookiesForUrl(const QUrl &url) const
-        { return NetworkAccessManagerProxy::m_primaryManager->cookieJar()->cookiesForUrl(url); }
-
-    inline bool setCookiesFromUrl(const QList<QNetworkCookie> &cookieList, const QUrl &url)
-        { return NetworkAccessManagerProxy::m_primaryManager->cookieJar()->setCookiesFromUrl(cookieList, url); }
-
-};
-
-#endif // NETWORKACCESSMANAGERPROXY_P_H
-
diff --git a/src/utils/singleapplication.cpp b/src/utils/singleapplication.cpp
index 4b98afee..ee3819d6 100644
--- a/src/utils/singleapplication.cpp
+++ b/src/utils/singleapplication.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008-2009, Aaron Dewes
+ * Copyright (c) 2020, Aaron Dewes
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -28,11 +28,11 @@
 
 #include "singleapplication.h"
 
-#include <qdir.h>
-#include <qlocalserver.h>
-#include <qlocalsocket.h>
-#include <qtextstream.h>
-#include <qfile.h>
+#include <QDir>
+#include <QLocalServer>
+#include <QLocalSocket>
+#include <QTextStream>
+#include <QFile>
 
 #ifndef Q_OS_WIN
 #include <unistd.h>
@@ -44,7 +44,7 @@
 
 SingleApplication::SingleApplication(int &argc, char **argv)
     : QApplication(argc, argv)
-    , m_localServer(0)
+    , m_localServer(nullptr)
 {
 }
 
@@ -70,7 +70,7 @@ bool SingleApplication::sendMessage(const QByteArray &message, int waitMsecsForR
     if (success) {
         socket.waitForReadyRead(waitMsecsForReply);
         if (socket.bytesAvailable() > 0)
-            emit messageReceived(&socket);
+            Q_EMIT messageReceived(&socket);
     }
     return success;
 }
@@ -88,7 +88,7 @@ bool SingleApplication::startSingleServer()
         if (QAbstractSocket::AddressInUseError == m_localServer->serverError()) {
             // cleanup from a segfaulted server
 #ifdef Q_OS_UNIX
-            QString fullServerName = QDir::tempPath() + QLatin1String("/") + serverName();
+            QString fullServerName = QDir::tempPath() + QStringLiteral("/") + serverName();
             if (QFile::exists(fullServerName))
                 QFile::remove(fullServerName);
 #endif
@@ -114,14 +114,14 @@ bool SingleApplication::startSingleServer()
 
     if (!success) {
         delete m_localServer;
-        m_localServer = 0;
+        m_localServer = nullptr;
     }
     return success;
 }
 
 bool SingleApplication::isRunning() const
 {
-    return (0 != m_localServer);
+    return (nullptr != m_localServer);
 }
 
 void SingleApplication::newConnection()
@@ -130,7 +130,7 @@ void SingleApplication::newConnection()
     if (!socket)
         return;
     socket->waitForReadyRead();
-    emit messageReceived(socket);
+    Q_EMIT messageReceived(socket);
     delete socket;
 }
 
@@ -139,10 +139,10 @@ QString SingleApplication::serverName() const
     QString serverName = QCoreApplication::applicationName();
     Q_ASSERT(!serverName.isEmpty());
 #ifdef Q_WS_QWS
-    serverName += QLatin1String("_qws");
+    serverName += QStringLiteral("_qws");
 #endif
 #ifndef Q_OS_WIN
-    serverName += QString(QLatin1String("_%1_%2")).arg(getuid()).arg(getgid());
+    serverName += QString(QStringLiteral("_%1_%2")).arg(getuid()).arg(getgid());
 #else
     static QString login;
     if (login.isEmpty()) {
diff --git a/src/utils/singleapplication.h b/src/utils/singleapplication.h
index 4d9048fd..a6f133f7 100644
--- a/src/utils/singleapplication.h
+++ b/src/utils/singleapplication.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2008-2009, Aaron Dewes
+ * Copyright (c) 2020, Aaron Dewes
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,7 +29,7 @@
 #ifndef SINGLEAPPLICATION_H
 #define SINGLEAPPLICATION_H
 
-#include <qapplication.h>
+#include <QApplication>
 
 /*
     QApplication subclass that should be used when you only want one
@@ -41,7 +41,7 @@ class SingleApplication : public QApplication
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void messageReceived(QLocalSocket *socket);
 
 public:
@@ -51,7 +51,7 @@ class SingleApplication : public QApplication
     bool startSingleServer();
     bool isRunning() const;
 
-private slots:
+private Q_SLOTS:
     void newConnection();
 
 private:
diff --git a/src/utils/squeezelabel.cpp b/src/utils/squeezelabel.cpp
index 196f8d85..32cc08d5 100644
--- a/src/utils/squeezelabel.cpp
+++ b/src/utils/squeezelabel.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/src/utils/squeezelabel.h b/src/utils/squeezelabel.h
index 3cac3d1f..2e76bcc4 100644
--- a/src/utils/squeezelabel.h
+++ b/src/utils/squeezelabel.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,7 +29,7 @@
 #ifndef SQUEEZELABEL_H
 #define SQUEEZELABEL_H
 
-#include <qlabel.h>
+#include <QLabel>
 
 /*
     A label that will squeeze the set text to fit within the size of the
@@ -40,7 +40,7 @@ class SqueezeLabel : public QLabel
     Q_OBJECT
 
 public:
-    SqueezeLabel(QWidget *parent = 0);
+    SqueezeLabel(QWidget *parent = nullptr);
 
 protected:
     void paintEvent(QPaintEvent *event);
diff --git a/src/utils/treesortfilterproxymodel.cpp b/src/utils/treesortfilterproxymodel.cpp
index 166a7c53..b5cf9dff 100644
--- a/src/utils/treesortfilterproxymodel.cpp
+++ b/src/utils/treesortfilterproxymodel.cpp
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
diff --git a/src/utils/treesortfilterproxymodel.h b/src/utils/treesortfilterproxymodel.h
index 859ab713..2a8b89b3 100644
--- a/src/utils/treesortfilterproxymodel.h
+++ b/src/utils/treesortfilterproxymodel.h
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -9,7 +9,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
+ * 3. Neither the name of Endorphin nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -29,14 +29,14 @@
 #ifndef TREESORTFILTERPROXYMODEL_H
 #define TREESORTFILTERPROXYMODEL_H
 
-#include <qsortfilterproxymodel.h>
+#include <QSortFilterProxyModel>
 
 class TreeSortFilterProxyModel : public QSortFilterProxyModel
 {
     Q_OBJECT
 
 public:
-    TreeSortFilterProxyModel(QObject *parent = 0);
+    TreeSortFilterProxyModel(QObject *parent = nullptr);
 
 protected:
     bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
diff --git a/src/utils/utils.pri b/src/utils/utils.pri
deleted file mode 100644
index d2e54f26..00000000
--- a/src/utils/utils.pri
+++ /dev/null
@@ -1,35 +0,0 @@
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-VPATH += $$PWD
-
-HEADERS += \
-    editlistview.h \
-    edittableview.h \
-    edittreeview.h \
-    languagemanager.h \
-    lineedit.h \
-    lineedit_p.h \
-    networkaccessmanagerproxy.h \
-    networkaccessmanagerproxy_p.h \
-    singleapplication.h \
-    squeezelabel.h \
-    treesortfilterproxymodel.h \
-    webpageproxy.h
-
-SOURCES += \
-    editlistview.cpp \
-    edittableview.cpp \
-    edittreeview.cpp \
-    languagemanager.cpp \
-    lineedit.cpp \
-    networkaccessmanagerproxy.cpp \
-    singleapplication.cpp \
-    squeezelabel.cpp \
-    treesortfilterproxymodel.cpp \
-    webpageproxy.cpp
-
-win32 {
-    HEADERS += explorerstyle.h
-    SOURCES += explorerstyle.cpp
-    LIBS += -lgdi32
-}
diff --git a/src/utils/webpageproxy.cpp b/src/utils/webpageproxy.cpp
deleted file mode 100644
index da8b1e64..00000000
--- a/src/utils/webpageproxy.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#include "webpageproxy.h"
-
-#include <qnetworkrequest.h>
-#include <qvariant.h>
-
-#define ATTRIBUTE_ID QNetworkRequest::User + 100
-
-WebPageProxy::WebPageProxy(QObject *parent)
-    : QWebPage(parent)
-{
-}
-
-int WebPageProxy::pageAttributeId()
-{
-    return ATTRIBUTE_ID;
-}
-
-void WebPageProxy::populateNetworkRequest(QNetworkRequest &request)
-{
-    QVariant variant = QVariant::fromValue((void *) this);
-    request.setAttribute((QNetworkRequest::Attribute)(pageAttributeId()), variant);
-}
-
diff --git a/src/utils/webpageproxy.h b/src/utils/webpageproxy.h
deleted file mode 100644
index c0e93a47..00000000
--- a/src/utils/webpageproxy.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * Copyright (c) 2009, Aaron Dewes  <aaron.dewes@web.de>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. Neither the name of the Aaron Dewes nor the names of its contributors
- *    may be used to endorse or promote products derived from this software
- *    without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef WEBPAGEPROXY_H
-#define WEBPAGEPROXY_H
-
-#include <qnetworkaccessmanager.h>
-#include <QtWebKit>
-#include <QtWebKitWidgets>
-
-class WebPageProxy : public QWebPage
-{
-    Q_OBJECT
-
-public:
-    WebPageProxy(QObject *parent = 0);
-    static int pageAttributeId();
-
-protected:
-    friend class NetworkAccessManagerProxy;
-    virtual void populateNetworkRequest(QNetworkRequest &request);
-};
-
-#endif // WEBPAGEPROXY_H
diff --git a/src/webactionmapper.cpp b/src/webactionmapper.cpp
index 8ea6da44..af58d88d 100644
--- a/src/webactionmapper.cpp
+++ b/src/webactionmapper.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -62,11 +62,11 @@
 
 #include "webactionmapper.h"
 
-#include <qaction.h>
+#include <QAction>
 
-WebActionMapper::WebActionMapper(QAction *root, QWebPage::WebAction webAction, QObject *parent)
+WebActionMapper::WebActionMapper(QAction *root, QWebEnginePage::WebAction webAction, QObject *parent)
     : QObject(parent)
-    , m_currentParent(0)
+    , m_currentParent(nullptr)
     , m_root(root)
     , m_webAction(webAction)
 {
@@ -79,12 +79,12 @@ WebActionMapper::WebActionMapper(QAction *root, QWebPage::WebAction webAction, Q
 
 void WebActionMapper::rootDestroyed()
 {
-    m_root = 0;
+    m_root = nullptr;
 }
 
 void WebActionMapper::currentDestroyed()
 {
-    updateCurrent(0);
+    updateCurrent(nullptr);
 }
 
 void WebActionMapper::addChild(QAction *action)
@@ -94,7 +94,7 @@ void WebActionMapper::addChild(QAction *action)
     connect(action, SIGNAL(changed()), this, SLOT(childChanged()));
 }
 
-QWebPage::WebAction WebActionMapper::webAction() const
+QWebEnginePage::WebAction WebActionMapper::webAction() const
 {
     return m_webAction;
 }
@@ -111,15 +111,15 @@ void WebActionMapper::childChanged()
 {
     if (QAction *source = qobject_cast<QAction*>(sender())) {
         if (m_root
-            && m_currentParent
-            && source->parent() == m_currentParent) {
+                && m_currentParent
+                && source->parent() == m_currentParent) {
             m_root->setChecked(source->isChecked());
             m_root->setEnabled(source->isEnabled());
         }
     }
 }
 
-void WebActionMapper::updateCurrent(QWebPage *currentParent)
+void WebActionMapper::updateCurrent(QWebEnginePage *currentParent)
 {
     if (m_currentParent)
         disconnect(m_currentParent, SIGNAL(destroyed(QObject *)),
diff --git a/src/webactionmapper.h b/src/webactionmapper.h
index 9d4b2ed7..bd5cb102 100644
--- a/src/webactionmapper.h
+++ b/src/webactionmapper.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -63,7 +63,7 @@
 #ifndef WEBACTIONMAPPER_H
 #define WEBACTIONMAPPER_H
 
-#include <QtWebKitWidgets>
+#include <QtWebEngineWidgets>
 
 QT_BEGIN_NAMESPACE
 class QAction;
@@ -81,21 +81,21 @@ class WebActionMapper : public QObject
     Q_OBJECT
 
 public:
-    WebActionMapper(QAction *root, QWebPage::WebAction webAction, QObject *parent);
-    QWebPage::WebAction webAction() const;
+    WebActionMapper(QAction *root, QWebEnginePage::WebAction webAction, QObject *parent);
+    QWebEnginePage::WebAction webAction() const;
     void addChild(QAction *action);
-    void updateCurrent(QWebPage *currentParent);
+    void updateCurrent(QWebEnginePage *currentParent);
 
-private slots:
+private Q_SLOTS:
     void rootTriggered();
     void childChanged();
     void rootDestroyed();
     void currentDestroyed();
 
 private:
-    QWebPage *m_currentParent;
+    QWebEnginePage *m_currentParent;
     QAction *m_root;
-    QWebPage::WebAction m_webAction;
+    QWebEnginePage::WebAction m_webAction;
 };
 
 #endif // WEBACTIONMAPPER_H
diff --git a/src/webpage.cpp b/src/webpage.cpp
index f9a9432b..344289b5 100644
--- a/src/webpage.cpp
+++ b/src/webpage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020-2021 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2009 Jakub Wieczorek <faw217@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -23,41 +23,32 @@
 #include "browserapplication.h"
 #include "downloadmanager.h"
 #include "historymanager.h"
-#include "networkaccessmanager.h"
 #include "opensearchengine.h"
 #include "opensearchmanager.h"
 #include "tabwidget.h"
 #include "toolbarsearch.h"
-#include "webpluginfactory.h"
 #include "webview.h"
 
-#include <qbuffer.h>
-#include <qdesktopservices.h>
-#include <qmessagebox.h>
-#include <qnetworkreply.h>
-#include <qnetworkrequest.h>
-#include <qsettings.h>
-#include <qwebframe.h>
-#include <QUiLoader>
+#include <QBuffer>
+#include <QDesktopServices>
+#include <QMessageBox>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QSettings>
 
-#include <qwebelement.h>
+#include <QWebEnginePage>
+#include <QWebChannel>
+#include <QPrintDialog>
+#include <QPrinter>
+#include <QFile>
+#include <QTextStream>
 
-WebPluginFactory *WebPage::s_webPluginFactory = 0;
 QString WebPage::s_userAgent;
 
-JavaScriptExternalObject::JavaScriptExternalObject(QObject *parent)
-    : QObject(parent)
-{
-}
-
-void JavaScriptExternalObject::AddSearchProvider(const QString &url)
-{
-    ToolbarSearch::openSearchManager()->addEngine(QUrl(url));
-}
-
 Q_DECLARE_METATYPE(OpenSearchEngine*)
-JavaScriptEndorphinObject::JavaScriptEndorphinObject(QObject *parent)
+JavaScriptEndorphinObject::JavaScriptEndorphinObject(QObject *parent, WebPage *page)
     : QObject(parent)
+    , m_page(page)
 {
     static const char *translations[] = {
         QT_TR_NOOP("Welcome to Endorphin!"),
@@ -72,6 +63,54 @@ JavaScriptEndorphinObject::JavaScriptEndorphinObject(QObject *parent)
     qRegisterMetaType<OpenSearchEngine*>("OpenSearchEngine*");
 }
 
+void JavaScriptEndorphinObject::addSearchProvider(const QString &url)
+{
+    ToolbarSearch::openSearchManager()->addEngine(QUrl(url));
+}
+
+QString JavaScriptEndorphinObject::getSetting(const QString &name, const QString &group)
+{
+    if (m_page->url().toString() != "qrc:/settings.html")
+        return nullptr;
+    QSettings settings;
+    settings.beginGroup(group);
+    return settings.value(name).toString();
+    settings.endGroup();
+}
+
+int JavaScriptEndorphinObject::setSetting(const QString &name, const QString &group, const QString &value)
+{
+    if (m_page->url().toString() != "qrc:/settings.html")
+        return 1;
+    QSettings settings;
+    settings.beginGroup(group);
+    settings.setValue(name, value);
+    settings.endGroup();
+    return 0;
+}
+
+int JavaScriptEndorphinObject::setSetting(const QString &name, const QString &group, const int &value)
+{
+    if (m_page->url().toString() != "qrc:/settings.html")
+        return 1;
+    QSettings settings;
+    settings.beginGroup(group);
+    settings.setValue(name, value);
+    settings.endGroup();
+    return 0;
+}
+
+int JavaScriptEndorphinObject::setSetting(const QString &name, const QString &group, const bool value)
+{
+    if (m_page->url().toString() != "qrc:/settings.html")
+        return 1;
+    QSettings settings;
+    settings.beginGroup(group);
+    settings.setValue(name, value);
+    settings.endGroup();
+    return 0;
+}
+
 QString JavaScriptEndorphinObject::translate(const QString &string)
 {
     QString translatedString = tr(string.toUtf8().constData());
@@ -95,72 +134,33 @@ QString JavaScriptEndorphinObject::searchUrl(const QString &string) const
     return QString::fromUtf8(ToolbarSearch::openSearchManager()->currentEngine()->searchUrl(string).toEncoded());
 }
 
-
-
-QString JavaScriptEndorphinObject::getSetting(const QString &string)
-{
-    QSettings settings;
-    return settings.value(string).toString();
-}
-
-int JavaScriptEndorphinObject::setSetting(const QString &string, const QString &value)
-{
-    QSettings settings;
-    settings.setValue(string, value);
-    return 0;
-}
-
-int JavaScriptEndorphinObject::setSetting(const QString &string, const int &value)
-{
-    QSettings settings;
-    settings.setValue(string, value);
-    return 0;
-}
-
-WebPage::WebPage(QObject *parent)
-    : WebPageProxy(parent)
+WebPage::WebPage(QWebEngineProfile *profile, QObject *parent)
+    : QWebEnginePage(profile, parent)
     , m_openTargetBlankLinksIn(TabWidget::NewWindow)
-    , m_javaScriptExternalObject(0)
-    , m_javaScriptEndorphinObject(0)
 {
-    setPluginFactory(webPluginFactory());
-    NetworkAccessManagerProxy *networkManagerProxy = new NetworkAccessManagerProxy(this);
-    networkManagerProxy->setWebPage(this);
-    networkManagerProxy->setPrimaryNetworkAccessManager(BrowserApplication::networkAccessManager());
-    setNetworkAccessManager(networkManagerProxy);
-    connect(this, SIGNAL(unsupportedContent(QNetworkReply *)),
-            this, SLOT(handleUnsupportedContent(QNetworkReply *)));
-    connect(this, SIGNAL(frameCreated(QWebFrame *)),
-            this, SLOT(addExternalBinding(QWebFrame *)));
-    addExternalBinding(mainFrame());
+    QWebChannel *channel = new QWebChannel(this);
+    channel->registerObject("endorphin", new JavaScriptEndorphinObject(this, this));
+    setWebChannel(channel);
     loadSettings();
 }
 
 WebPage::~WebPage()
 {
-    setNetworkAccessManager(0);
-}
-
-WebPluginFactory *WebPage::webPluginFactory()
-{
-    if (!s_webPluginFactory)
-        s_webPluginFactory = new WebPluginFactory(BrowserApplication::instance());
-    return s_webPluginFactory;
 }
-
+/*
 QList<WebPageLinkedResource> WebPage::linkedResources(const QString &relation)
 {
     QList<WebPageLinkedResource> resources;
 
     QUrl baseUrl = mainFrame()->baseUrl();
 
-    QWebElementCollection linkElements = mainFrame()->findAllElements(QLatin1String("html > head > link"));
+    QWebElementCollection linkElements = mainFrame()->findAllElements(QStringLiteral("html > head > link"));
 
-    foreach (const QWebElement &linkElement, linkElements) {
-        QString rel = linkElement.attribute(QLatin1String("rel"));
-        QString href = linkElement.attribute(QLatin1String("href"));
-        QString type = linkElement.attribute(QLatin1String("type"));
-        QString title = linkElement.attribute(QLatin1String("title"));
+    Q_FOREACH (const QWebElement &linkElement, linkElements) {
+        QString rel = linkElement.attribute(QStringLiteral("rel"));
+        QString href = linkElement.attribute(QStringLiteral("href"));
+        QString type = linkElement.attribute(QStringLiteral("type"));
+        QString title = linkElement.attribute(QStringLiteral("title"));
 
         if (href.isEmpty() || type.isEmpty())
             continue;
@@ -178,37 +178,7 @@ QList<WebPageLinkedResource> WebPage::linkedResources(const QString &relation)
 
     return resources;
 }
-
-void WebPage::populateNetworkRequest(QNetworkRequest &request)
-{
-    if (request == lastRequest) {
-        request.setAttribute((QNetworkRequest::Attribute)(pageAttributeId() + 1), lastRequestType);
-    }
-    WebPageProxy::populateNetworkRequest(request);
-}
-
-void WebPage::addExternalBinding(QWebFrame *frame)
-{
-    if (!m_javaScriptExternalObject)
-        m_javaScriptExternalObject = new JavaScriptExternalObject(this);
-
-    if (frame == 0) { // called from QWebFrame::javaScriptWindowObjectCleared
-        frame = qobject_cast<QWebFrame*>(sender());
-
-        if (frame->url().scheme() == QLatin1String("qrc")) {
-
-            if (!m_javaScriptEndorphinObject)
-                m_javaScriptEndorphinObject = new JavaScriptEndorphinObject(this);
-
-            frame->addToJavaScriptWindowObject(QLatin1String("endorphin"), m_javaScriptEndorphinObject);
-        }
-    } else { // called from QWebPage::frameCreated
-        connect(frame, SIGNAL(javaScriptWindowObjectCleared()),
-                this, SLOT(addExternalBinding()));
-    }
-    frame->addToJavaScriptWindowObject(QLatin1String("external"), m_javaScriptExternalObject);
-}
-
+*/
 QString WebPage::userAgent()
 {
     return s_userAgent;
@@ -221,9 +191,9 @@ void WebPage::setUserAgent(const QString &userAgent)
 
     QSettings settings;
     if (userAgent.isEmpty()) {
-        settings.remove(QLatin1String("userAgent"));
+        settings.remove(QStringLiteral("userAgent"));
     } else {
-        settings.setValue(QLatin1String("userAgent"), userAgent);
+        settings.setValue(QStringLiteral("userAgent"), userAgent);
     }
 
     s_userAgent = userAgent;
@@ -231,59 +201,65 @@ void WebPage::setUserAgent(const QString &userAgent)
 
 QString WebPage::userAgentForUrl(const QUrl &url) const
 {
+
     if (s_userAgent.isEmpty())
-        s_userAgent = QWebPage::userAgentForUrl(url);
+        //s_userAgent = QWebEnginePage::userAgentForUrl(url);
+        s_userAgent = "";
     return s_userAgent;
 }
 
+/*
 bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request,
                                       NavigationType type)
+*/
+bool WebPage::acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame)
 {
-    lastRequest = request;
-    lastRequestType = type;
-
-    QString scheme = request.url().scheme();
-    if (scheme == QLatin1String("mailto")
-        || scheme == QLatin1String("ftp")) {
-        BrowserApplication::instance()->askDesktopToOpenUrl(request.url());
+    /*
+        lastRequest = request;
+        lastRequestType = type;
+    */
+    QString scheme = url.scheme();
+    if (scheme == QStringLiteral("mailto")
+            || scheme == QStringLiteral("ftp")) {
+        BrowserApplication::instance()->askDesktopToOpenUrl(url);
         return false;
     }
-
-    if (type == QWebPage::NavigationTypeFormResubmitted) {
-        QMessageBox::StandardButton button = QMessageBox::warning(view(), tr("Resending POST request"),
-                             tr("In order to display the site, the request along with all the data must be sent once again, "
-                                "which may lead to some unexpected behaviour of the site e.g. the same action might be "
-                                "performed once again. Do you want to continue anyway?"), QMessageBox::Yes | QMessageBox::No);
-        if (button != QMessageBox::Yes)
-            return false;
-    }
-
-    TabWidget::OpenUrlIn openIn = frame ? TabWidget::CurrentTab : TabWidget::NewWindow;
+    /*
+        if (type == QWebEnginePage::NavigationTypeFormResubmitted) {
+            QMessageBox::StandardButton button = QMessageBox::warning(view(), tr("Resending POST request"),
+                                 tr("In order to display the site, the request along with all the data must be sent once again, "
+                                    "which may lead to some unexpected behaviour of the site e.g. the same action might be "
+                                    "performed once again. Do you want to continue anyway?"), QMessageBox::Yes | QMessageBox::No);
+            if (button != QMessageBox::Yes)
+                return false;
+        }
+    */
+    TabWidget::OpenUrlIn openIn =  isMainFrame ? TabWidget::CurrentTab : TabWidget::NewWindow;
     openIn = TabWidget::modifyWithUserBehavior(openIn);
 
     // handle the case where we want to do something different then
-    // what qwebpage would do
+    // what QWebEnginePage would do
     if (openIn == TabWidget::NewSelectedTab
-        || openIn == TabWidget::NewNotSelectedTab
-        || (frame && openIn == TabWidget::NewWindow)) {
+            || openIn == TabWidget::NewNotSelectedTab
+            || (openIn == TabWidget::NewWindow)) {
         if (WebView *webView = qobject_cast<WebView*>(view())) {
             TabWidget *tabWidget = webView->tabWidget();
             if (tabWidget) {
                 WebView *newView = tabWidget->getView(openIn, webView);
-                QWebPage *page = 0;
+                QWebEnginePage *page = nullptr;
                 if (newView)
                     page = newView->page();
-                if (page && page->mainFrame())
-                    page->mainFrame()->load(request);
+                if (page)
+                    page->load(url);
             }
         }
         return false;
     }
 
-    bool accepted = QWebPage::acceptNavigationRequest(frame, request, type);
-    if (accepted && frame == mainFrame()) {
-        m_requestedUrl = request.url();
-        emit aboutToLoadUrl(request.url());
+    bool accepted = QWebEnginePage::acceptNavigationRequest(url, type, isMainFrame);
+    if (accepted &&  isMainFrame) {
+        m_requestedUrl = url;
+        Q_EMIT aboutToLoadUrl(url);
     }
 
     return accepted;
@@ -292,14 +268,14 @@ bool WebPage::acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &r
 void WebPage::loadSettings()
 {
     QSettings settings;
-    settings.beginGroup(QLatin1String("tabs"));
-    m_openTargetBlankLinksIn = (TabWidget::OpenUrlIn)settings.value(QLatin1String("openTargetBlankLinksIn"),
-                                                                    TabWidget::NewSelectedTab).toInt();
+    settings.beginGroup(QStringLiteral("tabs"));
+    m_openTargetBlankLinksIn = (TabWidget::OpenUrlIn)settings.value(QStringLiteral("openTargetBlankLinksIn"),
+                               TabWidget::NewSelectedTab).toInt();
     settings.endGroup();
-    s_userAgent = settings.value(QLatin1String("userAgent")).toString();
+    s_userAgent = settings.value(QStringLiteral("userAgent")).toString();
 }
 
-QWebPage *WebPage::createWindow(QWebPage::WebWindowType type)
+QWebEnginePage *WebPage::createWindow(QWebEnginePage::WebWindowType type)
 {
     Q_UNUSED(type);
     if (WebView *webView = qobject_cast<WebView*>(view())) {
@@ -310,123 +286,5 @@ QWebPage *WebPage::createWindow(QWebPage::WebWindowType type)
             return tabWidget->getView(openIn, webView)->page();
         }
     }
-    return 0;
-}
-
-QObject *WebPage::createPlugin(const QString &classId, const QUrl &url,
-                               const QStringList &paramNames, const QStringList &paramValues)
-{
-    Q_UNUSED(classId);
-    Q_UNUSED(url);
-    Q_UNUSED(paramNames);
-    Q_UNUSED(paramValues);
-#if !defined(QT_NO_UITOOLS)
-    QUiLoader loader;
-    return loader.createWidget(classId, view());
-#else
-    return 0;
-#endif
-}
-
-// The chromium guys have documented many examples of incompatibilities that
-// different browsers have when they mime sniff.
-// http://src.chromium.org/viewvc/chrome/trunk/src/net/base/mime_sniffer.cc
-//
-// All WebKit ports should share a common set of rules to sniff content.
-// By having this here we are yet another browser that has different behavior :(
-// But sadly QtWebKit does no sniffing at all so we are forced to do something.
-static bool contentSniff(const QByteArray &data)
-{
-    if (data.contains("<!doctype")
-        || data.contains("<script")
-        || data.contains("<html")
-        || data.contains("<!--")
-        || data.contains("<head")
-        || data.contains("<iframe")
-        || data.contains("<h1")
-        || data.contains("<div")
-        || data.contains("<font")
-        || data.contains("<table")
-        || data.contains("<a")
-        || data.contains("<style")
-        || data.contains("<title")
-        || data.contains("<b")
-        || data.contains("<body")
-        || data.contains("<br")
-        || data.contains("<p"))
-        return true;
-    return false;
-}
-
-void WebPage::handleUnsupportedContent(QNetworkReply *reply)
-{
-    if (!reply)
-        return;
-
-    QUrl replyUrl = reply->url();
-
-    if (replyUrl.scheme() == QLatin1String("abp"))
-        return;
-
-    switch (reply->error()) {
-    case QNetworkReply::NoError:
-        if (reply->header(QNetworkRequest::ContentTypeHeader).isValid()) {
-            BrowserApplication::downloadManager()->handleUnsupportedContent(reply);
-            return;
-        }
-        break;
-    case QNetworkReply::ProtocolUnknownError: {
-        QSettings settings;
-        settings.beginGroup(QLatin1String("WebView"));
-        QStringList externalSchemes = settings.value(QLatin1String("externalSchemes")).toStringList();
-        if (externalSchemes.contains(replyUrl.scheme())) {
-            QDesktopServices::openUrl(replyUrl);
-            return;
-        }
-        break;
-    }
-    default:
-        break;
-    }
-
-    // Find the frame that has the unsupported content
-    if (replyUrl.isEmpty() || replyUrl != m_requestedUrl)
-        return;
-
-    QWebFrame *notFoundFrame = mainFrame();
-    if (!notFoundFrame)
-        return;
-
-    if (reply->header(QNetworkRequest::ContentTypeHeader).toString().isEmpty()) {
-        // do evil
-        QByteArray data = reply->readAll();
-        if (contentSniff(data)) {
-            notFoundFrame->setHtml(QLatin1String(data), replyUrl);
-            return;
-        }
-    }
-
-    // Generate translated not found error page with an image
-    QFile notFoundErrorFile(QLatin1String(":/notfound.html"));
-    if (!notFoundErrorFile.open(QIODevice::ReadOnly))
-        return;
-    QString title = tr("Error loading page: %1").arg(QString::fromUtf8(replyUrl.toEncoded()));
-    QString html = QLatin1String(notFoundErrorFile.readAll());
-    QPixmap pixmap = qApp->style()->standardIcon(QStyle::SP_MessageBoxWarning, 0, view()).pixmap(QSize(32, 32));
-    QBuffer imageBuffer;
-    imageBuffer.open(QBuffer::ReadWrite);
-    if (pixmap.save(&imageBuffer, "PNG")) {
-        html.replace(QLatin1String("IMAGE_BINARY_DATA_HERE"),
-                     QLatin1String(imageBuffer.buffer().toBase64()));
-    }
-    html = html.arg(title,
-                    reply->errorString(),
-                    tr("When connecting to: %1.").arg(QString::fromUtf8(replyUrl.toEncoded())),
-                    tr("Check the address for errors such as <b>ww</b>.example.com instead of <b>www</b>.example.com"),
-                    tr("If the address is correct, try checking the network connection."),
-                    tr("If your computer or network is protected by a firewall or proxy, make sure that the browser is permitted to access the network."));
-    notFoundFrame->setHtml(html, replyUrl);
-    // Don't put error pages to the history.
-    BrowserApplication::instance()->historyManager()->removeHistoryEntry(replyUrl, notFoundFrame->title());
+    return nullptr;
 }
-
diff --git a/src/webpage.h b/src/webpage.h
index 439fe061..3cbc4e66 100644
--- a/src/webpage.h
+++ b/src/webpage.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020-2021 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -20,97 +20,86 @@
 #ifndef WEBPAGE_H
 #define WEBPAGE_H
 
-#include "webpageproxy.h"
 #include "tabwidget.h"
 
-#include <qlist.h>
-#include <qnetworkrequest.h>
-
-class WebPageLinkedResource
-{
-public:
-    QString rel;
-    QString type;
-    QUrl href;
-    QString title;
-};
-
-class OpenSearchEngine;
-class QNetworkReply;
-class WebPluginFactory;
-// See https://developer.mozilla.org/en/adding_search_engines_from_web_pages
-class JavaScriptExternalObject : public QObject
-{
-    Q_OBJECT
-
-public:
-    JavaScriptExternalObject(QObject *parent = 0);
-
-public slots:
-    void AddSearchProvider(const QString &url);
-};
+#include <QList>
+#include <QNetworkRequest>
+#include <QWebEnginePage>
 
+class WebPage;
 class JavaScriptEndorphinObject : public QObject
 {
     Q_OBJECT
 
-    Q_PROPERTY(QObject *currentEngine READ currentEngine)
+    Q_PROPERTY(QObject *currentEngine READ currentEngine NOTIFY currentEngineChanged)
+
+Q_SIGNALS:
+    void currentEngineChanged();
 
 public:
-    JavaScriptEndorphinObject(QObject *parent = 0);
+    JavaScriptEndorphinObject(QObject *parent = nullptr, WebPage *page = nullptr);
 
-public slots:
+public Q_SLOTS:
     QString translate(const QString &string);
     QObject *currentEngine() const;
     QString searchUrl(const QString &string) const;
-    QString getSetting(const QString &string);
-    int setSetting(const QString &string, const int &value);
-    int setSetting(const QString &string, const QString &value);
+    void addSearchProvider(const QString &url);
+    QString getSetting(const QString &name, const QString &group);
+    int setSetting(const QString &name, const QString &group, const int &value);
+    int setSetting(const QString &name, const QString &group, const QString &value);
+    int setSetting(const QString &name, const QString &group, const bool value);
+
+private:
+    WebPage *m_page;
+};
 
+class WebPageLinkedResource
+{
+public:
+    QString rel;
+    QString type;
+    QUrl href;
+    QString title;
 };
 
-class WebPage : public WebPageProxy
+class OpenSearchEngine;
+class QNetworkReply;
+
+class WebPage : public QWebEnginePage
 {
     Q_OBJECT
 
-signals:
+Q_SIGNALS:
     void aboutToLoadUrl(const QUrl &url);
 
 public:
-    WebPage(QObject *parent = 0);
+    WebPage(QWebEngineProfile *profile, QObject *parent = 0);
     ~WebPage();
 
     void loadSettings();
 
-    static WebPluginFactory *webPluginFactory();
-    QList<WebPageLinkedResource> linkedResources(const QString &relation = QString());
+//    QList<WebPageLinkedResource> linkedResources(const QString &relation = QString());
 
     static QString userAgent();
     static void setUserAgent(const QString &userAgent);
 
 protected:
     QString userAgentForUrl(const QUrl &url) const;
-    bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request,
-                                 NavigationType type);
-    QObject *createPlugin(const QString &classId, const QUrl &url, const QStringList &paramNames, const QStringList &paramValues);
-    QWebPage *createWindow(QWebPage::WebWindowType type);
-
-protected slots:
-    void handleUnsupportedContent(QNetworkReply *reply);
-    void addExternalBinding(QWebFrame *frame = 0);
+    /*
+        bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request,
+                                     NavigationType type);
+    */
+    bool acceptNavigationRequest(const QUrl &url, QWebEnginePage::NavigationType type, bool isMainFrame);
+    QWebEnginePage *createWindow(QWebEnginePage::WebWindowType type);
 
 protected:
-    void populateNetworkRequest(QNetworkRequest &request);
     static QString s_userAgent;
-    static WebPluginFactory *s_webPluginFactory;
     TabWidget::OpenUrlIn m_openTargetBlankLinksIn;
     QUrl m_requestedUrl;
-    JavaScriptExternalObject *m_javaScriptExternalObject;
-    JavaScriptEndorphinObject *m_javaScriptEndorphinObject;
 
 private:
     QNetworkRequest lastRequest;
-    QWebPage::NavigationType lastRequestType;
+    QWebEnginePage::NavigationType lastRequestType;
 
 };
 
diff --git a/src/webview.cpp b/src/webview.cpp
index 605ff533..dc3e94c5 100644
--- a/src/webview.cpp
+++ b/src/webview.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2008 Jason A. Donenfeld <Jason@zx2c4.com>
  * Copyright 2008 Ariya Hidayat <ariya.hidayat@gmail.com>
  *
@@ -62,86 +62,140 @@
 **
 ****************************************************************************/
 
+/****************************************************************************
+**
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:BSD$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
+**
+** BSD License Usage
+** Alternatively, you may use this file under the terms of the BSD license
+** as follows:
+**
+** "Redistribution and use in source and binary forms, with or without
+** modification, are permitted provided that the following conditions are
+** met:
+**   * Redistributions of source code must retain the above copyright
+**     notice, this list of conditions and the following disclaimer.
+**   * Redistributions in binary form must reproduce the above copyright
+**     notice, this list of conditions and the following disclaimer in
+**     the documentation and/or other materials provided with the
+**     distribution.
+**   * Neither the name of The Qt Company Ltd nor the names of its
+**     contributors may be used to endorse or promote products derived
+**     from this software without specific prior written permission.
+**
+**
+** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
 #include "webview.h"
 
-#include "adblockdialog.h"
-#include "adblockmanager.h"
-#include "adblockpage.h"
-#include "autofillmanager.h"
 #include "addbookmarkdialog.h"
 #include "bookmarksmanager.h"
 #include "browserapplication.h"
 #include "browsermainwindow.h"
 #include "downloadmanager.h"
+#include "locationbar.h"
 #include "opensearchengine.h"
 #include "opensearchengineaction.h"
 #include "opensearchmanager.h"
 #include "toolbarsearch.h"
 #include "webpage.h"
+#include "permissionbar.h"
 
-#include <qclipboard.h>
-#include <qdebug.h>
-#include <qevent.h>
-#include <qmenubar.h>
-#include <qtimer.h>
-#include <qwebframe.h>
+#include <QClipboard>
+#include <QDebug>
+#include <QEvent>
+#include <QMenuBar>
+#include <QTimer>
 
-#include <qinputdialog.h>
-#include <qlabel.h>
-#include <qmessagebox.h>
-#include <qsettings.h>
-#include <qtooltip.h>
-#include <qwebelement.h>
+#include <QInputDialog>
+#include <QLabel>
+#include <QMessageBox>
+#include <QSettings>
+#include <QToolTip>
 
 #include <QMimeData>
 #include <QUrlQuery>
 
-#include <qdebug.h>
+#include <QDebug>
 
-WebView::WebView(QWidget *parent)
-    : QWebView(parent)
+#include <QWebEngineContextMenuData>
+#include <QWebEngineCertificateError>
+
+WebView::WebView(QWidget* parent)
+    : QWebEngineView(parent)
     , m_progress(0)
-    , m_currentZoom(100)
-    , m_page(new WebPage(this))
-    , m_enableAccessKeys(true)
-    , m_accessKeysPressed(false)
-{
-    setPage(m_page);
-    QPalette p;
-    connect(page(), SIGNAL(statusBarMessage(const QString&)),
-            SLOT(setStatusBarText(const QString&)));
+    , m_page(0)
+{
     connect(this, SIGNAL(loadProgress(int)),
             this, SLOT(setProgress(int)));
     connect(this, SIGNAL(loadFinished(bool)),
-            this, SLOT(loadFinished()));
-    connect(page(), SIGNAL(aboutToLoadUrl(const QUrl &)),
-            this, SIGNAL(urlChanged(const QUrl &)));
-    connect(page(), SIGNAL(downloadRequested(const QNetworkRequest &)),
-            this, SLOT(downloadRequested(const QNetworkRequest &)));
-    connect(BrowserApplication::instance(), SIGNAL(zoomTextOnlyChanged(bool)),
-            this, SLOT(applyZoom()));
-    page()->setForwardUnsupportedContent(true);
-    setAcceptDrops(true);
-
-    // the zoom values (in percent) are chosen to be like in Mozilla Firefox 3
-    m_zoomLevels << 30 << 50 << 67 << 80 << 90;
-    m_zoomLevels << 100;
-    m_zoomLevels << 110 << 120 << 133 << 150 << 170 << 200 << 240 << 300;
-    connect(m_page, SIGNAL(loadStarted()),
-            this, SLOT(hideAccessKeys()));
-    connect(m_page, SIGNAL(scrollRequested(int, int, const QRect &)),
-            this, SLOT(hideAccessKeys()));
-    loadSettings();
+            this, SLOT(loadFinished(bool)));
+    connect(this, &QWebEngineView::renderProcessTerminated,
+    [=](QWebEnginePage::RenderProcessTerminationStatus termStatus, int statusCode) {
+        const char *status = "";
+        switch (termStatus) {
+        case QWebEnginePage::NormalTerminationStatus:
+            status = "(normal exit)";
+            break;
+        case QWebEnginePage::AbnormalTerminationStatus:
+            status = "(abnormal exit)";
+            break;
+        case QWebEnginePage::CrashedTerminationStatus:
+            status = "(crashed)";
+            break;
+        case QWebEnginePage::KilledTerminationStatus:
+            status = "(killed)";
+            break;
+        }
+
+        qInfo() << "Render process exited with code" << statusCode << status;
+        QTimer::singleShot(0, [this] { reload(); });
+    });
+}
+
+void WebView::setPage(WebPage *_page)
+{
+    m_page = _page;
+    QWebEngineView::setPage(_page);
+    connect(page(), &WebPage::featurePermissionRequested, this, &WebView::onFeaturePermissionRequested);
 }
 
 void WebView::loadSettings()
 {
+    /*
     QSettings settings;
-    settings.beginGroup(QLatin1String("WebView"));
-    m_enableAccessKeys = settings.value(QLatin1String("enableAccessKeys"), m_enableAccessKeys).toBool();
+    settings.beginGroup(QStringLiteral("WebView"));
+    m_enableAccessKeys = settings.value(QStringLiteral("enableAccessKeys"), m_enableAccessKeys).toBool();
 
     if (!m_enableAccessKeys)
         hideAccessKeys();
+    */
     m_page->loadSettings();
 }
 
@@ -153,47 +207,43 @@ TabWidget *WebView::tabWidget() const
             return tw;
         widget = widget->parent();
     }
-    return 0;
+    return nullptr;
 }
 
 void WebView::contextMenuEvent(QContextMenuEvent *event)
 {
     QMenu *menu = new QMenu(this);
 
-    QWebHitTestResult r = page()->mainFrame()->hitTestContent(event->pos());
-
-    if (!r.linkUrl().isEmpty()) {
+    if (!page()->contextMenuData().linkUrl().isEmpty()) {
         QAction *newWindowAction = menu->addAction(tr("Open in New &Window"), this, SLOT(openActionUrlInNewWindow()));
-        newWindowAction->setData(r.linkUrl());
+        newWindowAction->setData(page()->contextMenuData().linkUrl());
         QAction *newTabAction = menu->addAction(tr("Open in New &Tab"), this, SLOT(openActionUrlInNewTab()));
-        newTabAction->setData(r.linkUrl());
+        newTabAction->setData(page()->contextMenuData().linkUrl());
         menu->addSeparator();
         menu->addAction(tr("Save Lin&k"), this, SLOT(downloadLinkToDisk()));
-        menu->addAction(tr("&Bookmark This Link"), this, SLOT(bookmarkLink()))->setData(r.linkUrl());
+        menu->addAction(tr("&Bookmark This Link"), this, SLOT(bookmarkLink()))->setData(page()->contextMenuData().linkUrl());
         menu->addSeparator();
         if (!page()->selectedText().isEmpty())
-            menu->addAction(pageAction(QWebPage::Copy));
+            menu->addAction(pageAction(QWebEnginePage::Copy));
         menu->addAction(tr("&Copy Link Location"), this, SLOT(copyLinkToClipboard()));
     }
 
-    if (!r.imageUrl().isEmpty()) {
+    if (page()->contextMenuData().mediaType() == QWebEngineContextMenuData::MediaTypeImage) {
         if (!menu->isEmpty())
             menu->addSeparator();
         QAction *newWindowAction = menu->addAction(tr("Open Image in New &Window"), this, SLOT(openActionUrlInNewWindow()));
-        newWindowAction->setData(r.imageUrl());
+        newWindowAction->setData(page()->contextMenuData().mediaUrl());
         QAction *newTabAction = menu->addAction(tr("Open Image in New &Tab"), this, SLOT(openActionUrlInNewTab()));
-        newTabAction->setData(r.imageUrl());
+        newTabAction->setData(page()->contextMenuData().mediaUrl());
         menu->addSeparator();
         menu->addAction(tr("&Save Image"), this, SLOT(downloadImageToDisk()));
         menu->addAction(tr("&Copy Image"), this, SLOT(copyImageToClipboard()));
-        menu->addAction(tr("C&opy Image Location"), this, SLOT(copyImageLocationToClipboard()))->setData(r.imageUrl().toString());
-        menu->addSeparator();
-        menu->addAction(tr("Block Image"), this, SLOT(blockImage()))->setData(r.imageUrl().toString());
+        menu->addAction(tr("C&opy Image Location"), this, SLOT(copyImageLocationToClipboard()))->setData(page()->contextMenuData().mediaUrl().toString());
     }
 
     if (!page()->selectedText().isEmpty()) {
         if (menu->isEmpty()) {
-            menu->addAction(pageAction(QWebPage::Copy));
+            menu->addAction(pageAction(QWebEnginePage::Copy));
         } else {
             menu->addSeparator();
         }
@@ -210,30 +260,34 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
 
         connect(searchMenu, SIGNAL(triggered(QAction *)), this, SLOT(searchRequested(QAction *)));
     }
+    /*
+        QWebElement element = r.element();
+        if (!element.isNull()
+            && element.tagName().toLower() == QStringLiteral("input")
+            && element.attribute(QStringLiteral("type"), QStringLiteral("text")) == QStringLiteral("text")) {
+            if (menu->isEmpty()) {
+                menu->addAction(pageAction(QWebEnginePage::Copy));
+            } else {
+                menu->addSeparator();
+            }
 
-    QWebElement element = r.element();
-    if (!element.isNull()
-        && element.tagName().toLower() == QLatin1String("input")
-        && element.attribute(QLatin1String("type"), QLatin1String("text")) == QLatin1String("text")) {
-        if (menu->isEmpty()) {
-            menu->addAction(pageAction(QWebPage::Copy));
-        } else {
-            menu->addSeparator();
+            QVariant variant;
+            variant.setValue(element);
+            menu->addAction(tr("Add to the toolbar search"), this, SLOT(addSearchEngine()))->setData(variant);
         }
-
-        QVariant variant;
-        variant.setValue(element);
-        menu->addAction(tr("Add to the toolbar search"), this, SLOT(addSearchEngine()))->setData(variant);
-    }
-
+    */
     if (menu->isEmpty()) {
         delete menu;
         menu = page()->createStandardContextMenu();
-    } else {
-        if (page()->settings()->testAttribute(QWebSettings::DeveloperExtrasEnabled))
-            menu->addAction(pageAction(QWebPage::InspectElement));
     }
 
+    QAction *action = new QAction(menu);
+    action->setText("Inspect Element");
+    connect(action, &QAction::triggered, [this]() {
+        Q_EMIT devToolsRequested(page());
+    });
+    menu->addAction(action);
+
     if (!menu->isEmpty()) {
         if (BrowserMainWindow::parentWindow(tabWidget())->menuBar()->isHidden()) {
             menu->addSeparator();
@@ -246,75 +300,73 @@ void WebView::contextMenuEvent(QContextMenuEvent *event)
     }
     delete menu;
 
-    QWebView::contextMenuEvent(event);
+    QWebEngineView::contextMenuEvent(event);
 }
 
 void WebView::wheelEvent(QWheelEvent *event)
 {
     if (event->modifiers() & Qt::ControlModifier) {
-        int numDegrees = event->delta() / 8;
+        int numDegrees = event->angleDelta().y() / 8;
         int numSteps = numDegrees / 15;
         m_currentZoom = m_currentZoom + numSteps * 10;
         applyZoom();
         event->accept();
         return;
     }
-    QWebView::wheelEvent(event);
+    QWebEngineView::wheelEvent(event);
 }
 
 void WebView::resizeEvent(QResizeEvent *event)
 {
-    int offset = event->size().height() - event->oldSize().height();
-    int currentValue = page()->mainFrame()->scrollBarValue(Qt::Vertical);
-    setUpdatesEnabled(false);
-    page()->mainFrame()->setScrollBarValue(Qt::Vertical, currentValue - offset);
-    setUpdatesEnabled(true);
-    QWebView::resizeEvent(event);
+    /*
+        int offset = event->size().height() - event->oldSize().height();
+        int currentValue = page()->mainFrame()->scrollBarValue(Qt::Vertical);
+        setUpdatesEnabled(false);
+        page()->mainFrame()->setScrollBarValue(Qt::Vertical, currentValue - offset);
+        setUpdatesEnabled(true);
+    */
+    QWebEngineView::resizeEvent(event);
 }
 
 void WebView::downloadLinkToDisk()
 {
-    pageAction(QWebPage::DownloadLinkToDisk)->trigger();
+    pageAction(QWebEnginePage::DownloadLinkToDisk)->trigger();
 }
 
 void WebView::copyLinkToClipboard()
 {
-    pageAction(QWebPage::CopyLinkToClipboard)->trigger();
+    pageAction(QWebEnginePage::CopyLinkToClipboard)->trigger();
 }
 
 void WebView::openActionUrlInNewTab()
 {
     if (QAction *action = qobject_cast<QAction*>(sender())) {
-        QWebPage *page = tabWidget()->getView(TabWidget::NewNotSelectedTab, this)->page();
-        QNetworkRequest request(action->data().toUrl());
-        request.setRawHeader("Referer", url().toEncoded());
-        page->mainFrame()->load(request);
+        QWebEnginePage *page = tabWidget()->getView(TabWidget::NewNotSelectedTab, this)->page();
+        page->load(action->data().toUrl());
     }
 }
 
 void WebView::openActionUrlInNewWindow()
 {
     if (QAction *action = qobject_cast<QAction*>(sender())) {
-        QWebPage *page = tabWidget()->getView(TabWidget::NewWindow, this)->page();
-        QNetworkRequest request(action->data().toUrl());
-        request.setRawHeader("Referer", url().toEncoded());
-        page->mainFrame()->load(request);
+        QWebEnginePage *page = tabWidget()->getView(TabWidget::NewWindow, this)->page();
+        page->load(action->data().toUrl());
     }
 }
 
 void WebView::openImageInNewWindow()
 {
-    pageAction(QWebPage::OpenImageInNewWindow)->trigger();
+    //pageAction(QWebEnginePage::OpenImageInNewWindow)->trigger();
 }
 
 void WebView::downloadImageToDisk()
 {
-    pageAction(QWebPage::DownloadImageToDisk)->trigger();
+    pageAction(QWebEnginePage::DownloadImageToDisk)->trigger();
 }
 
 void WebView::copyImageToClipboard()
 {
-    pageAction(QWebPage::CopyImageToClipboard)->trigger();
+    pageAction(QWebEnginePage::CopyImageToClipboard)->trigger();
 }
 
 void WebView::copyImageLocationToClipboard()
@@ -324,15 +376,6 @@ void WebView::copyImageLocationToClipboard()
     }
 }
 
-void WebView::blockImage()
-{
-    if (QAction *action = qobject_cast<QAction*>(sender())) {
-        QString imageUrl = action->data().toString();
-        AdBlockDialog *dialog = AdBlockManager::instance()->showDialog();
-        dialog->addCustomRule(imageUrl);
-    }
-}
-
 void WebView::bookmarkLink()
 {
     if (QAction *action = qobject_cast<QAction*>(sender())) {
@@ -353,10 +396,10 @@ void WebView::searchRequested(QAction *action)
 
     if (index.canConvert<QString>()) {
         OpenSearchEngine *engine = ToolbarSearch::openSearchManager()->engine(index.toString());
-        emit search(engine->searchUrl(searchText), TabWidget::NewSelectedTab);
+        Q_EMIT search(engine->searchUrl(searchText), TabWidget::NewSelectedTab);
     }
 }
-
+/*
 void WebView::addSearchEngine()
 {
     QAction *action = qobject_cast<QAction*>(sender());
@@ -368,55 +411,55 @@ void WebView::addSearchEngine()
         return;
 
     QWebElement element = qvariant_cast<QWebElement>(variant);
-    QString elementName = element.attribute(QLatin1String("name"));
+    QString elementName = element.attribute(QStringLiteral("name"));
     QWebElement formElement = element;
-    while (formElement.tagName().toLower() != QLatin1String("form"))
+    while (formElement.tagName().toLower() != QStringLiteral("form"))
         formElement = formElement.parent();
 
-    if (formElement.isNull() || formElement.attribute(QLatin1String("action")).isEmpty())
+    if (formElement.isNull() || formElement.attribute(QStringLiteral("action")).isEmpty())
         return;
 
-    QString method = formElement.attribute(QLatin1String("method"), QLatin1String("get")).toLower();
-    if (method != QLatin1String("get")) {
+    QString method = formElement.attribute(QStringLiteral("method"), QStringLiteral("get")).toLower();
+    if (method != QStringLiteral("get")) {
         QMessageBox::warning(this, tr("Method not supported"),
                              tr("%1 method is not supported.").arg(method.toUpper()));
         return;
     }
 
-    QUrl searchUrl(page()->mainFrame()->baseUrl().resolved(QUrl(formElement.attribute(QLatin1String("action")))));
+    QUrl searchUrl(page()->mainFrame()->baseUrl().resolved(QUrl(formElement.attribute(QStringLiteral("action")))));
     QMap<QString, QString> searchEngines;
-    QWebElementCollection inputFields = formElement.findAll(QLatin1String("input"));
+    QWebElementCollection inputFields = formElement.findAll(QStringLiteral("input"));
     QUrlQuery query(searchUrl.query());
 
-    foreach (QWebElement inputField, inputFields) {
-        QString type = inputField.attribute(QLatin1String("type"), QLatin1String("text"));
-        QString name = inputField.attribute(QLatin1String("name"));
-        QString value = inputField.evaluateJavaScript(QLatin1String("this.value")).toString();
+    Q_FOREACH (QWebElement inputField, inputFields) {
+        QString type = inputField.attribute(QStringLiteral("type"), QStringLiteral("text"));
+        QString name = inputField.attribute(QStringLiteral("name"));
+        QString value = inputField.evaluateJavaScript(QStringLiteral("this.value")).toString();
 
-        if (type == QLatin1String("submit")) {
+        if (type == QStringLiteral("submit")) {
             searchEngines.insert(value, name);
-        } else if (type == QLatin1String("text")) {
+        } else if (type == QStringLiteral("text")) {
             if (inputField == element)
-                value = QLatin1String("{searchTerms}");
+                value = QStringLiteral("{searchTerms}");
 
             query.addQueryItem(name, value);
-        } else if (type == QLatin1String("checkbox") || type == QLatin1String("radio")) {
-            if (inputField.evaluateJavaScript(QLatin1String("this.checked")).toBool()) {
+        } else if (type == QStringLiteral("checkbox") || type == QStringLiteral("radio")) {
+            if (inputField.evaluateJavaScript(QStringLiteral("this.checked")).toBool()) {
                 query.addQueryItem(name, value);
             }
-        } else if (type == QLatin1String("hidden")) {
+        } else if (type == QStringLiteral("hidden")) {
             query.addQueryItem(name, value);
         }
     }
 
-    QWebElementCollection selectFields = formElement.findAll(QLatin1String("select"));
-    foreach (QWebElement selectField, selectFields) {
-        QString name = selectField.attribute(QLatin1String("name"));
-        int selectedIndex = selectField.evaluateJavaScript(QLatin1String("this.selectedIndex")).toInt();
+    QWebElementCollection selectFields = formElement.findAll(QStringLiteral("select"));
+    Q_FOREACH (QWebElement selectField, selectFields) {
+        QString name = selectField.attribute(QStringLiteral("name"));
+        int selectedIndex = selectField.evaluateJavaScript(QStringLiteral("this.selectedIndex")).toInt();
         if (selectedIndex == -1)
             continue;
 
-        QWebElementCollection options = selectField.findAll(QLatin1String("option"));
+        QWebElementCollection options = selectField.findAll(QStringLiteral("option"));
         QString value = options.at(selectedIndex).toPlainText();
         query.addQueryItem(name, value);
     }
@@ -434,7 +477,7 @@ void WebView::addSearchEngine()
     searchUrl.setQuery(query);
 
     QString engineName;
-    QWebElementCollection labels = formElement.findAll(QString(QLatin1String("label[for=\"%1\"]")).arg(elementName));
+    QWebElementCollection labels = formElement.findAll(QString(QStringLiteral("label[for=\"%1\"]")).arg(elementName));
     if (labels.count() > 0)
         engineName = labels.at(0).toPlainText();
 
@@ -451,7 +494,7 @@ void WebView::addSearchEngine()
 
     ToolbarSearch::openSearchManager()->addEngine(engine);
 }
-
+*/
 void WebView::setProgress(int progress)
 {
     m_progress = progress;
@@ -509,42 +552,51 @@ void WebView::resetZoom()
     applyZoom();
 }
 
-void WebView::loadFinished()
+void WebView::loadFinished(bool success)
 {
     if (100 != m_progress) {
         qWarning() << "Received finished signal while progress is still:" << progress()
                    << "Url:" << url();
     }
     m_progress = 0;
-    AdBlockManager::instance()->page()->applyRulesToPage(page());
-    BrowserApplication::instance()->autoFillManager()->fill(page());
 }
 
 void WebView::loadUrl(const QUrl &url, const QString &title)
 {
-    if (url.scheme() == QLatin1String("javascript")) {
+    if (url.scheme() == QStringLiteral("javascript")) {
         QString scriptSource = QUrl::fromPercentEncoding(url.toString(Q_FLAGS(QUrl::TolerantMode|QUrl::RemoveScheme)).toLatin1());
-        QVariant result = page()->mainFrame()->evaluateJavaScript(scriptSource);
+        QEventLoop loop;
+        QObject::connect(this, SIGNAL(notifyRanJavaScript()), &loop, SLOT(quit()));
+        page()->runJavaScript(scriptSource, [this](const QVariant &v)
+        {
+            this->ranJavaScript();
+        });
+        loop.exec();
         return;
     }
     m_initialUrl = url;
     if (!title.isEmpty())
-        emit titleChanged(tr("Loading..."));
+        Q_EMIT titleChanged(tr("Loading..."));
     else
-        emit titleChanged(title);
+        Q_EMIT titleChanged(title);
     QUrl oldurl = QUrl(url.toString());
     QUrl newurl = QUrl(url.toString());
-    if(newurl.toString().startsWith(QLatin1String("endorphin://"))) {
+    if(newurl.toString().startsWith(QStringLiteral("endorphin://"))) {
         QString url_tmp = newurl.toString().mid(12);
-        newurl = QUrl(QLatin1String("qrc:/") + url_tmp);
+        newurl = QUrl(QStringLiteral("qrc:/") + url_tmp);
         QString urlstr = newurl.toString();
-        if(!urlstr.endsWith(QLatin1String(".html"))) {
-            newurl = QUrl(urlstr + QLatin1String(".html"));
+        if(!urlstr.endsWith(QStringLiteral(".html"))) {
+            newurl = QUrl(urlstr + QStringLiteral(".html"));
         }
     }
     load(newurl);
 }
 
+void WebView::ranJavaScript()
+{
+    Q_EMIT notifyRanJavaScript();
+}
+
 QString WebView::lastStatusBarText() const
 {
     return m_statusBarText;
@@ -552,7 +604,7 @@ QString WebView::lastStatusBarText() const
 
 QUrl WebView::url() const
 {
-    QUrl url = QWebView::url();
+    QUrl url = QWebEngineView::url();
     if (!url.isEmpty())
         return url;
 
@@ -563,7 +615,7 @@ void WebView::mousePressEvent(QMouseEvent *event)
 {
     BrowserApplication::instance()->setEventMouseButtons(event->buttons());
     BrowserApplication::instance()->setEventKeyboardModifiers(event->modifiers());
-
+    LocationBar::resetFirstSelectAll();
     switch (event->button()) {
     case Qt::XButton1:
         pageAction(WebPage::Back)->trigger();
@@ -572,7 +624,7 @@ void WebView::mousePressEvent(QMouseEvent *event)
         pageAction(WebPage::Forward)->trigger();
         break;
     default:
-        QWebView::mousePressEvent(event);
+        QWebEngineView::mousePressEvent(event);
         break;
     }
 }
@@ -595,16 +647,16 @@ void WebView::dragMoveEvent(QDragMoveEvent *event)
         }
     }
     if (!event->isAccepted()) {
-        QWebView::dragMoveEvent(event);
+        QWebEngineView::dragMoveEvent(event);
     }
 }
 
 void WebView::dropEvent(QDropEvent *event)
 {
-    QWebView::dropEvent(event);
+    QWebEngineView::dropEvent(event);
     if (!event->isAccepted()
-        && event->source() != this
-        && event->possibleActions() & Qt::CopyAction) {
+            && event->source() != this
+            && event->possibleActions() & Qt::CopyAction) {
 
         QUrl url;
         if (!event->mimeData()->urls().isEmpty())
@@ -621,9 +673,9 @@ void WebView::dropEvent(QDropEvent *event)
 void WebView::mouseReleaseEvent(QMouseEvent *event)
 {
     const bool isAccepted = event->isAccepted();
-    m_page->event(event);
+    page()->event(event);
     if (!event->isAccepted()
-        && (BrowserApplication::instance()->eventMouseButtons() & Qt::MidButton)) {
+            && (BrowserApplication::instance()->eventMouseButtons() & Qt::MidButton)) {
         QUrl url(QApplication::clipboard()->text(QClipboard::Selection));
         if (!url.isEmpty() && url.isValid() && !url.scheme().isEmpty()) {
             BrowserApplication::instance()->setEventMouseButtons(Qt::NoButton);
@@ -638,13 +690,14 @@ void WebView::setStatusBarText(const QString &string)
     m_statusBarText = string;
 }
 
-void WebView::downloadRequested(const QNetworkRequest &request)
+void WebView::downloadRequested(QWebEngineDownloadItem *download)
 {
-    BrowserApplication::downloadManager()->download(request);
+    BrowserApplication::downloadManager()->download(download);
 }
 
 void WebView::keyPressEvent(QKeyEvent *event)
 {
+    /*
     if (m_enableAccessKeys) {
         m_accessKeysPressed = (event->modifiers() == Qt::ControlModifier
                                && event->key() == Qt::Key_Control);
@@ -659,9 +712,10 @@ void WebView::keyPressEvent(QKeyEvent *event)
             QTimer::singleShot(300, this, SLOT(accessKeyShortcut()));
         }
     }
-    QWebView::keyPressEvent(event);
+    */
+    QWebEngineView::keyPressEvent(event);
 }
-
+/*
 void WebView::accessKeyShortcut()
 {
     if (!hasFocus()
@@ -675,23 +729,28 @@ void WebView::accessKeyShortcut()
     }
     m_accessKeysPressed = false;
 }
-
+*/
 void WebView::keyReleaseEvent(QKeyEvent *event)
 {
-    if (m_enableAccessKeys)
-        m_accessKeysPressed = event->key() == Qt::Key_Control;
-    QWebView::keyReleaseEvent(event);
+    /*
+        if (m_enableAccessKeys)
+            m_accessKeysPressed = event->key() == Qt::Key_Control;
+    */
+    QWebEngineView::keyReleaseEvent(event);
 }
 
 void WebView::focusOutEvent(QFocusEvent *event)
 {
-    if (m_accessKeysPressed) {
-        hideAccessKeys();
-        m_accessKeysPressed = false;
-    }
-    QWebView::focusOutEvent(event);
+    /*
+        if (m_accessKeysPressed) {
+            hideAccessKeys();
+            m_accessKeysPressed = false;
+        }
+    */
+    QWebEngineView::focusOutEvent(event);
 }
 
+/*
 bool WebView::checkForAccessKey(QKeyEvent *event)
 {
     if (m_accessKeyLabels.isEmpty())
@@ -737,32 +796,32 @@ void WebView::hideAccessKeys()
 void WebView::showAccessKeys()
 {
     QStringList supportedElement;
-    supportedElement << QLatin1String("input")
-                     << QLatin1String("a")
-                     << QLatin1String("area")
-                     << QLatin1String("button")
-                     << QLatin1String("label")
-                     << QLatin1String("legend")
-                     << QLatin1String("textarea");
+    supportedElement << QStringLiteral("input")
+                     << QStringLiteral("a")
+                     << QStringLiteral("area")
+                     << QStringLiteral("button")
+                     << QStringLiteral("label")
+                     << QStringLiteral("legend")
+                     << QStringLiteral("textarea");
 
     QList<QChar> unusedKeys;
     for (char c = 'A'; c <= 'Z'; ++c)
-        unusedKeys << QLatin1Char(c);
+        unusedKeys << QChar(c);
     for (char c = '0'; c <= '9'; ++c)
-        unusedKeys << QLatin1Char(c);
+        unusedKeys << QChar(c);
 
-    QRect viewport = QRect(m_page->mainFrame()->scrollPosition(), m_page->viewportSize());
+    QRect viewport = QRect(page()->mainFrame()->scrollPosition(), page()->viewportSize());
     // Priority first goes to elements with accesskey attributes
     QList<QWebElement> alreadyLabeled;
-    foreach (const QString &elementType, supportedElement) {
+    Q_FOREACH (const QString &elementType, supportedElement) {
         QList<QWebElement> result = page()->mainFrame()->findAllElements(elementType).toList();
-        foreach (const QWebElement &element, result) {
+        Q_FOREACH (const QWebElement &element, result) {
             const QRect geometry = element.geometry();
             if (geometry.size().isEmpty()
                 || !viewport.contains(geometry.topLeft())) {
                 continue;
             }
-            QString accessKeyAttribute = element.attribute(QLatin1String("accesskey")).toUpper();
+            QString accessKeyAttribute = element.attribute(QStringLiteral("accesskey")).toUpper();
             if (accessKeyAttribute.isEmpty())
                 continue;
             QChar accessKey;
@@ -783,9 +842,9 @@ void WebView::showAccessKeys()
 
     // Pick an access key first from the letters in the text and then from the
     // list of unused access keys
-    foreach (const QString &elementType, supportedElement) {
+    Q_FOREACH (const QString &elementType, supportedElement) {
         QWebElementCollection result = page()->mainFrame()->findAllElements(elementType);
-        foreach (const QWebElement &element, result) {
+        Q_FOREACH (const QWebElement &element, result) {
             const QRect geometry = element.geometry();
             if (unusedKeys.isEmpty()
                 || alreadyLabeled.contains(element)
@@ -813,7 +872,7 @@ void WebView::showAccessKeys()
 void WebView::makeAccessKeyLabel(const QChar &accessKey, const QWebElement &element)
 {
     QLabel *label = new QLabel(this);
-    label->setText(QString(QLatin1String("<qt><b>%1</b>")).arg(accessKey));
+    label->setText(QString(QStringLiteral("<qt><b>%1</b>")).arg(accessKey));
 
     QPalette p = QToolTip::palette();
     QColor color(Qt::yellow);
@@ -824,7 +883,7 @@ void WebView::makeAccessKeyLabel(const QChar &accessKey, const QWebElement &elem
     label->setAutoFillBackground(true);
     label->setFrameStyle(QFrame::Box | QFrame::Plain);
     QPoint point = element.geometry().center();
-    point -= m_page->mainFrame()->scrollPosition();
+    point -= page()->mainFrame()->scrollPosition();
     label->move(point);
     label->show();
     point.setX(point.x() - label->width() / 2);
@@ -832,3 +891,15 @@ void WebView::makeAccessKeyLabel(const QChar &accessKey, const QWebElement &elem
     m_accessKeyLabels.append(label);
     m_accessKeyNodes[accessKey] = element;
 }
+*/
+
+void WebView::onFeaturePermissionRequested(const QUrl &securityOrigin, QWebEnginePage::Feature feature)
+{
+    PermissionBar *permissionBar = new PermissionBar(this);
+    connect(permissionBar, &PermissionBar::featurePermissionProvided, page(), &QWebEnginePage::setFeaturePermission);
+
+    // Discard the bar on new loads (if we navigate away or reload).
+    connect(page(), &QWebEnginePage::loadStarted, permissionBar, &QObject::deleteLater);
+
+    permissionBar->requestPermission(securityOrigin, feature);
+}
\ No newline at end of file
diff --git a/src/webview.h b/src/webview.h
index fa722580..4bd2e05a 100644
--- a/src/webview.h
+++ b/src/webview.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  * Copyright 2008 Ariya Hidayat <ariya.hidayat@gmail.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -64,23 +64,26 @@
 #ifndef WEBVIEW_H
 #define WEBVIEW_H
 
-#include <qwebview.h>
+#include <QWebEngineView>
 
 #include "tabwidget.h"
 
-#include <qwebelement.h>
 class QLabel;
 
 class BrowserMainWindow;
 class TabWidget;
 class WebPage;
-class WebView : public QWebView
+//class QWebElement;
+class WebView : public QWebEngineView
 {
     Q_OBJECT
 
 public:
-    WebView(QWidget *parent = 0);
-    WebPage *webPage() const { return m_page; }
+    WebView(QWidget *parent = nullptr);
+    void setPage(WebPage *page);
+    WebPage *webPage() const {
+        return m_page;
+    }
 
     void loadSettings();
 
@@ -91,13 +94,18 @@ class WebView : public QWebView
     QUrl url() const;
 
     QString lastStatusBarText() const;
-    inline int progress() const { return m_progress; }
+    inline int progress() const {
+        return m_progress;
+    }
     TabWidget *tabWidget() const;
+    void ranJavaScript();
 
-signals:
+Q_SIGNALS:
     void search(const QUrl &searchUrl, TabWidget::OpenUrlIn openIn);
+    void notifyRanJavaScript();
+    void devToolsRequested(QWebEnginePage *source);
 
-public slots:
+public Q_SLOTS:
     void zoomIn();
     void zoomOut();
     void resetZoom();
@@ -117,11 +125,11 @@ public slots:
 private:
     int levelForZoom(int zoom);
 
-private slots:
+private Q_SLOTS:
     void setProgress(int progress);
-    void loadFinished();
+    void loadFinished(bool success);
     void setStatusBarText(const QString &string);
-    void downloadRequested(const QNetworkRequest &request);
+    void downloadRequested(QWebEngineDownloadItem *download);
     void openActionUrlInNewTab();
     void openActionUrlInNewWindow();
     void downloadLinkToDisk();
@@ -130,12 +138,11 @@ private slots:
     void downloadImageToDisk();
     void copyImageToClipboard();
     void copyImageLocationToClipboard();
-    void blockImage();
     void bookmarkLink();
     void searchRequested(QAction *action);
-    void addSearchEngine();
-    void hideAccessKeys();
-    void accessKeyShortcut();
+//    void addSearchEngine();
+//    void hideAccessKeys();
+//    void accessKeyShortcut();
 
 private:
     QString m_statusBarText;
@@ -145,13 +152,15 @@ private slots:
     QList<int> m_zoomLevels;
     WebPage *m_page;
 
-    bool m_enableAccessKeys;
-    bool checkForAccessKey(QKeyEvent *event);
-    void showAccessKeys();
-    void makeAccessKeyLabel(const QChar &accessKey, const QWebElement &element);
-    QList<QLabel*> m_accessKeyLabels;
-    QHash<QChar, QWebElement> m_accessKeyNodes;
-    bool m_accessKeysPressed;
+    void onFeaturePermissionRequested(const QUrl &securityOrigin, QWebEnginePage::Feature);
+
+    //bool m_enableAccessKeys;
+    //bool checkForAccessKey(QKeyEvent *event);
+    //void showAccessKeys();
+    //void makeAccessKeyLabel(const QChar &accessKey, const QWebElement &element);
+    //QList<QLabel*> m_accessKeyLabels;
+    //QHash<QChar, QWebElement> m_accessKeyNodes;
+    //bool m_accessKeysPressed;
 };
 
 #endif
diff --git a/src/webviewsearch.cpp b/src/webviewsearch.cpp
index a494c3e8..c3bf0c58 100644
--- a/src/webviewsearch.cpp
+++ b/src/webviewsearch.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,58 +19,52 @@
 
 #include "webviewsearch.h"
 
-#include <qevent.h>
-#include <qshortcut.h>
-#include <qtimeline.h>
+#include <QEvent>
+#include <QShortcut>
+#include <QTimeLine>
 
-#include <qwebframe.h>
-#include <qwebview.h>
+#include <QWebEngineView>
 
-#include <qdebug.h>
+#include <QDebug>
 
-WebViewSearch::WebViewSearch(QWebView *webView, QWidget *parent)
+WebViewSearch::WebViewSearch(QWebEngineView *webView, QWidget *parent)
     : SearchBar(parent)
 {
     setSearchObject(webView);
-    ui.highlightAllButton->setVisible(true);
-    connect(ui.highlightAllButton, SIGNAL(toggled(bool)),
-            this, SLOT(highlightAll()));
-    connect(ui.searchLineEdit, SIGNAL(textEdited(const QString &)),
-            this, SLOT(highlightAll()));
 }
 
 void WebViewSearch::findNext()
 {
-    find(QWebPage::FindWrapsAroundDocument);
+    find(QWebEnginePage::FindFlags());
 }
 
 void WebViewSearch::findPrevious()
 {
-    find(QWebPage::FindBackward | QWebPage::FindWrapsAroundDocument);
+    find(QWebEnginePage::FindBackward);
 }
 
-void WebViewSearch::highlightAll()
+void WebViewSearch::find(QWebEnginePage::FindFlags flags)
 {
-    webView()->findText(QString(), QWebPage::HighlightAllOccurrences);
-
-    if (ui.highlightAllButton->isChecked())
-        find(QWebPage::HighlightAllOccurrences);
+    if(!ui.searchLineEdit->text().isEmpty()) {
+        QString searchString = ui.searchLineEdit->text();
+        webView()->findText(searchString, flags, [this](bool found) {
+            handleSearchResult(found);
+        });
+    }
 }
 
-void WebViewSearch::find(QWebPage::FindFlags flags)
+void WebViewSearch::handleSearchResult(bool found)
 {
-    QString searchString = ui.searchLineEdit->text();
-    if (!searchObject() || searchString.isEmpty())
-        return;
     QString infoString;
-    if (!webView()->findText(searchString, flags))
+    if (!found)
         infoString = tr("Not Found");
+    
     ui.searchInfo->setText(infoString);
 }
 
-QWebView *WebViewSearch::webView() const
+QWebEngineView *WebViewSearch::webView() const
 {
-    return qobject_cast<QWebView*>(searchObject());
+    return qobject_cast<QWebEngineView*>(searchObject());
 }
 
 WebViewWithSearch::WebViewWithSearch(WebView *webView, QWidget *parent)
diff --git a/src/webviewsearch.h b/src/webviewsearch.h
index 67d84d23..0442fa90 100644
--- a/src/webviewsearch.h
+++ b/src/webviewsearch.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -22,10 +22,10 @@
 
 #include "searchbar.h"
 
-#include <qwebpage.h>
+#include <QWebEnginePage>
 
 QT_BEGIN_NAMESPACE
-class QWebView;
+class QWebEngineView;
 QT_END_NAMESPACE
 
 class WebViewSearch : public SearchBar
@@ -33,16 +33,16 @@ class WebViewSearch : public SearchBar
     Q_OBJECT
 
 public:
-    WebViewSearch(QWebView *webView, QWidget *parent = 0);
+    WebViewSearch(QWebEngineView *webView, QWidget *parent = nullptr);
 
-public slots:
+public Q_SLOTS:
     void findNext();
     void findPrevious();
-    void highlightAll();
 
 private:
-    void find(QWebPage::FindFlags flags);
-    QWebView *webView() const;
+    void find(QWebEnginePage::FindFlags flags);
+    QWebEngineView *webView() const;
+    void handleSearchResult(bool found);
 };
 
 #include "webview.h"
@@ -52,7 +52,7 @@ class WebViewWithSearch : public QWidget
     Q_OBJECT
 
 public:
-    WebViewWithSearch(WebView *webView, QWidget *parent = 0);
+    WebViewWithSearch(WebView *webView, QWidget *parent = nullptr);
     WebView *m_webView;
     WebViewSearch *m_webViewSearch;
 };
diff --git a/tools/.qmake.conf b/tools/.qmake.conf
deleted file mode 100644
index 7c1d952d..00000000
--- a/tools/.qmake.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-QMAKEPATH += /usr/local/opt/qtwebkit
-QMAKE_MAC_SDK = macosx10.13
diff --git a/tools/cacheinfo/CMakeLists.txt b/tools/cacheinfo/CMakeLists.txt
index 3d706ebd..98cc8d19 100644
--- a/tools/cacheinfo/CMakeLists.txt
+++ b/tools/cacheinfo/CMakeLists.txt
@@ -1,10 +1,12 @@
 project(endorphin-cacheinfo)
+include(GNUInstallDirs)
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Gui REQUIRED)
 find_package(Qt5Network REQUIRED)
 add_executable(endorphin-cacheinfo main.cpp)
-qt5_use_modules(endorphin-cacheinfo Widgets)
-qt5_use_modules(endorphin-cacheinfo Core)
-qt5_use_modules(endorphin-cacheinfo Gui)
-qt5_use_modules(endorphin-cacheinfo Network)
+target_link_libraries(endorphin-cacheinfo Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network)
+
+install(TARGETS endorphin-cacheinfo
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
diff --git a/tools/cacheinfo/cacheinfo.pro b/tools/cacheinfo/cacheinfo.pro
deleted file mode 100644
index 03470ab1..00000000
--- a/tools/cacheinfo/cacheinfo.pro
+++ /dev/null
@@ -1,32 +0,0 @@
-TEMPLATE = app
-TARGET = endorphin-cacheinfo
-DEPENDPATH += .
-INCLUDEPATH += .
-
-win32|os2: CONFIG += console
-mac:CONFIG -= app_bundle
-
-QT += network
-
-# Input
-SOURCES += main.cpp
-
-RCC_DIR     = $$PWD/.rcc
-UI_DIR      = $$PWD/.ui
-MOC_DIR     = $$PWD/.moc
-OBJECTS_DIR = $$PWD/.obj
-
-include(../../install.pri)
-
-!mac {
-unix {
-    INSTALLS += man man-compress
-
-    man.path = $$DATADIR/man/man1
-    man.files += data/endorphin-cacheinfo.1
-
-    man-compress.path = $$DATADIR/man/man1
-    man-compress.extra = "" "gzip -9 -f \$(INSTALL_ROOT)/$$DATADIR/man/man1/endorphin-cacheinfo.1" ""
-    man-compress.depends = install_man
-}
-}
diff --git a/tools/cacheinfo/main.cpp b/tools/cacheinfo/main.cpp
index 1ef19ea6..fc2707e5 100644
--- a/tools/cacheinfo/main.cpp
+++ b/tools/cacheinfo/main.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2008 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -17,23 +17,24 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include <Qt>
-#include <QtNetwork/QtNetwork>
-#include <QtGui/QtGui>
+#include <QtNetwork>
+#include <QtGui>
 
 class NetworkDiskCache : public QNetworkDiskCache
 {
 public:
     QNetworkCacheMetaData _fileMetaData(const QString &fileName)
-        { return fileMetaData(fileName); }
+    {
+        return fileMetaData(fileName);
+    }
 
 };
 
 int main(int argc, char **argv)
 {
     QCoreApplication application(argc, argv);
-    QCoreApplication::setOrganizationDomain(QLatin1String("aarondewes.github.io/endorphin/"));
-    QCoreApplication::setApplicationName(QLatin1String("Endorphin"));
+    QCoreApplication::setOrganizationDomain(QStringLiteral("EndorphinBrowser.gitlab.io/"));
+    QCoreApplication::setApplicationName(QStringLiteral("Endorphin"));
 
     QStringList args = application.arguments();
     args.takeFirst();
@@ -45,7 +46,7 @@ int main(int argc, char **argv)
     }
 
     NetworkDiskCache diskCache;
-    QString location = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QLatin1String("/browser/");
+    QString location = QStandardPaths::writableLocation(QStandardPaths::CacheLocation) + QStringLiteral("/browser/");
     diskCache.setCacheDirectory(location);
 
     QNetworkCacheMetaData metaData;
@@ -59,8 +60,8 @@ int main(int argc, char **argv)
     }
 
     if (!args.isEmpty()
-        && args.count() >= 1
-        && args.first() == QLatin1String("-o")) {
+            && args.count() >= 1
+            && args.first() == QStringLiteral("-o")) {
         QUrl url = metaData.url();
         QIODevice *device = diskCache.data(url);
         if (!device) {
@@ -97,7 +98,7 @@ int main(int argc, char **argv)
     stream << "Last Modified Date: " << metaData.lastModified().toString() << Qt::endl;
     stream << "Save to disk: " << metaData.saveToDisk() << Qt::endl;
     stream << "Headers:" << Qt::endl;
-    foreach (const QNetworkCacheMetaData::RawHeader &header, metaData.rawHeaders())
+    Q_FOREACH (const QNetworkCacheMetaData::RawHeader &header, metaData.rawHeaders())
         stream << "\t" << header.first << ": " << header.second << Qt::endl;
     QIODevice *device = diskCache.data(metaData.url());
     if (device) {
diff --git a/tools/htmlToXBel b/tools/htmlToXBel
new file mode 160000
index 00000000..42abe794
--- /dev/null
+++ b/tools/htmlToXBel
@@ -0,0 +1 @@
+Subproject commit 42abe79428a802d7536eb0585351ee1f7abfeaf5
diff --git a/tools/htmlToXBel/.gitignore b/tools/htmlToXBel/.gitignore
deleted file mode 100644
index b611ba2d..00000000
--- a/tools/htmlToXBel/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-htmlToXBel
diff --git a/tools/htmlToXBel/CMakeLists.txt b/tools/htmlToXBel/CMakeLists.txt
deleted file mode 100644
index d031b8f0..00000000
--- a/tools/htmlToXBel/CMakeLists.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-project(htmlToXBel)
-find_package(Qt5Widgets REQUIRED)
-find_package(Qt5Core REQUIRED)
-find_package(Qt5Gui REQUIRED)
-find_package(Qt5WebEngine REQUIRED)
-find_package(Qt5Network REQUIRED)
-find_package(Qt5WebEngineWidgets REQUIRED)
-add_executable(htmlToXBel main.cpp mainapp.cpp source.qrc)
-qt5_use_modules(htmlToXBel Core)
-qt5_use_modules(htmlToXBel Widgets)
-qt5_use_modules(htmlToXBel Sql)
-qt5_use_modules(htmlToXBel WebEngine)
-qt5_use_modules(htmlToXBel Network)
-qt5_use_modules(htmlToXBel WebEngineWidgets)
diff --git a/tools/htmlToXBel/data/htmlToXBel.1 b/tools/htmlToXBel/data/htmlToXBel.1
deleted file mode 100644
index 6f98602d..00000000
--- a/tools/htmlToXBel/data/htmlToXBel.1
+++ /dev/null
@@ -1,33 +0,0 @@
-.TH HTMLTOXBEL "1" "July 2009"
-
-.SH NAME
-htmlToXBel - a tool to convert bookmarks stored in the html format into the xbel format.
-
-.SH SYNOPSIS
-.B htmlToXBel [stdin|htmlfile] [stdout|-o outFile]
-
-.SH DESCRIPTION
-.B htmlToXBel
-is  a tool to convert bookmarks stored in the html format into the xbel format.  Many browser have the ability to export their bookmarks as a html file.  htmlToXBel takes that file as an input and will output those bookmarks in the XML Bookmark Exchange Language (XBEL) format.
-
-.SH OPTIONS
-.TP
-.B -o outFile
-Write the resulting XBEL to the file \fBoutFile\fR
-.TP
-
-.SH BUGS
-Please report bugs to \fIhttps://github.com/AaronDewes/endorphin-browser/issues\fR.
-
-.SH AUTHOR
-The author of htmlToXBel is Aaron Dewes <aaron.dewes@web.de>.
-.PP
-This manual page was written by Aaron Dewes <aaron.dewes@web.de>
-.PP
-Permission is granted to copy, distribute and/or modify this document under the
-terms of the
-GNU General Public License, Version 2 or any later version published by the Free
-Software Foundation.
-.PP
-On Debian systems, the complete text of the GNU General Public License can be
-found in /usr/share/common-licenses/GPL.
diff --git a/tools/htmlToXBel/extract.js b/tools/htmlToXBel/extract.js
deleted file mode 100644
index 08b9ef24..00000000
--- a/tools/htmlToXBel/extract.js
+++ /dev/null
@@ -1,48 +0,0 @@
-
-function walk() {
-    var parent = arguments[0];
-    var indent = arguments[1];
-
-    var result = "";
-    var children = parent.childNodes;
-    var folderName = "";
-    var folded = "";
-    for (var i = 0; i < children.length; i++) {
-        var object = children.item(i);
-        if (object.nodeName == "HR") {
-            result += indent + "<separator/>\n";
-        }
-        if (object.nodeName == "H3") {
-            folderName = object.innerHTML;
-            folded = object.folded;
-            if (object.folded == undefined)
-                folded = "false";
-            else
-                folded = "true";
-        }
-        if (object.nodeName == "A") {
-            result += indent + "<bookmark href=\"" + encodeURI(object.href).replace(/&/g, '&amp;') + "\">\n";
-            result += indent + indent + "<title>" + object.innerHTML + "</title>\n";
-            result += indent + "</bookmark>\n";
-        }
-
-        var currentIndent = indent;
-        if (object.nodeName == "DL") {
-            result += indent + "<folder folded=\"" + folded + "\">\n";
-            indent += "    ";
-            result += indent + "<title>" + folderName + "</title>\n";
-        }
-        result += walk(object, indent);
-        if (object.nodeName == "DL") {
-            result += currentIndent + "</folder>\n";
-        }
-    }
-    return result;
-}
-var xbel = walk(document, "    ");
-
-if (xbel != "") {
-    xbel = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n<!DOCTYPE xbel>\n<xbel version=\"1.0\">\n" + xbel + "</xbel>\n";
-}
-
-xbel;
diff --git a/tools/htmlToXBel/htmlToXBel.pro b/tools/htmlToXBel/htmlToXBel.pro
deleted file mode 100644
index 8fc2fb3c..00000000
--- a/tools/htmlToXBel/htmlToXBel.pro
+++ /dev/null
@@ -1,35 +0,0 @@
-TEMPLATE = app
-TARGET = htmlToXBel
-DEPENDPATH += .
-INCLUDEPATH += .
-
-win32|os2: CONFIG += console
-mac:CONFIG -= app_bundle
-
-QT += network webkit webkitwidgets
-
-# Input
-SOURCES += main.cpp
-
-RCC_DIR     = $$PWD/.rcc
-UI_DIR      = $$PWD/.ui
-MOC_DIR     = $$PWD/.moc
-OBJECTS_DIR = $$PWD/.obj
-
-RESOURCES += source.qrc
-
-include(../../install.pri)
-include(../../webkittrunk.pri)
-
-!mac {
-unix {
-    INSTALLS += man man-compress
-
-    man.path = $$DATADIR/man/man1
-    man.files += data/htmlToXBel.1
-
-    man-compress.path = $$DATADIR/man/man1
-    man-compress.extra = "" "gzip -9 -f \$(INSTALL_ROOT)/$$DATADIR/man/man1/htmlToXBel.1" ""
-    man-compress.depends = install_man
-}
-}
diff --git a/tools/htmlToXBel/main.cpp b/tools/htmlToXBel/main.cpp
deleted file mode 100644
index cbee06a8..00000000
--- a/tools/htmlToXBel/main.cpp
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include <QApplication>
-#include <QtWebEngineWidgets>
-#include <QThread>
-#include <QEventLoop>
-#include <mainapp.h>
-
-/*!
-    A tool to convert html bookmark files into the xbel format.
-
-    The html bookmark files should be DOCTYPE: NETSCAPE-Bookmark-file-1
-
-    More information about XBel can be found here: http://pyxml.sourceforge.net/topics/xbel/
-*/
-int main(int argc, char **argv)
-{
-    QApplication application(argc, argv);
-
-    QFile inFile;
-    QFile outFile;
-    QTextStream in(&inFile);
-    QTextStream out(&outFile);
-
-    // Either read in from stdin and output to stdout
-    // or read in from a file and output to a file
-    // Example: ./app foo.html -o bar.xbel
-    bool setInput = false;
-    bool setOutput = false;
-    QStringList args = application.arguments();
-    args.pop_front();
-    foreach (const QString &arg, args) {
-        if (arg == QLatin1String("-o")) {
-            setOutput = true;
-        } else if (setOutput) {
-            outFile.setFileName(arg);
-            outFile.open(QIODevice::WriteOnly);
-        } else if (QFile::exists(arg)) {
-            setInput = true;
-            inFile.setFileName(arg);
-            inFile.open(QIODevice::ReadOnly);
-        } else {
-            qWarning() << "Usage: htmlToXBel"
-                        << "[stdin|htmlfile]" << "[stdout|-o outFile]";
-            return 1;
-        }
-    }
-
-    if (!setInput)
-        inFile.open(stdin, QIODevice::ReadOnly);
-    if (!setOutput)
-        outFile.open(stdout, QIODevice::WriteOnly);
-    if (inFile.openMode() == QIODevice::NotOpen
-        || outFile.openMode() == QIODevice::NotOpen) {
-        qWarning() << "Unable to open streams";
-        return 1;
-    }
-    MainApp m_MainApp;
-    QString input = inFile.readAll();
-    out << m_MainApp.get(input);
-    return 0;
-}
diff --git a/tools/htmlToXBel/mainapp.cpp b/tools/htmlToXBel/mainapp.cpp
deleted file mode 100644
index 9a2cdb87..00000000
--- a/tools/htmlToXBel/mainapp.cpp
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-#include "mainapp.h"
-#include <QWebEnginePage>
-#include <QEventLoop>
-#include <QDebug>
-#include <QTimer>
-#include <QFile>
-
-MainApp::MainApp(QObject *parent) : QObject(parent)
-{
-}
-
-QString result;
-
-QString MainApp::get(QString &input)
-{
-    QWebEnginePage webPage;
-    QEventLoop loop;
-    connect(&webPage, &QWebEnginePage::loadFinished, &loop, &QEventLoop::quit);
-    webPage.setHtml(input);
-    loop.exec();
-    QEventLoop loop2;
-    QObject::connect(this, SIGNAL(notifyRanJavaScript()), &loop2, SLOT(quit()));
-    QFile jsFile(":/extract.js");
-    if (!jsFile.open(QFile::ReadOnly)) {
-        qWarning() << "Unable to load javascript to extract bookmarks.";
-        exit(1);
-    }
-    webPage.runJavaScript(jsFile.readAll(), [this](const QVariant &v)
-    {
-        QString tmp = v.toString();
-        this->ranJavaScript(tmp);
-    });
-    loop2.exec();
-    return result;
-}
-
-void MainApp::ranJavaScript(QString &value)
-{
-    result = value;
-    emit notifyRanJavaScript();
-}
\ No newline at end of file
diff --git a/tools/htmlToXBel/source.qrc b/tools/htmlToXBel/source.qrc
deleted file mode 100644
index 5f5bd7df..00000000
--- a/tools/htmlToXBel/source.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource>
-    <file>extract.js</file>
-</qresource>
-</RCC>
-
diff --git a/tools/htmlToXBel/tests/firefox3-bookmarks.html b/tools/htmlToXBel/tests/firefox3-bookmarks.html
deleted file mode 100644
index 5352a48c..00000000
--- a/tools/htmlToXBel/tests/firefox3-bookmarks.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE NETSCAPE-Bookmark-file-1>
-<!-- This is an automatically generated file.
-     It will be read and overwritten.
-     DO NOT EDIT! -->
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<TITLE>Bookmarks</TITLE>
-<H1>Bookmarks Menu</H1>
-
-<DL><p>
-    <DT><A HREF="place:folder=BOOKMARKS_MENU&folder=UNFILED_BOOKMARKS&folder=TOOLBAR&sort=12&excludeQueries=1&excludeItemIfParentHasAnnotation=livemark%2FfeedURI&maxResults=10&queryType=1">Recently Bookmarked</A>
-    <DT><A HREF="place:sort=14&type=6&maxResults=10">Recent Tags</A>
-    <HR>
-    <DT><A HREF="http://en-us.add-ons.mozilla.com/en-US/firefox/bookmarks/" ADD_DATE="1198169863" LAST_MODIFIED="1198169863" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/0-1198169863294280" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAADGUlEQVQ4jXWTXUxTZxjH33jBhRfGkGXGEC+M8dYbL7z0eiZL5sWJQqJuwnAz26CKxgrGN1Iwa/lwCVmDDJBZQNsdYlCraGlUSu0X/ZDak67tWmxpWjh9Szk9tJue/ncBG6LbL/nfPf/f81y8LyEf0EjpdpVGU9Ok0x1o6tQdaurUHfq2Q3eg4XLHrs8b6fYP59+Dbmvu6N19pd9QN2wRUg/9mbcvYhKskVXcdaTfdt97HT+j/fUIp6LVhNBtH5VVmp6aLpOdfxFllbnFEjypNbjeyLDFi7BGJDwWChh1ZZSWgZmR2ssdu7ZIvmymO3sn5qZ8iyXMZ8oIZsuYz5ThS5fgSsqYiRVhCUt4ECyA9zNcvOUw156nnxBCCOE4WqX++f4XjgUJrzJlCMtlhHN/YirEYA7mMBkQMZuQYY1IMIcKmAjkcdu5jHqtieM4WkXqVbT6l+lowrtYQjC7Xo7l/8JTgeEfhEwJ1uimYNzDcNUUTB5toZ+Ss63de8wB8Z0ntYb5TBlTrxmeCAxToa2C6XAB5lAB/Iagz5JSjl1o30ca2nR7n0clOJMyfOkSzMEc/g93ogjezzDqZhiwZVH3Q/t+0tCi2/tUWIEtXoQzuYbJgAhFqUBRlI/ijBdh9DIY3DkM2JbWBd+0amp475JijUqYiRUxm5BhXyiC9y3/u9mblOFOyJiNSRj3MIw4RfxkSSnHz2r2EE5Fq/WPf889EgqwhCVMRyRYoxLuupdQqQCVCuBKyJgI5HFnjuG2K4chu4h2PsS4elpNOI5Wnes1dfIBhgfBFZhDhY2swp2Q4YxLsP8h4c7c+unDL0XctGVxRmvScRytIoQQclKlqek0+sK8n4EP5DGxkd/8DEYvw5h7szwwu4w2g2fh2IX2fVue8lfqnsPXxpzBEXu2Mu5hGPMwjLpzMLhyGHGIGHopQv88jVaDI16n1h7h6Mb29yV157sONncZ+7vuR/L6Z2ll2CFi0C6iz7Ko/DgpFL/rNhpr1drD/1He5LPv6Y4Tl25w9Vf62r6mN/WNmsH+01f110+qe06t/8St/A10n5SW/zQjywAAAABJRU5ErkJggg==">Get Bookmark Add-ons</A>
-    <HR>
-    <DT><H3 ADD_DATE="1198169863" LAST_MODIFIED="1203721298">Mozilla Firefox</H3>
-    <DL><p>
-        <DT><A HREF="http://en-us.www.mozilla.com/en-US/firefox/help/" ADD_DATE="1198169863" LAST_MODIFIED="1198169863" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/2-1198169863299015" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==">Help and Tutorials</A>
-        <DT><A HREF="http://en-us.www.mozilla.com/en-US/firefox/customize/" ADD_DATE="1198169863" LAST_MODIFIED="1198169863" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/3-1198169863300317" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==">Customize Firefox</A>
-        <DT><A HREF="http://en-us.www.mozilla.com/en-US/firefox/community/" ADD_DATE="1198169863" LAST_MODIFIED="1198169863" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/4-1198169863301618" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==">Get Involved</A>
-        <DT><A HREF="http://en-us.www.mozilla.com/en-US/firefox/about/" ADD_DATE="1198169863" LAST_MODIFIED="1198169863" ICON_URI="http://www.mozilla.org/2005/made-up-favicon/5-1198169863302895" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==">About Us</A>
-    </DL><p>
-    <DT><A HREF="http://www.google.no/firefox?client=firefox-a&rls=org.mozilla:en-US:official" ADD_DATE="1203721275" LAST_MODIFIED="1203721275" ICON_URI="http://www.google.no/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACxElEQVQ4jZ3TX2iVBRzG8fci8CLScJvlmsymM5PSTErNRWX2TxpJoYWTsiQQAr3Iq4goqCAKdhEEdlFB3iiFDd3SMCTJpJmmM6Zjmo6jbse1v+ec933Pe877fro4dR30wPf2eX78fr8nmLFtxKae9Z7uWe25bzdqP/CExw9tsPHAau1dj2nvfl5b9zobDj3sqcPrPXtwjXu/f1Rb9zpt3esEyzouCJNRUClFMjmjMhVcDRm6/JdpTE7GyilCJDFTZb8tbRE0bAnFiDGO89O880Xe5u37LXyoS+P9v7jpwS7Ltx6y85sJR/+cVFQgvu70okDQsO13mdiY0E8lntzVq27FDy6NkkcVI/j1PE2rPnH3fbuMj6PA2VtnCOZv6ZXJifH6BxcseGC3G2UyOUk2QTUVpzWnUxcLevv+EClQLuhbPEswb/uwUoX3dl9225pPnRsoixC7blIkNiQyRUQlqRmVTEnlnVoSCO58aUSEnZ/nNa3qpoRqIlMkyUxiCopFFWSKImMkVSfrZwrueqHfuFTLjsOaNndJ5UljEkT/LKGKUiJLqQoV3aBccen22YL6V4eMYVHHSU3PfEecMBnKFE1XUyIyMWmiIiNVC4kH9M9fJrjj5bMKWLtjUNDymbhSJE1FU0ARI0I/D+b03ijrG6b33LRU3okFgaBl64CSUW/t6Re0/ujtzhPGhcpQIRM6djqzfGWXhiX7tK7o8WHnGdU00rdwrqB5UwSGY+YvPW7W7C8dOU9UG5jiGFXKFc5co6H5XV/vPSWTc7p+rmDuK4MyRRVXXLletXjRx26es8dHnQOGy1QVTCgYw/6+RFC3yb6eYzI5/c23CBre6DOBMK1xLUy9+OYRja2d6u75St3y4+Y8ctTMJSfNW3vQa+/vdTUMwdnmeYKVHf1M1z7vvxQmae2kMcLQYGuj4N9a/h8uNgb+BszYMVpSsWAWAAAAAElFTkSuQmCC">Mozilla Firefox Start Page</A>
-    <DT><A HREF="http://www.google.no/firefox" ADD_DATE="1203721340" LAST_MODIFIED="1203721340" ICON_URI="http://www.google.no/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACxElEQVQ4jZ3TX2iVBRzG8fci8CLScJvlmsymM5PSTErNRWX2TxpJoYWTsiQQAr3Iq4goqCAKdhEEdlFB3iiFDd3SMCTJpJmmM6Zjmo6jbse1v+ec933Pe877fro4dR30wPf2eX78fr8nmLFtxKae9Z7uWe25bzdqP/CExw9tsPHAau1dj2nvfl5b9zobDj3sqcPrPXtwjXu/f1Rb9zpt3esEyzouCJNRUClFMjmjMhVcDRm6/JdpTE7GyilCJDFTZb8tbRE0bAnFiDGO89O880Xe5u37LXyoS+P9v7jpwS7Ltx6y85sJR/+cVFQgvu70okDQsO13mdiY0E8lntzVq27FDy6NkkcVI/j1PE2rPnH3fbuMj6PA2VtnCOZv6ZXJifH6BxcseGC3G2UyOUk2QTUVpzWnUxcLevv+EClQLuhbPEswb/uwUoX3dl9225pPnRsoixC7blIkNiQyRUQlqRmVTEnlnVoSCO58aUSEnZ/nNa3qpoRqIlMkyUxiCopFFWSKImMkVSfrZwrueqHfuFTLjsOaNndJ5UljEkT/LKGKUiJLqQoV3aBccen22YL6V4eMYVHHSU3PfEecMBnKFE1XUyIyMWmiIiNVC4kH9M9fJrjj5bMKWLtjUNDymbhSJE1FU0ARI0I/D+b03ijrG6b33LRU3okFgaBl64CSUW/t6Re0/ujtzhPGhcpQIRM6djqzfGWXhiX7tK7o8WHnGdU00rdwrqB5UwSGY+YvPW7W7C8dOU9UG5jiGFXKFc5co6H5XV/vPSWTc7p+rmDuK4MyRRVXXLletXjRx26es8dHnQOGy1QVTCgYw/6+RFC3yb6eYzI5/c23CBre6DOBMK1xLUy9+OYRja2d6u75St3y4+Y8ctTMJSfNW3vQa+/vdTUMwdnmeYKVHf1M1z7vvxQmae2kMcLQYGuj4N9a/h8uNgb+BszYMVpSsWAWAAAAAElFTkSuQmCC">Mozilla Firefox Start Page</A>
-    <DT><H3 ADD_DATE="1198169863" LAST_MODIFIED="1211481398" PERSONAL_TOOLBAR_FOLDER="true">Bookmarks Toolbar</H3>
-<DD>Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar
-    <DL><p>
-        <DT><A HREF="place:sort=8&maxResults=10">Most Visited</A>
-        <DT><H3 ADD_DATE="1198169863" LAST_MODIFIED="1198169863">Smart Bookmarks</H3>
-        <DL><p>
-            <DT><A HREF="place:sort=8&maxResults=10">Most Visited</A>
-            <DT><A HREF="place:folder=BOOKMARKS_MENU&folder=UNFILED_BOOKMARKS&folder=TOOLBAR&sort=12&excludeQueries=1&excludeItemIfParentHasAnnotation=livemark%2FfeedURI&maxResults=10&queryType=1">Recently Bookmarked</A>
-            <HR>
-            <DT><A HREF="place:folder=TAGS&sort=12&maxResults=10&queryType=1">Recent Tags</A>
-        </DL><p>
-        <DT><A HREF="http://en-us.www.mozilla.com/en-US/firefox/central/" ADD_DATE="1198169863" LAST_MODIFIED="1198169863" ICON_URI="http://en-us.www.mozilla.com/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABEUlEQVQ4jbWSsXEDMQwEL0CIWAWwBdTCFtgCU0Xs4bMPVAgL+GZUwTrg/5uS7JECGwlnOLzF4UDpr6u1RkqJkIgIWmv03nkrvN/vRAQhsUks+1mkAZN+B63rDTOj7MIicZUgxlkkUkq4+88AMzsB7J23GLCrxKYg50xKiUXiRdxaw8xYdgD67nyAmOBlHgfA3cfsMR7NggN2ZHLcLftYp4Pn7jMgJNydnPOjkwgEnGtbJsH1CXhsotZKiTjDlpnRe8fdT9E2Cee7I5daKwpRShkOzAx3f5l9k7hcLoREzplaK4uCCLGuNx620Ht/sb5Ntt/+xFor8Zx87El/Ur13Yg9n7p5z/gwwg47w3H0E9Z/1BfAkJDRE3FKkAAAAAElFTkSuQmCC">Getting Started</A>
-        <DT><A FEEDURL="http://en-us.fxfeeds.mozilla.com/en-US/firefox/headlines.xml" HREF="http://news.bbc.co.uk/go/rss/-/2/hi/default.stm">Latest Headlines</A>
-    </DL><p>
-    <DT><H3 ADD_DATE="1198169863" LAST_MODIFIED="1208015024" UNFILED_BOOKMARKS_FOLDER="true">Unfiled Bookmarks</H3>
-    <DL><p>
-        <DT><A HREF="http://reddit.com/info/6cxww/comments" ADD_DATE="1206200543" LAST_MODIFIED="1206200543" ICON_URI="http://reallystatic.reddit.com/static/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACDElEQVQ4jaWT3WuSYRjG9x/Uv9FR0UEHY+xwwg52kKyD3EcfmqROXyf7yiUaY7rhYodWrDHeJfvyVdcOHMLCRFAUZe/I0di7ik46CmHDxYLn18ELWtgWtIPr4OK++N0PF/fTVq3BZdRWrUFOq/+XLgTkP5/xrvqd2yYLFvdTQhGZBzYPZouVydkX/wbktDrhBYVB2wixTIFBxxPu9Zs4Oz2hu8d4PqDw5SeVb4KcVufxyDOi2+XGTJoMcefuAM8XE+cDkvlPzC1tMTH7imvXbzEWjPAynuP9wbG+4Kv4s4NoukC/2Y5zYgqXL4zZNsTs3Bxv5CW23m6y+HoBr9+P6f4jXL4wzokp+s12oumCDnBIoxwdHtDZ0c5McJrj+glCiBYd10+YCU7T2dHO0eEBDmlUB4x5/bglF4qi6OHoMuLqFUQ2o/tsRvfRZYQQKIqCW3Ix5vXrgHk5hcFgaG7bTCBu3kCUS7ovl3S/mWhkDAYD83KqWaJTGv7rs8+TUxpulqj9EBj7LFRKhUZgZXUNVVWp1WqoqsrK6lpjVikVMPZZfgOcCjay+3R197CT3kYIQbFYJBAI4PP5CAQCFItFhBDspLfp6u5hI7vfegfJvEbvgBWb3UE8ts7eboWP+x/Y260Qj61jszvoHbCSzGsX/wU5VWY8FMHq8fNwaByrx894KIKcKrecegNwGf0Ct2pNhxxSF7EAAAAASUVORK5CYII=">reddit.com: Apple pushes Windows Safari via iTunes updater</A>
-<DD>
-        <DT><A HREF="http://reddit.com/" ADD_DATE="1206310259" LAST_MODIFIED="1206310259" ICON_URI="http://reddit.com/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAACDElEQVQ4jaWT3WuSYRjG9x/Uv9FR0UEHY+xwwg52kKyD3EcfmqROXyf7yiUaY7rhYodWrDHeJfvyVdcOHMLCRFAUZe/I0di7ik46CmHDxYLn18ELWtgWtIPr4OK++N0PF/fTVq3BZdRWrUFOq/+XLgTkP5/xrvqd2yYLFvdTQhGZBzYPZouVydkX/wbktDrhBYVB2wixTIFBxxPu9Zs4Oz2hu8d4PqDw5SeVb4KcVufxyDOi2+XGTJoMcefuAM8XE+cDkvlPzC1tMTH7imvXbzEWjPAynuP9wbG+4Kv4s4NoukC/2Y5zYgqXL4zZNsTs3Bxv5CW23m6y+HoBr9+P6f4jXL4wzokp+s12oumCDnBIoxwdHtDZ0c5McJrj+glCiBYd10+YCU7T2dHO0eEBDmlUB4x5/bglF4qi6OHoMuLqFUQ2o/tsRvfRZYQQKIqCW3Ix5vXrgHk5hcFgaG7bTCBu3kCUS7ovl3S/mWhkDAYD83KqWaJTGv7rs8+TUxpulqj9EBj7LFRKhUZgZXUNVVWp1WqoqsrK6lpjVikVMPZZfgOcCjay+3R197CT3kYIQbFYJBAI4PP5CAQCFItFhBDspLfp6u5hI7vfegfJvEbvgBWb3UE8ts7eboWP+x/Y260Qj61jszvoHbCSzGsX/wU5VWY8FMHq8fNwaByrx894KIKcKrecegNwGf0Ct2pNhxxSF7EAAAAASUVORK5CYII=">reddit.com: what&#39;s new online!</A>
-<DD>
-        <DT><A HREF="http://xkcd.com/399/" ADD_DATE="1207442147" LAST_MODIFIED="1207442147" ICON_URI="http://xkcd.com/static/favicon.ico" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAB5ElEQVQ4jYWTvYryQBSGT+UlbGdnQG1MGW8ggrcgiJ3lWIgTVBLRRlGSXhTRO9DeqxBMYSU2gpXYiM3zFZJxw+7yDQzze555550zYts2Wmt83ycMQ6IoIgxDfN9HKfVn1Vpj2zbieR4A8/kcETF1Pp/zv+J5HqK15na7ISKUSiWiKKJUKiEinE4nAGq1mgHXajUDaLVayGAwQGtNouQ7vdPpMJvNUspEhH6/nwYopYjjOAWI4xilFFEUISLMZjMTpJT6ALTWXC4XMpkMx+MRgOPxSCaT4XK50Ol0mE6nKXij0fgAWq0WAMPhMCVzOBwC0G638X3fBCulaLfbPwEAm80GEWGz2Zg513V/eOC67u8KLMtCRLAsyyhYLBZUq1UTXK1WWSwWaQ/u9zsiApBqr9crr9fLnJqoeTweH8B4PObr64vJZJICTCYTcrkcIsLz+SQMQ8Iw5Pl8IiKcz2e01u9nbDabJni5XBpIvV43yZRcAeBwOLDf79+ZmHjQ6/XIZrMAFAoFut2uMXK1WlEulymXy6zXazOfMrFYLNLr9QDodrsUi0WzsVKpsN1u2e12OI6TBiQpnMhLyvfxX33P8xDHcd7fUoQgCFBKEQQBIoJt22ZtNBoxGo0QEfL5PEEQYNs2/wB6OZwvN52TQwAAAABJRU5ErkJggg==">xkcd - A webcomic of romance, sarcasm, math, and language - By Randall Munroe</A>
-<DD>
-    </DL><p>
-</DL><p>
diff --git a/tools/htmlToXBel/tests/ie7-bookmarks.html b/tools/htmlToXBel/tests/ie7-bookmarks.html
deleted file mode 100644
index c4a55152..00000000
--- a/tools/htmlToXBel/tests/ie7-bookmarks.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<!DOCTYPE NETSCAPE-Bookmark-file-1>
-<!-- This is an automatically generated file.
-It will be read and overwritten.
-Do Not Edit! -->
-<TITLE>Bookmarks</TITLE>
-<H1>Bookmarks</H1>
-<DL><p>
-    <DT><H3 FOLDED ADD_DATE="1133958175">Links</H3>
-    <DL><p>
-        <DT><A HREF="http://go.microsoft.com/fwlink/?LinkId=53540" ADD_DATE="1133958190" LAST_VISIT="1217536174" LAST_MODIFIED="1162508300">Customize Links</A>
-        <DT><A HREF="http://www.microsoft.com/isapi/redir.dll?prd=ie&ar=hotmail" ADD_DATE="1133958190" LAST_VISIT="1217536174" LAST_MODIFIED="1133958190">Free Hotmail</A>
-        <DT><A HREF="http://go.microsoft.com/fwlink/?LinkId=30857&clcid=0x409" ADD_DATE="1133958178" LAST_VISIT="1217536174" LAST_MODIFIED="1133958178">Windows Marketplace</A>
-        <DT><A HREF="http://www.microsoft.com/isapi/redir.dll?prd=ie&ar=windowsmedia" ADD_DATE="1133958190" LAST_VISIT="1217536174" LAST_MODIFIED="1133958190">Windows Media</A>
-        <DT><A HREF="http://www.microsoft.com/isapi/redir.dll?prd=ie&ar=windows" ADD_DATE="1133958190" LAST_VISIT="1217536174" LAST_MODIFIED="1133958190">Windows</A>
-    </DL><p>
-    <DT><H3 FOLDED ADD_DATE="1162508299">Microsoft Websites</H3>
-    <DL><p>
-        <DT><A HREF="http://go.microsoft.com/fwlink/?LinkId=50893" ADD_DATE="1162508300" LAST_VISIT="1217536174" LAST_MODIFIED="1162508300">IE Add-on site</A>
-        <DT><A HREF="http://go.microsoft.com/fwlink/?linkid=44661" ADD_DATE="1162508300" LAST_VISIT="1217536174" LAST_MODIFIED="1162508300">IE site on Microsoft.com</A>
-        <DT><A HREF="http://go.microsoft.com/fwlink/?linkid=69151" ADD_DATE="1162508300" LAST_VISIT="1217536174" LAST_MODIFIED="1162508300">Marketplace</A>
-        <DT><A HREF="http://go.microsoft.com/fwlink/?linkid=55424" ADD_DATE="1162508300" LAST_VISIT="1217536174" LAST_MODIFIED="1162508300">Microsoft At Home</A>
-        <DT><A HREF="http://go.microsoft.com/fwlink/?linkid=68920" ADD_DATE="1162508300" LAST_VISIT="1217536174" LAST_MODIFIED="1162508300">Microsoft At Work</A>
-        <DT><A HREF="http://go.microsoft.com/fwlink/?linkid=68919" ADD_DATE="1162508299" LAST_VISIT="1217536174" LAST_MODIFIED="1162508300">Welcome to IE7</A>
-    </DL><p>
-    <DT><H3 FOLDED ADD_DATE="1197407748">Yahoo!</H3>
-    <DL><p>
-    </DL><p>
-    <DT><A HREF="http://www.microsoft.com/isapi/redir.dll?prd=ie&pver=6&ar=IStart" ADD_DATE="1133958189" LAST_VISIT="1217536175" LAST_MODIFIED="1133958189">MSN.com</A>
-    <DT><A HREF="http://www.microsoft.com/isapi/redir.dll?prd=windows&sbp=mediaplayer&plcid=&pver=6.1&os=&over=&olcid=&clcid=&ar=Media&sba=RadioBar&o1=&o2=&o3=" ADD_DATE="1133958189" LAST_VISIT="1217536175" LAST_MODIFIED="1133958189">Radio Station Guide</A>
-</DL><p>
diff --git a/tools/htmlToXBel/tests/opera9-bookmarks.html b/tools/htmlToXBel/tests/opera9-bookmarks.html
deleted file mode 100644
index 5cf7b85f..00000000
--- a/tools/htmlToXBel/tests/opera9-bookmarks.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE NETSCAPE-Bookmark-file-1>
-<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
-<!--This is an automatically generated file.
-It will be read and overwritten.
-Do Not Edit! -->
-<TITLE>Bookmarks</TITLE>
-<H1>Bookmarks</H1>
-<DL><P>
-    <DT><H3 ADD_DATE="0">Opera</H3>
-    <DL><P>
-        <DT><A HREF="http://www.opera.com/download/" ADD_DATE="0" LAST_VISITED="1198393927">Download Opera</A>
-        <DT><A HREF="http://my.opera.com/" ADD_DATE="0" LAST_VISITED="0">Opera Community</A>
-        <DT><A HREF="http://www.operamail.com/" ADD_DATE="0" LAST_VISITED="0">Opera Web Mail</A>
-        <DT><A HREF="http://www.opera.com/support/" ADD_DATE="0" LAST_VISITED="0">Support Desk</A>
-    </DL><P>
-    <DT><A HREF="http://www.download.com/" ADD_DATE="0" LAST_VISITED="0">Download.com</A>
-    <DT><A HREF="http://www.amazon.com/exec/obidos/redirect-home/opera-20" ADD_DATE="0" LAST_VISITED="0">Amazon.com</A>
-    <DT><A HREF="http://www.ebay.com/" ADD_DATE="0" LAST_VISITED="0">eBay</A>
-    <DT><A HREF="http://yahoo.opera.com/search" ADD_DATE="0" LAST_VISITED="0">Yahoo!</A>
-</DL><P>
diff --git a/tools/placesimport/CMakeLists.txt b/tools/placesimport/CMakeLists.txt
index d954e8ee..980e4936 100644
--- a/tools/placesimport/CMakeLists.txt
+++ b/tools/placesimport/CMakeLists.txt
@@ -1,23 +1,30 @@
 project(endorphin-placesimport)
+include(GNUInstallDirs)
 find_package(Qt5Core REQUIRED)
 find_package(Qt5Widgets REQUIRED)
 find_package(Qt5Sql REQUIRED)
-find_package(Qt5WebKit REQUIRED)
-find_package(Qt5WebKitWidgets REQUIRED)
+find_package(Qt5WebEngine REQUIRED)
+find_package(Qt5WebEngineWidgets REQUIRED)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/../../src ${CMAKE_CURRENT_SOURCE_DIR}/../../src/history ${CMAKE_CURRENT_SOURCE_DIR}/../../src/utils)
 add_definitions(-DNO_BROWSERAPPLICATION)
 set(placesimport_SRCS
 	main_placesimport.cpp
 	../../src/autosaver.cpp
+	../../src/clearbutton.cpp
+	../../src/searchbutton.cpp
 	../../src/modelmenu.cpp
+	../../src/searchlineedit.cpp
 	../../src/history/history.cpp
 	../../src/history/historymanager.cpp
+	../../src/utils/edittreeview.cpp
+	../../src/utils/lineedit.cpp
 	../../src/utils/singleapplication.cpp
+	../../src/utils/treesortfilterproxymodel.cpp
 )
 
-add_executable(endorphin-placesimport ${placesimport_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS})
-qt5_use_modules(endorphin-placesimport Core)
-qt5_use_modules(endorphin-placesimport Widgets)
-qt5_use_modules(endorphin-placesimport Sql)
-qt5_use_modules(endorphin-placesimport WebKit)
-qt5_use_modules(endorphin-placesimport WebKitWidgets)
+add_executable(endorphin-placesimport ${placesimport_SRCS})
+target_link_libraries(endorphin-placesimport Qt5::Core Qt5::Widgets Qt5::Sql Qt5::WebEngine Qt5::WebEngineWidgets)
+
+install(TARGETS endorphin-placesimport
+    DESTINATION ${CMAKE_INSTALL_BINDIR}
+)
diff --git a/tools/placesimport/main_placesimport.cpp b/tools/placesimport/main_placesimport.cpp
index 7e30f9e8..53961d08 100644
--- a/tools/placesimport/main_placesimport.cpp
+++ b/tools/placesimport/main_placesimport.cpp
@@ -1,6 +1,6 @@
 /*
  * Copyright 2008-2009 Benjamin K. Stuhl <bks24@cornell.edu>
- * Copyright 2009 Aaron Dewes <aaron.dewes@web.de>
+ * Copyright 2020 Aaron Dewes <aaron.dewes@web.de>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -18,14 +18,14 @@
  * Boston, MA  02110-1301  USA
  */
 
-#include <qdatetime.h>
-#include <qdebug.h>
-#include <qdir.h>
-#include <qfile.h>
+#include <QDateTime>
+#include <QDebug>
+#include <QDir>
+#include <QFile>
 #include <QSqlDatabase>
 #include <qsqlerror.h>
 #include <qsqlquery.h>
-#include <qtextstream.h>
+#include <QTextStream>
 #include <qvariant.h>
 
 #include "singleapplication.h"
@@ -42,8 +42,8 @@ static HistoryEntry formatEntry(QByteArray url, QByteArray title, qlonglong prda
 int main(int argc, char **argv)
 {
     SingleApplication application(argc, argv);
-    QCoreApplication::setOrganizationDomain(QLatin1String("aarondewes.github.io/endorphin/"));
-    QCoreApplication::setApplicationName(QLatin1String("Endorphin"));
+    QCoreApplication::setOrganizationDomain(QStringLiteral("EndorphinBrowser.gitlab.io/"));
+    QCoreApplication::setApplicationName(QStringLiteral("Endorphin"));
 
     if (application.sendMessage(QByteArray())) {
         qWarning() << "To prevent the loss of any history please exit Endorphin while this is tool is being run";
@@ -54,8 +54,8 @@ int main(int argc, char **argv)
     args.takeFirst();
     if (args.isEmpty()) {
         QTextStream stream(stdout);
-        stream << "endorphin-placesimport is a tool for importing browser history from Firefox 3 and up" << endl;
-        stream << "endorphin-placesinfo ~/.mozilla/firefox/[profile-dir]/places.sqlite" << endl;
+        stream << "endorphin-placesimport is a tool for importing browser history from Firefox 3 and up" << Qt::endl;
+        stream << "endorphin-placesinfo ~/.mozilla/firefox/[profile-dir]/places.sqlite" << Qt::endl;
         return 0;
     }
 
diff --git a/tools/placesimport/placesimport.pro b/tools/placesimport/placesimport.pro
deleted file mode 100644
index 7998a518..00000000
--- a/tools/placesimport/placesimport.pro
+++ /dev/null
@@ -1,30 +0,0 @@
-TEMPLATE = app
-TARGET = endorphin-placesimport
-DEPENDPATH += .
-INCLUDEPATH += .
-
-win32|os2: CONFIG += console
-mac:CONFIG -= app_bundle
-
-QT += sql
-
-# Input
-SOURCES += main_placesimport.cpp
-
-include(../../install.pri)
-# This can be improved to just include the history manager and utility classes
-# once the history classes are separated out into individual files.
-include(../../src/src.pri)
-
-!mac {
-unix {
-    INSTALLS += man man-compress
-
-    man.path = $$DATADIR/man/man1
-    man.files += data/endorphin-placesimport.1
-
-    man-compress.path = $$DATADIR/man/man1
-    man-compress.extra = "" "gzip -9 -f \$(INSTALL_ROOT)/$$DATADIR/man/man1/endorphin-placesimport.1" ""
-    man-compress.depends = install_man
-}
-}
diff --git a/tools/tools.pro b/tools/tools.pro
deleted file mode 100644
index 428f211c..00000000
--- a/tools/tools.pro
+++ /dev/null
@@ -1,4 +0,0 @@
-TEMPLATE = subdirs
-SUBDIRS  = cacheinfo htmlToXBel placesimport
-
-CONFIG += ordered
diff --git a/ts_lst_file b/ts_lst_file
new file mode 100644
index 00000000..007faa3c
--- /dev/null
+++ b/ts_lst_file
@@ -0,0 +1,74 @@
+-Isrc/utils
+-Isrc/useragent
+-Isrc/opensearch
+-Isrc/locationbar
+-Isrc/htmls
+-Isrc/history
+-Isrc/data
+-Isrc/bookmarks/xbel
+-Isrc/bookmarks
+-Itools/cacheinfo
+-Itools/placesimport
+-Itools/htmlToXBel
+tools/cacheinfo/main.cpp
+tools/placesimport/main_placesimport.cpp
+tools/htmlToXBel/mainapp.cpp
+tools/htmlToXBel/main.cpp
+src/modeltoolbar.cpp
+src/main.cpp
+src/browsermainwindow.cpp
+src/modelmenu.cpp
+src/searchlineedit.cpp
+src/opensearch/opensearchenginemodel.cpp
+src/opensearch/opensearchengine.cpp
+src/opensearch/opensearchmanager.cpp
+src/opensearch/opensearchengineaction.cpp
+src/opensearch/opensearchreader.cpp
+src/opensearch/opensearchwriter.cpp
+src/opensearch/opensearchenginedelegate.cpp
+src/opensearch/opensearchdialog.cpp
+src/webactionmapper.cpp
+src/webviewsearch.cpp
+src/plaintexteditsearch.cpp
+src/clearprivatedata.cpp
+src/acceptlanguagedialog.cpp
+src/settings.cpp
+src/browserapplication.cpp
+src/webview.cpp
+src/webpage.cpp
+src/locationcompleter.cpp
+src/useragent/useragentmenu.cpp
+src/searchbutton.cpp
+src/tabwidget.cpp
+src/bookmarks/bookmarkstoolbar.cpp
+src/bookmarks/bookmarksmanager.cpp
+src/bookmarks/bookmarknode.cpp
+src/bookmarks/bookmarksdialog.cpp
+src/bookmarks/addbookmarkdialog.cpp
+src/bookmarks/xbel/xbelreader.cpp
+src/bookmarks/xbel/xbelwriter.cpp
+src/bookmarks/bookmarksmodel.cpp
+src/bookmarks/bookmarksmenu.cpp
+src/tabbar.cpp
+src/permissionbar.cpp
+src/devtoolswindow.cpp
+src/aboutdialog.cpp
+src/history/historymanager.cpp
+src/history/history.cpp
+src/searchbar.cpp
+src/toolbarsearch.cpp
+src/autosaver.cpp
+src/downloadmanager.cpp
+src/locationbar/locationbarsiteicon.cpp
+src/locationbar/privacyindicator.cpp
+src/locationbar/locationbar.cpp
+src/utils/languagemanager.cpp
+src/utils/editlistview.cpp
+src/utils/explorerstyle.cpp
+src/utils/edittreeview.cpp
+src/utils/lineedit.cpp
+src/utils/squeezelabel.cpp
+src/utils/singleapplication.cpp
+src/utils/edittableview.cpp
+src/utils/treesortfilterproxymodel.cpp
+src/clearbutton.cpp
diff --git a/webkittrunk.pri b/webkittrunk.pri
deleted file mode 100644
index d1974af1..00000000
--- a/webkittrunk.pri
+++ /dev/null
@@ -1,47 +0,0 @@
-# To build Endorphin against WebKit trunk:
-#   export QT_WEBKIT=webkit_trunk
-#   export WEBKITDIR=$HOME/dev/webkit
-#
-# Optional:
-#   export WEBKITOUTPUTDIR=$HOME/build/webkit
-#   export WEBKITBRANCH=some_cool_git_branch_of_webkit
-#
-CONFIG += $$(QT_WEBKIT)
-webkit_trunk {
-    WEBKITDIR = $$(WEBKITDIR)
-    isEmpty(WEBKITDIR): error(Please point WEBKITDIR at the root of your WebKit source tree)
-
-    OUTPUT_DIR = $$(WEBKITOUTPUTDIR)
-    isEmpty(OUTPUT_DIR): OUTPUT_DIR = $$WEBKITDIR/WebKitBuild
-
-    WEBKITBRANCH = $$(WEBKITBRANCH)
-    !isEmpty(WEBKITBRANCH) {
-        OUTPUT_DIR = $$OUTPUT_DIR/$$WEBKITBRANCH
-    }
-
-    # When building in debug try to link to the debug version of webkit
-    # and vice versa in release, but when they can not be paired up
-    # because webkit only has release or debug libs fall back to the other one
-    CONFIG(debug) {
-        exists($$OUTPUT_DIR/Debug) {
-            OUTPUT_DIR = $$OUTPUT_DIR/Debug
-        } else {
-            OUTPUT_DIR = $$OUTPUT_DIR/Release
-        }
-    } else:CONFIG(release) {
-        exists($$OUTPUT_DIR/Release) {
-            OUTPUT_DIR = $$OUTPUT_DIR/Release
-        } else {
-            OUTPUT_DIR = $$OUTPUT_DIR/Debug
-        }
-    }
-
-    message(Using WebKit Trunk at $$WEBKITDIR)
-    message(Using WebKit Build at $$OUTPUT_DIR)
-
-    QT -= webkit
-    DEFINES += WEBKIT_TRUNK
-    include($$WEBKITDIR/WebKit.pri)
-    QMAKE_RPATHDIR = $$OUTPUT_DIR/lib $$QMAKE_RPATHDIR
-}
-