From ee8dd96ddc4b27d919cd7465a43db826ffc1e327 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 22 Mar 2016 13:45:51 +0100
Subject: [PATCH 01/31] Some very initial and hugely experimental porting to
 QtWebEngine modules.

---
 CMakeLists.txt                                | 308 +++++-------------
 .../executable_properties/rssguard_os2.rc.in  |   1 -
 resources/graphics/rssguard_os2.ico           | Bin 5604 -> 0 bytes
 src/gui/feedmessageviewer.cpp                 |   5 +-
 src/miscellaneous/settings.cpp                |   9 +-
 src/network-web/adblock/adblockicon.cpp       |   4 +-
 src/network-web/adblock/adblockmanager.cpp    |   4 +-
 src/network-web/adblock/adblockrule.cpp       |  19 +-
 .../adblock/adblocksubscription.cpp           |   2 +-
 src/network-web/downloadmanager.cpp           |   6 +-
 src/network-web/webbrowser.cpp                |  25 +-
 src/network-web/webbrowser.h                  |   5 +-
 src/network-web/webfactory.cpp                |  18 +-
 src/network-web/webfactory.h                  |   4 +-
 src/network-web/webpage.cpp                   | 121 +------
 src/network-web/webpage.h                     |  11 +-
 src/network-web/webview.cpp                   | 102 ++----
 src/network-web/webview.h                     |   4 +-
 18 files changed, 157 insertions(+), 491 deletions(-)
 delete mode 100644 resources/executable_properties/rssguard_os2.rc.in
 delete mode 100644 resources/graphics/rssguard_os2.ico

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1f1a7987..8734b354c 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@
 #
 # This file is part of RSS Guard.
 #
-# Copyright (C) 2011-2015 by Martin Rotter <rotter.martinos@gmail.com>
+# Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
 #
 # RSS Guard is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -25,22 +25,15 @@
 #
 # Usage:
 #   a) DEBUG build for testing.
-#     cmake -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT_5=ON
+#     cmake -DCMAKE_BUILD_TYPE=debug -DCMAKE_INSTALL_PREFIX=/usr
 #
 #   b) RELEASE build for production use.
-#     cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr -DUSE_QT_5=ON
+#     cmake -DCMAKE_BUILD_TYPE=release -DCMAKE_INSTALL_PREFIX=/usr
 #
 # Arguments:
 #   -DCMAKE_INSTALL_PREFIX=/usr
 #     Installation path, replace with something like "C:\rssguard" on Windows.
 #
-#   -DUSE_QT_5=OFF
-#     Specifies which major Qt version to use. Qt 4 and Qt 5 are supported.
-#     If "OFF" is passed as an argument, then Qt 4 is used. Default is "OFF".
-#
-#   -DENABLE_OS2_RC=OFF
-#     If "ON" then icon is compiled into executable file on OS/2. Defaults to "OFF".
-#
 # Refreshing translation sources:
 #   make lupdate
 #
@@ -52,7 +45,7 @@
 #
 # Other information:
 #   - supports Windows, Linux, OS/2 (eComStation),
-#   - Qt 4.7.3 and higher is required,
+#   - Qt 5.6 and higher is required,
 #   - resource compiler (windres.exe) is needed on MinGW,
 #   - resource compiler (rc.exe) is recommended on OS/2.
 #
@@ -77,7 +70,7 @@ set(APP_URL_ISSUES_NEW_GITHUB "https://github.com/martinrotter/rssguard/issues/n
 set(APP_URL_ISSUES_NEW_BITBUCKET "http://bitbucket.org/skunkos/rssguard/issues/new")
 set(APP_URL_WIKI "https://bitbucket.org/skunkos/rssguard/wiki/Home")
 set(APP_EMAIL "rotter.martinos@gmail.com")
-set(MINIMUM_QT_VERSION 4.7.3)
+set(MINIMUM_QT_VERSION 5.6)
 set(EXE_NAME ${APP_LOW_NAME})
 
 if(APPLE)
@@ -85,13 +78,8 @@ if(APPLE)
 endif(APPLE)
 
 # Options declaration.
-option(USE_QT_5 "Use Qt 5 for building" OFF)
 option(ENABLE_ADDITIONAL_ICONS "Install additional icons" ON)
 
-if(OS2)
-  option(ENABLE_OS2_RC "Compile application icon on OS/2" OFF)
-endif(OS2)
-
 if(WIN32)
   option(USE_NSIS "Use NSIS generator to produce installer" OFF)
 endif(WIN32)
@@ -101,27 +89,16 @@ if(POLICY CMP0012)
   cmake_policy(SET CMP0012 NEW)
 endif()
 
-if(USE_QT_5)
-  cmake_minimum_required(VERSION 2.8.10)
-else(USE_QT_5)
-  cmake_minimum_required(VERSION 2.6.0)
-endif(USE_QT_5)
+if(POLICY CMP0054)
+  cmake_policy(SET CMP0054 NEW)
+endif()
 
-if(${APPLE})
-  if(NOT USE_QT_5)
-    message(FATAL_ERROR "[${APP_LOW_NAME}] Only Qt 5.x.x is supported on Mac OS X.")
-  endif(NOT USE_QT_5)
-endif(${APPLE})
+cmake_minimum_required(VERSION 2.8.10)
 
 message(STATUS "")
 message(STATUS "[${APP_LOW_NAME}] ==== Options summary ====")
-message(STATUS "[${APP_LOW_NAME}] Use Qt 5 for building -> ${USE_QT_5}")
 message(STATUS "[${APP_LOW_NAME}] Install additional icons -> ${ENABLE_ADDITIONAL_ICONS}")
 
-if(OS2)
-  message(STATUS "[${APP_LOW_NAME}] Compile application icon on OS/2 -> ${ENABLE_OS2_RC}")
-endif(OS2)
-
 if(WIN32)
   message(STATUS "[${APP_LOW_NAME}] Use NSIS generator to produce installer -> ${USE_NSIS}")
 endif(WIN32)
@@ -148,15 +125,10 @@ if(POLICY CMP0020)
   cmake_policy(SET CMP0020 NEW)
 endif(POLICY CMP0020)
 
-# Select which Qt version to use.
-if(USE_QT_5)
-  message(STATUS "[${APP_LOW_NAME}] Using Qt 5 library for building.")
-  
-  # Instruct CMake to run moc automatically when needed.
-  set(CMAKE_AUTOMOC ON)
-else(USE_QT_5)
-  message(STATUS "[${APP_LOW_NAME}] Using Qt 4 library for building.")
-endif(USE_QT_5)
+message(STATUS "[${APP_LOW_NAME}] Using Qt 5 library for building.")
+
+# Instruct CMake to run moc automatically when needed.
+set(CMAKE_AUTOMOC ON)
 
 # Obtain revision number if available.
 message(STATUS "[${APP_LOW_NAME}] Obtaining revision number.")
@@ -230,61 +202,37 @@ add_definitions(-DUNICODE -D_UNICODE)
 
 # Check for C++ 11 features availability.
 # See http://stackoverflow.com/questions/10984442/how-to-detect-c11-support-of-a-compiler-with-cmake
-if(USE_QT_5)
-  if("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-    execute_process(
-      COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION
-    )
-
-    if(${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
-      add_definitions(-std=c++11)
-    elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
-      add_definitions(-std=gnu++0x)
-    else(${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
-      message(FATAL_ERROR "[${APP_LOW_NAME}] Your C++ compiler does not support C++ 11.")
-    endif(${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
-
-  elseif("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
-    add_definitions(-std=c++11 -stdlib=libc++)
-  elseif(${MSVC_VERSION} VERSION_LESS 1600)
+if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
+  execute_process(
+    COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION
+  )
+  if(${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
+    add_definitions(-std=c++11)
+  elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
+    add_definitions(-std=gnu++0x)
+  else(${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
     message(FATAL_ERROR "[${APP_LOW_NAME}] Your C++ compiler does not support C++ 11.")
-  endif("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
-endif(USE_QT_5)
+  endif(${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
+
+elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
+  add_definitions(-std=c++11 -stdlib=libc++)
+elseif(${MSVC_VERSION} VERSION_LESS 1600)
+  message(FATAL_ERROR "[${APP_LOW_NAME}] Your C++ compiler does not support C++ 11.")
+endif(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
 
 # Setup libraries.
 if(UNIX)
   # On Unices, enable D-Bus support.
-  if(USE_QT_5)
-    find_package(Qt5 REQUIRED DBus Sql WebKit WebKitWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
-  else(USE_QT_5)
-    set(QT_MIN_VERSION ${MINIMUM_QT_VERSION})
-    find_package(Qt4 REQUIRED QtDBus QtCore QtGui QtSql QtNetwork QtWebkit QtXml QtXmlPatterns)
-    include(${QT_USE_FILE})
-  endif(USE_QT_5)
+  find_package(Qt5 REQUIRED DBus Sql WebEngineWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
 else(UNIX)
-  if(USE_QT_5)
-    find_package(Qt5 REQUIRED Sql WebKit WebKitWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
-  else(USE_QT_5)
-    set(QT_MIN_VERSION ${MINIMUM_QT_VERSION})
-    find_package(Qt4 REQUIRED QtCore QtGui QtSql QtNetwork QtWebkit QtXml QtXmlPatterns)
-    include(${QT_USE_FILE})
-  endif(USE_QT_5)
+  find_package(Qt5 REQUIRED Sql WebEngineWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
 endif(UNIX)
 
 # Configure QStringBuilder behavior.
-if(USE_QT_5)
-  message(STATUS "[${APP_LOW_NAME}] Enabling fast QString concatenation.")
+message(STATUS "[${APP_LOW_NAME}] Enabling fast QString concatenation.")
 
-  add_definitions(-DQT_USE_FAST_CONCATENATION)
-  add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
-elseif(NOT ${QTVERSION} VERSION_LESS 4.8.0)
-  message(STATUS "[${APP_LOW_NAME}] Enabling fast QString concatenation.")
-
-  add_definitions(-DQT_USE_FAST_CONCATENATION)
-  add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
-else(NOT ${QTVERSION} VERSION_LESS 4.8.0)
-  message(STATUS "[${APP_LOW_NAME}] Disabling fast QString concatenation.")
-endif(USE_QT_5)
+add_definitions(-DQT_USE_FAST_CONCATENATION)
+add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
 
 # Configure executable "properties" for Windows or OS2.
 if(WIN32)
@@ -293,12 +241,6 @@ if(WIN32)
     ${PROJECT_SOURCE_DIR}/resources/executable_properties/rssguard_win.rc.in
     ${CMAKE_BINARY_DIR}/resources/executable_properties/rssguard_win.rc
   )
-elseif(OS2 AND ENABLE_OS2_RC)
-  message(STATUS "[${APP_LOW_NAME}] Generating executable file properties for OS2.")
-  configure_file (
-    ${PROJECT_SOURCE_DIR}/resources/executable_properties/rssguard_os2.rc.in
-    ${CMAKE_BINARY_DIR}/resources/executable_properties/rssguard_os2.rc
-  )
 endif(WIN32)
 
 # Set special linker flag for Windows XP & MSVC++ 2013 support.
@@ -318,21 +260,6 @@ if(WIN32 AND MINGW)
   set(APP_SOURCES
       ${APP_SOURCES}
       ${CMAKE_BINARY_DIR}/resources/executable_properties/rssguard_win.rc)
-elseif(OS2)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Zstack 0x2000 -Zlinker \"DISABLE 1121\" -s -Zlinker /PM:PM -Zno-fork -Zhigh-mem -Zmap")
-
-  if(${ENABLE_OS2_RC})
-    enable_language(RC)
-    set(CMAKE_RC_COMPILER_INIT rc)
-    message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for OS2.")
-    message(STATUS "[${APP_LOW_NAME}] Used tool is: ${CMAKE_RC_COMPILER}")
-    set(CMAKE_RC_COMPILE_OBJECT
-        "<CMAKE_RC_COMPILER> -n -r <SOURCE> <OBJECT>")
-
-    set(APP_SOURCES
-        ${APP_SOURCES}
-        ${CMAKE_BINARY_DIR}/resources/executable_properties/rssguard_os2.rc)
-  endif(${ENABLE_OS2_RC})
 elseif(WIN32 AND MSVC)
   # MSVC takes care of this automatically - no need to use windres.exe
   # for MSVC compilers.
@@ -419,15 +346,6 @@ file( GLOB APP_TEXT
   "resources/text/C*")
 
 if(WIN32)
-  file( GLOB APP_DLLS_QT4_MSVC2013
-    "resources/binaries/windows/qt4-msvc2013/*.dll")
-
-  file( GLOB APP_DLLS_QT4_MSVC2013_IMAGEFORMATS
-    "resources/binaries/windows/qt4-msvc2013/imageformats/*.dll")
-
-  file( GLOB APP_DLLS_QT4_MSVC2013_SQLDRIVERS
-    "resources/binaries/windows/qt4-msvc2013/sqldrivers/*.dll")
-
   file( GLOB APP_DLLS_QT5_MSVC2013
     "resources/binaries/windows/qt5-msvc2013/*.dll")
 
@@ -450,23 +368,15 @@ if(APPLE)
 endif(APPLE)
 
 # Wrap files, create moc files.
-if(USE_QT_5)
-  qt5_wrap_ui(APP_UI ${APP_FORMS})
-  
-  # Load translations.
-  if(${Qt5LinguistTools_FOUND})
-    message(STATUS "[${APP_LOW_NAME}] Qt Linguist Tools found. Translations will get compiled.")
-    qt5_add_translation(APP_QM ${APP_TRANSLATIONS})
-  else(${Qt5LinguistTools_FOUND})
-    message(STATUS "[${APP_LOW_NAME}] Qt Linguist Tools NOT found. No compilation for translations.")
-  endif(${Qt5LinguistTools_FOUND})
-else(USE_QT_5)
-  qt4_wrap_cpp(APP_MOC ${APP_HEADERS})
-  qt4_wrap_ui(APP_UI ${APP_FORMS})
-  
-  # Load translations.
-  qt4_add_translation(APP_QM ${APP_TRANSLATIONS})
-endif(USE_QT_5)
+qt5_wrap_ui(APP_UI ${APP_FORMS})
+
+# Load translations.
+if(${Qt5LinguistTools_FOUND})
+  message(STATUS "[${APP_LOW_NAME}] Qt Linguist Tools found. Translations will get compiled.")
+  qt5_add_translation(APP_QM ${APP_TRANSLATIONS})
+else(${Qt5LinguistTools_FOUND})
+  message(STATUS "[${APP_LOW_NAME}] Qt Linguist Tools NOT found. No compilation for translations.")
+endif(${Qt5LinguistTools_FOUND})
 
 # Include additional directory paths.
 include_directories (
@@ -481,99 +391,55 @@ include_directories (
 )
 
 # Compile "rssguard"
-if(USE_QT_5)
-  add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE
-    ${APP_SOURCES}
-    ${APP_FORMS}
-    ${APP_RCC}
-    ${APP_QM}
-  )
+add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE
+  ${APP_SOURCES}
+  ${APP_FORMS}
+  ${APP_RCC}
+  ${APP_QM}
+)
 
-  if(WIN32)
-    target_link_libraries(${EXE_NAME} Qt5::WinMain)
-  endif(WIN32)
+if(WIN32)
+  target_link_libraries(${EXE_NAME} Qt5::WinMain)
+endif(WIN32)
 
-  if(UNIX)
-    # Use modules from Qt.
-    qt5_use_modules(${EXE_NAME}
-      DBus
-      Core
-      Widgets
-      Sql
-      Network
-      Xml
-      WebKit
-      WebKitWidgets
-      PrintSupport
-    )
-  else(UNIX)
+if(UNIX)
   # Use modules from Qt.
-    qt5_use_modules(${EXE_NAME}
-      Core
-      Widgets
-      Sql
-      Network
-      Xml
-      WebKit
-      WebKitWidgets
-      PrintSupport
-    )
-  endif(UNIX)
-# Setup compilation for Qt 4.
-else(USE_QT_5)
-  add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE
-    ${APP_SOURCES}
-    ${APP_FORMS}
-    ${APP_MOC}
-    ${APP_RCC}
-    ${APP_QM}
+  qt5_use_modules(${EXE_NAME}
+    DBus
+    Core
+    Widgets
+    Sql
+    Network
+    Xml
+    WebEngineWidgets
+    PrintSupport
   )
-
-  if(UNIX)
-    # Link modules from Qt.
-    target_link_libraries(${EXE_NAME}
-      ${QT_QTDBUS_LIBRARY}
-      ${QT_QTCORE_LIBRARY}
-      ${QT_QTGUI_LIBRARY}
-      ${QT_QTNETWORK_LIBRARY}
-      ${QT_QTSQL_LIBRARY}
-      ${QT_QTXML_LIBRARY}
-      ${QT_QTMAIN_LIBRARY}
-      ${QT_QTWEBKIT_LIBRARY}
-    )
-  else(UNIX)
-    # Link modules from Qt.
-    target_link_libraries(${EXE_NAME}
-      ${QT_QTCORE_LIBRARY}
-      ${QT_QTGUI_LIBRARY}
-      ${QT_QTNETWORK_LIBRARY}
-      ${QT_QTSQL_LIBRARY}
-      ${QT_QTXML_LIBRARY}
-      ${QT_QTMAIN_LIBRARY}
-      ${QT_QTWEBKIT_LIBRARY}
-    )
-  endif(UNIX)
-endif(USE_QT_5)
+else(UNIX)
+# Use modules from Qt.
+  qt5_use_modules(${EXE_NAME}
+    Core
+    Widgets
+    Sql
+    Network
+    Xml
+    WebEngineWidgets
+    PrintSupport
+  )
+endif(UNIX)
 
 # Installation stage.
-if(WIN32 OR OS2)
+if(WIN32)
   message(STATUS "[${APP_LOW_NAME}] You will probably install on Windows or OS/2.")
   install(TARGETS ${EXE_NAME} RUNTIME DESTINATION ./)
 
   # Copy DLLs and other binary files for main installation.
-  if(WIN32 AND USE_QT_5)
+  if(WIN32)
     install(FILES ${APP_DLLS_QT5_MSVC2013} DESTINATION ./)
     install(FILES ${APP_DLLS_QT5_MSVC2013_IMAGEFORMATS} DESTINATION ./imageformats)
     install(FILES ${APP_DLLS_QT5_MSVC2013_SQLDRIVERS} DESTINATION ./sqldrivers)
     install(FILES ${APP_DLLS_QT5_MSVC2013_PLATFORMS} DESTINATION ./platforms)
     install(FILES ${APP_DLLS_QT5_MSVC2013_PRINTSUPPORT} DESTINATION ./printsupport)
-  endif(WIN32 AND USE_QT_5)
-
-  if(WIN32 AND NOT USE_QT_5)
-    install(FILES ${APP_DLLS_QT4_MSVC2013} DESTINATION ./)
-    install(FILES ${APP_DLLS_QT4_MSVC2013_IMAGEFORMATS} DESTINATION ./imageformats)
-    install(FILES ${APP_DLLS_QT4_MSVC2013_SQLDRIVERS} DESTINATION ./sqldrivers)
-  endif(WIN32 AND NOT USE_QT_5)
+  endif(WIN32)
 
   install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ./icons)
 
@@ -661,7 +527,7 @@ elseif(UNIX)
   install(FILES resources/graphics/${APP_LOW_NAME}_plain_128.png DESTINATION share/rssguard/icons RENAME ${APP_LOW_NAME}_plain.png)
   install(FILES ${APP_QM} DESTINATION share/${APP_LOW_NAME}/l10n)
   install(FILES ${APP_TEXT} DESTINATION share/${APP_LOW_NAME}/information)
-endif(WIN32 OR OS2)
+endif(WIN32)
 
 # Custom target for packaging.
 if(WIN32)
@@ -702,16 +568,8 @@ configure_file(
 add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
 # make lupdate implementation.
-if(USE_QT_5)
-  add_custom_target(lupdate
-    ${Qt5Core_QMAKE_EXECUTABLE} -project -o ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
-      COMMAND ${Qt5_LUPDATE_EXECUTABLE} -no-obsolete -ts ${APP_TRANSLATIONS_WO_QT} -pro ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-else(USE_QT_5)
-  add_custom_target(lupdate
-    ${QT_QMAKE_EXECUTABLE} -project -o ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
-      COMMAND ${QT_LUPDATE_EXECUTABLE} -no-obsolete -ts ${APP_TRANSLATIONS_WO_QT} -pro ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
-      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-  )
-endif(USE_QT_5)
+add_custom_target(lupdate
+  ${Qt5Core_QMAKE_EXECUTABLE} -project -o ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
+    COMMAND ${Qt5_LUPDATE_EXECUTABLE} -no-obsolete -ts ${APP_TRANSLATIONS_WO_QT} -pro ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+)
diff --git a/resources/executable_properties/rssguard_os2.rc.in b/resources/executable_properties/rssguard_os2.rc.in
deleted file mode 100644
index 4a8cf3ef1..000000000
--- a/resources/executable_properties/rssguard_os2.rc.in
+++ /dev/null
@@ -1 +0,0 @@
-ICON 1 DISCARDABLE "@PROJECT_SOURCE_DIR@/resources/graphics/rssguard_os2.ico" 
\ No newline at end of file
diff --git a/resources/graphics/rssguard_os2.ico b/resources/graphics/rssguard_os2.ico
deleted file mode 100644
index 3b017e99b5dd820954bce8568c09d82cfadd7932..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5604
zcmeH}cUTnX7RJA2=?jV#D@BbOBWtgSqBtU`%M1wE6MGVkB}R=cioGE!3aB8Why@E4
z6i`8|sFXzk7ZF6HZlAJPX!p$QvWtn{n<w|*EN59BX6O6OdB1bs^SOD55JIitCmKFo
z;oTG7IJ|lA^G{w44GqXmziKzWVO4fz9%}bb7XA00|3d-T5!e%iHo=?S(|<qzo(_$=
zAtO^H=!~o!kU$&uNYFIwkf3RFX1~k@PtfV}=*Sc3!bs4Oiw;JDzeY!%g)K5NM$NkO
z#$H1co*<9M$o&x-_Yh$Z5OyD7_Yig$VJQepM%W#M-9lIr!V(a6lZV|f!mjhNYsT0W
zV=T@DyKIVGG{Y{KW3lGgc?;~EC3e;lJ0rki1lZ}nM2v-VAfS0Io%r54M$;6$DKg|I
zMZQ(YrxJNrAfg-*rHFWkh!R8;Bcccqg@`CX#4AKdctoBNk;^Au7!%nhgxHkGG$S(1
ziDwqXQ%fSvl6Wj29$66&t%(QL#C>bxUX!>F&jV@z*VOlg$xH=*nv6G9iu|jPZzY;s
zfxLlRhVW8^mmvHt!rvgg2;r|0UV!j?gug_19uLnk!k_c;Y-2pj1kW(V)6MXw=J*o}
zJk1h+B)}gE@CR1-eQW%lHJ)mX-(`ci2MVzIw{o(Wnqxj&X*x@8JVRzQP0E`hMSdLJ
zM@t9vJC0t=(F-~HD}+mc&ckzg_zR9MZlpis=xG-CV=W!fRyuU5p386TWHmEKus~%o
zM`8AZ++?PVKV4=tRmy|J{UGs5<Wr8k%UI1>IwTHsNF3;pxRwry=NjQJxWvUKcqW(l
zGi~A=U6(jZCqQR5U*k4THnVeW7OAWkDg^Ts=5yqx-*fb7GUN~24P40jE3%6UkSHIC
zBuJEpydZI%?0m0Gz9`*T^vp!`#8i}K?xjndm7RE?-CvWoPOTT@wO*!fu~^ysC#BT_
zh2>l}akKAbgV&V*8u4!R@i(q(3QYaqaSy;18zk;k;xH$FO}J#!$=92r3O1gQxGhiS
zdA&fK?4Ik=x17w|9F+^P{%Cri+3{vxjj|JupxU9XOl_UoFUo7bifsF<s?`#e%_3#9
zAC*?~<#R(TN~Lr|eJw<lOu72VbF(QW2H8cW?i-4#tE(Ft>LBWC-mec%LZTdQ({n?w
z7HR+A&`?jQ<lZZ<8jBk1jYxw=gHAVX=hS)mOS^Ss$JOd~zp2_RQ`sz5^<Q6EP)c&v
zqWe`=R^hTDgY7bHwd3V;_LtPv)@Uz(c+V`{mWV{K-35H&W%R8Q{k<}26}B|qNTl8L
zr_gI=SS)bO+6%j^df7FAa@e5myjI;|m8#Wp)vVC+j~_qk?}a};eb6ipyoaV#>Z*Nm
z`GL4{NJsk}r9w7g#VsU)UMsZn%fFLeslWH_+mb;G5_n#Xy+&k!$$-(BcMx`8E9tp|
z`eqB+Wuw}Dy}I3M^^DMWoQC?l8>%(b{2h1r)2pD`(G;oeys~tOQh)iSq@dRi50Dq^
zd$Il8f>&=<`b$~QUpmf6MqW9(YA3|tZ@{(aDD1gG(t8ipYbV)b8`*6$>F@_RcuU!n
z9D`P{NJdunz$K5&W-FlDdDCRm_m{u_pckY*Choqq4-{1y5|v=<ifGMyJ@?YhN6ma5
zbDhprJMo;4UDa}XZIlT2QN8z&-|Z&9-9dKWN_N?#_CFwbkRegXWeU0UVOqwNO^GcQ
zR#+`in$J~qSX7xTR_Iq|Xmb9R1lCc(;=JB%h<e8r6??t5=3~I&1S8RNt;Mk>L*#<D
z!(_4OB<vj^>ARoqvyXJzO9H*uF0$u#NL)2!^K1V-&-`~j8n`;sc3G9S+ME9<4>(_0
zQ=_XWSo}$P_BV6VkgpV~z4`QaDOoc8BdL^fVpReXY2B4G8Sr-O25>Dq358oF1A^&(
z`>DP`q%e@BL*gKN_ia>{0Mc#)*=a3X?Y6(ES}#-1J65G24KivNYDHjz$<z|o+kLCX
z2b5Bb;cA9Bx7$qEcW}8zZ->c(C2F~Sw@U^crUwL5{SQ!m_fwEK(3{HMH9&2*UTwct
zx#(n7g+ilGr=h++Avvw<f(+wX3jPe4#mvg+6sf+*>uNs*Mcy`LCkPm9qqoCcgOMt*
z6Lc2#-zgaqMh`kn4Ln2*I7syadJs$3%Kj~zxY{{T9(+rtrVY6Oy`Z3A(%RdW^JErt
z6~?pVp4-cnO{AzOFLPghn=Q7c-VP%b20F(bxLY#pC_OZc8XQ8g^k5b(45FL@)&2J=
zJwj!huS>Iw)pd2XhD;k8VA)>+6WS~)ZT_<g>aEi+(!@+du{G4!#l)rBOnJdtT+@*X
z<p;+JfxW;^IC!tbIf5R3lp1=38WPH)CmpK{xK<vLQk9S`dn=`D8+}R7EiWtm{m@N^
z6~%2=s9P^pwOp(Sh^=Z`Z17Z~)k*9``)s5_?q%#rMqqDcCmb3i85v2Bh@hO0QNxZ>
zgF>k_SIR%W*LtrWrTe44t}gGTWZA*Q9_!xPttUJE&eq$kBULgrd|&sft@(89Y;wz4
z68>~~<4CRIyqz0uaE=15y>R$}eAg&uWF+NsoN^AQh8&^RU9YV9^r>+f!zZayUb*$a
zZ`a-LwpRAoPJzkTZ&3S$NDC`y!<QNw#LshwFT1BT8T~+SJjqlc_lIzXw6+&I2j`E8
zW?ZA_Q70&%4-2Q($A8wL;QwGC$q%2c3cEF8M{e&uYVf!3c9A`{tEWdu^Gm6wP?@yy
zr`-uQ3(H~CEn%R~mVb7V@t3g&NGq1>awvan3^OL09(|H_jiN>zr`BF8RV(F6g&bV{
z;WP2EODT&&?vB};(?3Yj_W%vm?i5J&*{fO}D}5_vnnE=Uy)P=sVQE3jCF&Nsk*a`d
zXHPP-WX5oknI`8=NMpGU!cigl<IXZ;V`#V2^q5n$>q*8ZqF`m@{hyCLnii7oelTx%
zaM|Dxa!@GSYtZJ<<8Gmfu+%@d)yEI-qpzg&`#rnEYLXqP%T+CZQQG{h)ShH4=D=A3
z=nB5*32>V^2wlVS$De1$ou#oe^w`t18=E*a@&x4)3AxiFjx)~TY_$&wqXvdhqr#Lc
z<D}_@s=C_G+6wA0Ha^v5Q%09fq<*B@t^kWu8BQ|nIZA0lJmpzCG;<V=IhyZrff;|E
zc0Wf0U6*(?Bu<ZtqDMqh!y~8>;c8Koe8Uaty?mwSy?zquG=|Y|DlXY|YbKaX&mAN?
zQa7<9wbL4P`;{v8B(qedlYN28-1nK5J2pIj!X?J@0__n?yPs##<6=mU)2fN5m6OlN
z=U<X;PO7?)A<ZvSfBaIBSCp3rMJKuJ$Z-m!^xocsoh+o|A8NaGYTZdjEBhj~U~0Ni
zGsotRLM$SGQXDhk676}B_P9WgJ5MjUQkt4qk@-eZSfN%@nwlEuDc#YcX%&6?_~B`W
zc-i5kp?iz_LB0LS+rePBlHl#1$-bOyJ~Q2@xnuJ#!f}!LqN~iLIC|n`8tCq^^tR;6
zI+pd-7j#x}adBAeZ9M47;9&Wn5c-SW&W_YS$-atgH7A45amSx{g<sc*uF#@5deUXu
z<08E+rSj94B!%aIqAe^eI(ao^&f$9_50?x(MuWvQ_4fWSS(=R0-rPvl$-WWh8fCjM
z)7Xa1*W=_XB3^@EqrI-uK=-^%??|nxZ8F*G>uRetOlfK9-N)&HXYb4kd+c`PEmXUU
z)?LFXsP<u;x3iN4hT0cLDkpol%~YqwnZ_*~ZMq6QPrdTKsUhMS{5k{liC5@95{iq8
zie4AJ5$C*2y8krtTI!aVyYnL+i^3&tQL-_o!DJY%$$-UyyXw6i64y?augU)HPTFC4
zrb$bdJ0bej<OGfP4aPg3Apm`y@sBN;cRK5b=<F${^6*oIo-q~U&#ByF8Fy&&b6lG@
znhelKMX~P6(jjq}EJyyU?0e{LE3-^nvD}HLU->3#Cf{UyZZbgEChm1jBf6%UbX7Cy
z3N!Jtq1yFrZZH|JxJGYh6aR|ru<7hcW*^;sbrWuq#y5ePoWP=ew23#$uHAHfwQJkl
zK-VVT=<WYo_5)1MwFa&qa1$8_Kx^p+*&FLkTkR7s(GxDxdb-YC|F-M{f|*|Hv&>q9
z&V44GdF^-mz2B{BHj=7+xtN?-JvpJ;=VrC{jcOtuLIb_ViVw=iX(nFQOt_@+yr}WG
zpcx;laX+WQ&T7V<(YVEE#zbpIpVF`c{RHC@$&83#hKDo5jxs}!FoQ#xL7~;XH)aF3
znO)D(`)+weKKF>sHpKDl@m#n^WV?rFk2}T&b~JnJ5wTmC*ez5%CR98+MC^K4JnE2m
zWU$!fpm@XqvGabh^FHzLK=H7>;-P!QLw1V??aCUsBWu9+tp3}w`fbhXyCtj7=IkCz
zu9~*&Y-D0;X=`WIzRMRw(7wy(;V5YDC}^h(%XW^2uywTL!ot>(jkbm`Z|i8@#t;DI
H@lE~%!Ix_b

diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 6d8b807d9..90285b22a 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -53,6 +53,7 @@
 #include <QThread>
 #include <QProgressBar>
 #include <QStatusBar>
+#include <QWebEngineSettings>
 #include <QPointer>
 
 
@@ -118,9 +119,9 @@ void FeedMessageViewer::loadSize() {
 
 void FeedMessageViewer::loadMessageViewerFonts() {
   const Settings *settings = qApp->settings();
-  QWebSettings *view_settings = m_messagesBrowser->view()->settings();
+  QWebEngineSettings *view_settings = m_messagesBrowser->view()->settings();
   
-  view_settings->setFontFamily(QWebSettings::StandardFont, settings->value(GROUP(Messages),
+  view_settings->setFontFamily(QWebEngineSettings::StandardFont, settings->value(GROUP(Messages),
                                                                            SETTING(Messages::PreviewerFontStandard)).toString());
 }
 
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index 5649dd6dd..e901730c0 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -23,7 +23,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QPointer>
-#include <QWebSettings>
+#include <QWebEngineSettings>
 #include <QLocale>
 
 
@@ -304,7 +304,7 @@ DKEY CategoriesExpandStates::ID                         = "categories_expand_sta
 Settings::Settings(const QString &file_name, Format format, const SettingsProperties::SettingsType &status, QObject *parent)
   : QSettings(file_name, format, parent), m_initializationStatus(status) {
   // Perform last-minute initializations.
-  Messages::PreviewerFontStandardDef = QWebSettings::globalSettings()->fontFamily(QWebSettings::StandardFont);
+  Messages::PreviewerFontStandardDef = QWebEngineSettings::globalSettings()->fontFamily(QWebEngineSettings::StandardFont);
 }
 
 Settings::~Settings() {  
@@ -357,11 +357,6 @@ Settings *Settings::setupSettings(QObject *parent) {
   // Portable settings are available, use them.
   new_settings = new Settings(properties.m_absoluteSettingsFileName, QSettings::IniFormat, properties.m_type, parent);
 
-  // Construct icon cache in the same path.
-  const QString web_path = properties.m_baseDirectory + QDir::separator() + QString(APP_DB_WEB_PATH);
-  QDir(web_path).mkpath(web_path);
-  QWebSettings::setIconDatabasePath(web_path);
-
   // Check if portable settings are available.
   if (properties.m_type == SettingsProperties::Portable) {
     qDebug("Initializing settings in '%s' (portable way).", qPrintable(QDir::toNativeSeparators(properties.m_absoluteSettingsFileName)));
diff --git a/src/network-web/adblock/adblockicon.cpp b/src/network-web/adblock/adblockicon.cpp
index 4d281c823..d138eea51 100755
--- a/src/network-web/adblock/adblockicon.cpp
+++ b/src/network-web/adblock/adblockicon.cpp
@@ -30,7 +30,7 @@
 
 #include <QMenu>
 #include <QMouseEvent>
-#include <QWebFrame>
+#include <QWebEnginePage>
 
 
 AdBlockIcon::AdBlockIcon(QWidget *window, QWidget *parent)
@@ -71,7 +71,7 @@ void AdBlockIcon::createMenu(QMenu *menu) {
   AdBlockCustomList *custom_list = manager->customList();
 
   WebPage *page = qApp->mainForm()->tabWidget()->currentWidget()->webBrowser()->view()->page();
-  const QUrl page_url = page->mainFrame()->url();
+  const QUrl page_url = page->url();
 
   menu->addAction(tr("Show Adblock &settings"), manager, SLOT(showDialog()));
   menu->addSeparator();
diff --git a/src/network-web/adblock/adblockmanager.cpp b/src/network-web/adblock/adblockmanager.cpp
index fcbe85c98..9cdea163f 100755
--- a/src/network-web/adblock/adblockmanager.cpp
+++ b/src/network-web/adblock/adblockmanager.cpp
@@ -34,7 +34,7 @@
 #include <QTextStream>
 #include <QDir>
 #include <QTimer>
-#include <QWebFrame>
+#include <QWebEnginePage>
 
 
 AdBlockManager *AdBlockManager::s_adBlockManager = NULL;
@@ -90,7 +90,7 @@ QNetworkReply *AdBlockManager::block(const QNetworkRequest &request) {
     WebPage *web_page = static_cast<WebPage*>(v.value<void*>());
 
     if (WebPage::isPointerSafeToUse(web_page)) {
-      if (!canBeBlocked(web_page->mainFrame()->url())) {
+      if (!canBeBlocked(web_page->url())) {
         return NULL;
       }
 
diff --git a/src/network-web/adblock/adblockrule.cpp b/src/network-web/adblock/adblockrule.cpp
index 5eaea3e98..e364c959e 100755
--- a/src/network-web/adblock/adblockrule.cpp
+++ b/src/network-web/adblock/adblockrule.cpp
@@ -56,8 +56,7 @@
 #include <QString>
 #include <QStringList>
 #include <QNetworkRequest>
-#include <QWebFrame>
-#include <QWebPage>
+#include <QWebEnginePage>
 
 
 AdBlockRule::AdBlockRule(const QString &filter, AdBlockSubscription* subscription)
@@ -289,21 +288,7 @@ bool AdBlockRule::matchObject(const QNetworkRequest &request) const {
 }
 
 bool AdBlockRule::matchSubdocument(const QNetworkRequest &request) const {
-  QWebFrame *originatingFrame = static_cast<QWebFrame*>(request.originatingObject());
-
-  if (originatingFrame == NULL) {
-    return false;
-  }
-
-  QWebPage *page = originatingFrame->page();
-
-  if (page == NULL) {
-    return false;
-  }
-
-  bool match = !(originatingFrame == page->mainFrame());
-
-  return hasException(SubdocumentOption) ? !match : match;
+  return false;
 }
 
 bool AdBlockRule::matchXmlHttpRequest(const QNetworkRequest &request) const {
diff --git a/src/network-web/adblock/adblocksubscription.cpp b/src/network-web/adblock/adblocksubscription.cpp
index 2006a5a9f..fa92b473d 100755
--- a/src/network-web/adblock/adblocksubscription.cpp
+++ b/src/network-web/adblock/adblocksubscription.cpp
@@ -57,7 +57,7 @@
 #include <QTimer>
 #include <QNetworkReply>
 #include <QDir>
-#include <QWebPage>
+#include <QWebEnginePage>
 
 
 AdBlockSubscription::AdBlockSubscription(const QString &title, QObject *parent)
diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp
index caac56e75..8f35a3047 100755
--- a/src/network-web/downloadmanager.cpp
+++ b/src/network-web/downloadmanager.cpp
@@ -38,7 +38,7 @@
 #include <QProcess>
 #include <QSettings>
 #include <QDebug>
-#include <QWebSettings>
+#include <QWebEngineSettings>
 
 
 DownloadItem::DownloadItem(bool is_direct_download, QNetworkReply *reply, QWidget *parent) : QWidget(parent),
@@ -603,14 +603,12 @@ void DownloadManager::updateRow(DownloadItem *item) {
 
   int old_height = m_ui->m_viewDownloads->rowHeight(row);
   m_ui->m_viewDownloads->setRowHeight(row, qMax(old_height, item->minimumSizeHint().height()));
-  QWebSettings *globalSettings = QWebSettings::globalSettings();
 
   // Remove the item if:
   // a) It is not downloading and private browsing is enabled.
   // OR
   // b) Item is already downloaded and it should be remove from downloader list.
-  bool remove = (!item->downloading() && globalSettings->testAttribute(QWebSettings::PrivateBrowsingEnabled)) ||
-                (item->downloadedSuccessfully() && removePolicy() == DownloadManager::OnSuccessfullDownload);
+  bool remove = item->downloadedSuccessfully() && removePolicy() == DownloadManager::OnSuccessfullDownload;
 
   if (remove) {
     m_model->removeRow(row);
diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp
index ad6443737..89f1695da 100755
--- a/src/network-web/webbrowser.cpp
+++ b/src/network-web/webbrowser.cpp
@@ -18,7 +18,6 @@
 #include "network-web/webbrowser.h"
 
 #include "definitions/definitions.h"
-#include "network-web/webbrowsernetworkaccessmanager.h"
 #include "network-web/webpage.h"
 #include "network-web/webview.h"
 #include "network-web/networkfactory.h"
@@ -33,7 +32,7 @@
 #include <QHBoxLayout>
 #include <QToolBar>
 #include <QAction>
-#include <QWebFrame>
+#include <QWebEnginePage>
 #include <QWidgetAction>
 #include <QSlider>
 #include <QLabel>
@@ -50,10 +49,10 @@ WebBrowser::WebBrowser(QWidget *parent)
     m_toolBar(new QToolBar(tr("Navigation panel"), this)),
     m_webView(new WebView(this)),
     m_txtLocation(new LocationLineEdit(this)),
-    m_actionBack(m_webView->pageAction(QWebPage::Back)),
-    m_actionForward(m_webView->pageAction(QWebPage::Forward)),
-    m_actionReload(m_webView->pageAction(QWebPage::Reload)),
-    m_actionStop(m_webView->pageAction(QWebPage::Stop)) {
+    m_actionBack(m_webView->pageAction(QWebEnginePage::Back)),
+    m_actionForward(m_webView->pageAction(QWebEnginePage::Forward)),
+    m_actionReload(m_webView->pageAction(QWebEnginePage::Reload)),
+    m_actionStop(m_webView->pageAction(QWebEnginePage::Stop)) {
   // Add this new instance to the global list of web browsers.
   // NOTE: This is used primarily for dynamic icon theme switching.
   m_runningWebBrowsers.append(this);
@@ -168,7 +167,8 @@ void WebBrowser::onLoadingStarted() {
 
 void WebBrowser::onLoadingProgress(int progress) {
   m_loadingProgress->setValue(progress);
-  m_lblProgress->setText(QString(QSL(" %1 kB / %2 kB")).arg(m_webView->page()->bytesReceived() / 1000).arg(m_webView->page()->totalBytes() / 1000));
+  // TODO: TODO
+  //m_lblProgress->setText(QString(QSL(" %1 kB / %2 kB")).arg(m_webView->page()-> / 1000).arg(m_webView->page()->totalBytes() / 1000));
 }
 
 void WebBrowser::onLoadingFinished(bool success) {
@@ -209,7 +209,8 @@ void WebBrowser::createConnections() {
 }
 
 void WebBrowser::onIconChanged() {
-  emit iconChanged(m_index, m_webView->icon());
+  // TODO: todo
+  //emit iconChanged(m_index, m_webView->icon());
 }
 
 void WebBrowser::onTitleChanged(const QString &new_title) {
@@ -319,3 +320,11 @@ void WebBrowser::setupIcons() {
   m_actionStop->setIcon(qApp->icons()->fromTheme(QSL("go-stop")));
   m_webView->setupIcons();
 }
+
+QIcon WebBrowser::icon() const {
+
+  return QIcon();
+
+  // TODO: TODO.
+  //return m_webView->iconUrl();
+}
diff --git a/src/network-web/webbrowser.h b/src/network-web/webbrowser.h
index 6d3c143f8..603b80c2a 100755
--- a/src/network-web/webbrowser.h
+++ b/src/network-web/webbrowser.h
@@ -37,7 +37,6 @@ class QHBoxLayout;
 class QProgressBar;
 class QMenu;
 class QLabel;
-class WebBrowserNetworkAccessManager;
 class TabWidget;
 
 class WebBrowser : public TabContent {
@@ -52,9 +51,7 @@ class WebBrowser : public TabContent {
     void setupIcons();
 
     // Returns icon associated with currently loaded website.
-    inline QIcon icon() const {
-      return m_webView->icon();
-    }
+    QIcon icon() const;
 
     inline WebView *view() const {
       return m_webView;
diff --git a/src/network-web/webfactory.cpp b/src/network-web/webfactory.cpp
index ecd6ebc2b..8e876f8bc 100755
--- a/src/network-web/webfactory.cpp
+++ b/src/network-web/webfactory.cpp
@@ -3,7 +3,7 @@
 #include "miscellaneous/application.h"
 
 #include <QRegExp>
-#include <QWebSettings>
+#include <QWebEngineSettings>
 #include <QProcess>
 #include <QUrl>
 #include <QDesktopServices>
@@ -14,7 +14,7 @@ QPointer<WebFactory> WebFactory::s_instance;
 WebFactory::WebFactory(QObject *parent)
   : QObject(parent), m_escapes(QMap<QString, QString>()),
     m_deEscapes(QMap<QString, QString>()),
-    m_globalSettings(QWebSettings::globalSettings()) {
+    m_globalSettings(QWebEngineSettings::globalSettings()) {
 }
 
 WebFactory::~WebFactory() {
@@ -34,7 +34,7 @@ bool WebFactory::sendMessageViaEmail(const Message &message) {
     const QString arguments = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalEmailArguments)).toString();
 
     return QProcess::startDetached(QString("\"") + browser + QSL("\" ") + arguments.arg(message.m_title,
-                                                                                   stripTags(message.m_contents)));
+                                                                                        stripTags(message.m_contents)));
   }
   else {
     // Send it via mailto protocol.
@@ -71,7 +71,7 @@ void WebFactory::switchJavascript(bool enable, bool save_settings) {
     qApp->settings()->setValue(GROUP(Browser), Browser::JavascriptEnabled, enable);
   }
 
-  m_globalSettings->setAttribute(QWebSettings::JavascriptEnabled, enable);
+  m_globalSettings->setAttribute(QWebEngineSettings::JavascriptEnabled, enable);
   emit javascriptSwitched(enable);
 }
 
@@ -80,7 +80,7 @@ void WebFactory::switchPlugins(bool enable, bool save_settings) {
     qApp->settings()->setValue(GROUP(Browser), Browser::PluginsEnabled, enable);
   }
 
-  m_globalSettings->setAttribute(QWebSettings::PluginsEnabled, enable);
+  m_globalSettings->setAttribute(QWebEngineSettings::PluginsEnabled, enable);
   emit pluginsSwitched(enable);
 }
 
@@ -89,7 +89,7 @@ void WebFactory::switchImages(bool enable, bool save_settings) {
     qApp->settings()->setValue(GROUP(Browser), Browser::ImagesEnabled, enable);
   }
 
-  m_globalSettings->setAttribute(QWebSettings::AutoLoadImages, enable);
+  m_globalSettings->setAttribute(QWebEngineSettings::AutoLoadImages, enable);
   emit imagesLoadingSwitched(enable);
 }
 
@@ -102,15 +102,15 @@ WebFactory *WebFactory::instance() {
 }
 
 bool WebFactory::javascriptEnabled() const {
-  return m_globalSettings->testAttribute(QWebSettings::JavascriptEnabled);
+  return m_globalSettings->testAttribute(QWebEngineSettings::JavascriptEnabled);
 }
 
 bool WebFactory::pluginsEnabled() const {
-  return m_globalSettings->testAttribute(QWebSettings::PluginsEnabled);
+  return m_globalSettings->testAttribute(QWebEngineSettings::PluginsEnabled);
 }
 
 bool WebFactory::autoloadImages() const {
-  return m_globalSettings->testAttribute(QWebSettings::AutoLoadImages);
+  return m_globalSettings->testAttribute(QWebEngineSettings::AutoLoadImages);
 }
 
 QString WebFactory::stripTags(QString text) {
diff --git a/src/network-web/webfactory.h b/src/network-web/webfactory.h
index b7a24dda0..922eb6ddc 100755
--- a/src/network-web/webfactory.h
+++ b/src/network-web/webfactory.h
@@ -9,7 +9,7 @@
 #include <QMap>
 
 
-class QWebSettings;
+class QWebEngineSettings;
 
 class WebFactory : public QObject {
     Q_OBJECT
@@ -67,7 +67,7 @@ class WebFactory : public QObject {
 
     QMap<QString, QString> m_escapes;
     QMap<QString, QString> m_deEscapes;
-    QWebSettings *m_globalSettings;
+    QWebEngineSettings *m_globalSettings;
 
     // Singleton.
     static QPointer<WebFactory> s_instance;
diff --git a/src/network-web/webpage.cpp b/src/network-web/webpage.cpp
index 378239375..74063dc1c 100755
--- a/src/network-web/webpage.cpp
+++ b/src/network-web/webpage.cpp
@@ -17,29 +17,21 @@
 
 #include "network-web/webpage.h"
 
-#include "network-web/webbrowsernetworkaccessmanager.h"
 #include "network-web/webbrowser.h"
 #include "miscellaneous/application.h"
 
 #include "network-web/adblock/adblockmanager.h"
 
 #include <QNetworkReply>
-#include <QWebElement>
-#include <QWebFrame>
 
 
 QList<WebPage*> WebPage::s_livingPages;
 
 WebPage::WebPage(QObject *parent)
-  : QWebPage(parent), m_loadProgress(-1) {
-  // Setup global network access manager.
-  // NOTE: This makes network settings easy for all web browsers.
-  setNetworkAccessManager(new WebBrowserNetworkAccessManager(this, this));
-  setForwardUnsupportedContent(true);
-  connect(this, SIGNAL(unsupportedContent(QNetworkReply*)), this, SLOT(handleUnsupportedContent(QNetworkReply*)));
-
+  : QWebEnginePage(parent), m_loadProgress(-1) {
   connect(this, SIGNAL(loadProgress(int)), this, SLOT(progress(int)));
   connect(this, SIGNAL(loadFinished(bool)), this, SLOT(finished()));
+  connect(this, SIGNAL(urlChanged(QUrl)), this, SLOT(urlChanged(QUrl)));
 
   s_livingPages.append(this);
 }
@@ -58,65 +50,6 @@ void WebPage::progress(int prog) {
 
 void WebPage::finished() {
   progress(100);
-  cleanBlockedObjects();
-}
-
-void WebPage::cleanBlockedObjects() {
-  AdBlockManager *manager = AdBlockManager::instance();
-
-  if (!manager->isEnabled()) {
-    return;
-  }
-
-  const QWebElement doc_element = mainFrame()->documentElement();
-
-  foreach (const AdBlockedEntry &entry, m_adBlockedEntries) {
-    const QString url_string = entry.url.toString();
-    if (url_string.endsWith(QL1S(".js")) || url_string.endsWith(QL1S(".css"))) {
-      continue;
-    }
-
-    QString url_end;
-
-    int pos = url_string.lastIndexOf(QL1C('/'));
-    if (pos > 8) {
-      url_end = url_string.mid(pos + 1);
-    }
-
-    if (url_string.endsWith(QL1C('/'))) {
-      url_end = url_string.left(url_string.size() - 1);
-    }
-
-    QString selector(QSL("img[src$=\"%1\"], iframe[src$=\"%1\"],embed[src$=\"%1\"]"));
-    QWebElementCollection elements = doc_element.findAll(selector.arg(url_end));
-
-    foreach (QWebElement element, elements) {
-      QString src = element.attribute(QSL("src"));
-      src.remove(QL1S("../"));
-
-      if (url_string.contains(src)) {
-        element.setStyleProperty(QSL("display"), QSL("none"));
-      }
-    }
-  }
-
-  // Apply domain-specific element hiding rules
-  QString element_hiding = manager->elementHidingRulesForDomain(mainFrame()->url());
-
-  if (element_hiding.isEmpty()) {
-    return;
-  }
-
-  element_hiding.append(QL1S("\n</style>"));
-
-  QWebElement body_element = doc_element.findFirst(QSL("body"));
-  body_element.appendInside(QSL("<style type=\"text/css\">\n/* AdBlock for RSS Guard */\n") + element_hiding);
-
-  // When hiding some elements, scroll position of page will change
-  // If user loaded anchor link in background tab (and didn't show it yet), fix the scroll position
-  if (view() && !view()->isVisible() && !mainFrame()->url().fragment().isEmpty()) {
-    mainFrame()->scrollToAnchor(mainFrame()->url().fragment());
-  }
 }
 
 void WebPage::urlChanged(const QUrl &url) {
@@ -150,10 +83,6 @@ bool WebPage::isPointerSafeToUse(WebPage *page) {
   return page == 0 ? false : s_livingPages.contains(page);
 }
 
-QString WebPage::toPlainText() const {
-  return mainFrame()->toPlainText();
-}
-
 void WebPage::populateNetworkRequest(QNetworkRequest &request) {
   WebPage *page_pointer = this;
 
@@ -161,48 +90,8 @@ void WebPage::populateNetworkRequest(QNetworkRequest &request) {
   request.setAttribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100), variant);
 }
 
-void WebPage::handleUnsupportedContent(QNetworkReply *reply) {
-  if (reply != NULL) {
-    const QUrl reply_url = reply->url();
-
-    if (reply_url.scheme() == QL1S("abp")) {
-      return;
-    }
-
-    switch (reply->error()) {
-      case QNetworkReply::NoError:
-        if (reply->header(QNetworkRequest::ContentTypeHeader).isValid()) {
-          qApp->downloadManager()->handleUnsupportedContent(reply, true);
-          return;
-        }
-
-      default:
-        return;
-    }
-  }
-}
-
 QString WebPage::toHtml() const {
-  return mainFrame()->toHtml();
-}
-
-bool WebPage::acceptNavigationRequest(QWebFrame *frame,
-                                      const QNetworkRequest &request,
-                                      QWebPage::NavigationType type) {
-  const QString scheme = request.url().scheme();
-
-  if (scheme == QL1S("mailto") || scheme == QL1S("ftp")) {
-    qWarning("Received request with scheme '%s', blocking it.", qPrintable(scheme));
-    return false;
-  }
-
-  if (type == QWebPage::NavigationTypeLinkClicked &&
-      frame == mainFrame()) {
-    // Make sure that appropriate signal is emitted even if
-    // no delegation is enabled.
-    emit linkClicked(request.url());
-  }
-
-  qDebug("Accepting request '%s'.", qPrintable(request.url().toString()));
-  return QWebPage::acceptNavigationRequest(frame, request, type);
+  return QString();
+  // TODO: TODO
+  //return mainFrame()->toHtml();
 }
diff --git a/src/network-web/webpage.h b/src/network-web/webpage.h
index e6202919b..eb61186e1 100755
--- a/src/network-web/webpage.h
+++ b/src/network-web/webpage.h
@@ -18,13 +18,13 @@
 #ifndef WEBPAGE_H
 #define WEBPAGE_H
 
-#include <QWebPage>
+#include <QWebEnginePage>
 #include <QNetworkAccessManager>
 
 
 class AdBlockRule;
 
-class WebPage : public QWebPage {
+class WebPage : public QWebEnginePage {
     Q_OBJECT
 
   public:
@@ -42,7 +42,6 @@ class WebPage : public QWebPage {
     virtual ~WebPage();
 
     QString toHtml() const;
-    QString toPlainText() const;
     bool isLoading() const;
     QVector<AdBlockedEntry> adBlockedEntries() const;
 
@@ -54,14 +53,8 @@ class WebPage : public QWebPage {
   private slots:
     void progress(int prog);
     void finished();
-    void cleanBlockedObjects();
     void urlChanged(const QUrl &url);
 
-    void handleUnsupportedContent(QNetworkReply *reply);
-
-  protected:
-    bool acceptNavigationRequest(QWebFrame *frame, const QNetworkRequest &request, NavigationType type);
-
   private:
     QVector<AdBlockedEntry> m_adBlockedEntries;
     int m_loadProgress;
diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp
index 9bde49c4a..044d2c9a9 100755
--- a/src/network-web/webview.cpp
+++ b/src/network-web/webview.cpp
@@ -32,7 +32,7 @@
 #include <QMenu>
 #include <QDir>
 #include <QFile>
-#include <QWebFrame>
+#include <QWebEnginePage>
 #include <QContextMenuEvent>
 #include <QDateTime>
 #include <QClipboard>
@@ -46,7 +46,7 @@
 
 
 WebView::WebView(QWidget *parent)
-  : QWebView(parent), m_page(new WebPage(this)) {
+  : QWebEngineView(parent), m_page(new WebPage(this)) {
   setPage(m_page);
   setContextMenuPolicy(Qt::CustomContextMenu);
   initializeActions();
@@ -133,7 +133,7 @@ void WebView::saveCurrentPageToFile() {
     QFile selected_file_handle(selected_file);
 
     if (selected_file_handle.open(QIODevice::WriteOnly | QIODevice::Unbuffered)) {
-      const QString html_text = page()->mainFrame()->toHtml();
+      const QString html_text = page()->toHtml();
       QTextStream str(&selected_file_handle);
 
       str.setCodec("UTF-16");
@@ -183,13 +183,13 @@ void WebView::setupIcons() {
 
 void WebView::initializeActions() {
   // Create needed actions.
-  m_actionReload = pageAction(QWebPage::Reload);
+  m_actionReload = pageAction(QWebEnginePage::Reload);
   m_actionReload->setParent(this);
 
   m_actionPrint = new QAction(tr("Print"), this);
   m_actionPrint->setToolTip(tr("Print current web page."));
 
-  m_actionCopySelectedItem = pageAction(QWebPage::Copy);
+  m_actionCopySelectedItem = pageAction(QWebEnginePage::Copy);
   m_actionCopySelectedItem->setParent(this);
 
 #if defined(Q_OS_OS2)
@@ -197,33 +197,34 @@ void WebView::initializeActions() {
   addAction(m_actionCopySelectedItem);
 #endif
 
-  m_actionSaveHyperlinkAs = pageAction(QWebPage::DownloadLinkToDisk);
+  m_actionSaveHyperlinkAs = pageAction(QWebEnginePage::DownloadLinkToDisk);
   m_actionSaveHyperlinkAs->setParent(this);
 
-  m_actionCopyLink = pageAction(QWebPage::CopyLinkToClipboard);
+  m_actionCopyLink = pageAction(QWebEnginePage::CopyLinkToClipboard);
   m_actionCopyLink->setParent(this);
 
-  m_actionCopyImage = pageAction(QWebPage::CopyImageToClipboard);
+  m_actionCopyImage = pageAction(QWebEnginePage::CopyImageToClipboard);
   m_actionCopyImage->setParent(this);
 
-  m_actionSaveImageAs = pageAction(QWebPage::DownloadImageToDisk);
+  m_actionSaveImageAs = pageAction(QWebEnginePage::DownloadImageToDisk);
   m_actionSaveImageAs->setParent(this);
   m_actionSavePageAs = new QAction(qApp->icons()->fromTheme(QSL("document-download")), tr("Save page as..."), this);
 
 #if QT_VERSION >= 0x040800
-  m_actionCopyImageUrl = pageAction(QWebPage::CopyImageUrlToClipboard);
+  m_actionCopyImageUrl = pageAction(QWebEnginePage::CopyImageUrlToClipboard);
   m_actionCopyImageUrl->setParent(this);
 #endif
 
-  m_actionOpenLinkNewTab = pageAction(QWebPage::OpenLinkInNewWindow);
+  m_actionOpenLinkNewTab = pageAction(QWebEnginePage::OpenLinkInNewTab);
   m_actionOpenLinkNewTab->setParent(this);
 
-  m_actionOpenLinkThisTab = pageAction(QWebPage::OpenLink);
+  m_actionOpenLinkThisTab = pageAction(QWebEnginePage::OpenLinkInThisWindow);
   m_actionOpenLinkThisTab->setParent(this);
 
   m_actionOpenLinkExternally = new QAction(tr("Open link in external browser"), this);
 
-  m_actionOpenImageNewTab = pageAction(QWebPage::OpenImageInNewWindow);
+  // TODO: bude fungovat?
+  m_actionOpenImageNewTab = pageAction(QWebEnginePage::OpenLinkInNewTab);
   m_actionOpenImageNewTab->setParent(this);
 
   m_actionLookupText = new QAction("", this);
@@ -275,68 +276,8 @@ void WebView::displayErrorPage() {
   */
 }
 
-void WebView::popupContextMenu(const QPoint &pos) {
-  QMenu context_menu(tr("Web browser"), this);
-  QMenu image_submenu(tr("Image"), &context_menu);
-  QMenu link_submenu(tr("Hyperlink"), this);
-  QWebHitTestResult hit_result = page()->mainFrame()->hitTestContent(pos);
-
-  image_submenu.setIcon(qApp->icons()->fromTheme(QSL("image-generic")));
-  link_submenu.setIcon(qApp->icons()->fromTheme(QSL("text-html")));
-
-  // Assemble the menu from actions.
-
-  QString current_url = url().toString();
-
-  if (!current_url.isEmpty() && current_url != INTERNAL_URL_EMPTY && current_url != INTERNAL_URL_BLANK) {
-    context_menu.addAction(m_actionPrint);
-
-    if (current_url != INTERNAL_URL_NEWSPAPER) {
-      context_menu.addAction(m_actionReload);
-    }
-  }
-
-  context_menu.addAction(m_actionCopySelectedItem);
-  context_menu.addAction(m_actionSavePageAs);
-
-  const QUrl hit_url = hit_result.linkUrl();
-  const QUrl hit_image_url = hit_result.imageUrl();
-
-  if (hit_url.isValid()) {
-    m_contextLinkUrl = hit_url;
-
-    context_menu.addMenu(&link_submenu);
-    link_submenu.addAction(m_actionOpenLinkThisTab);
-    link_submenu.addAction(m_actionOpenLinkNewTab);
-    link_submenu.addAction(m_actionOpenLinkExternally);
-    link_submenu.addAction(m_actionCopyLink);
-    link_submenu.addAction(m_actionSaveHyperlinkAs);
-  }
-
-  if (!hit_result.pixmap().isNull()) {
-    // Add 'Image' menu, because if user clicked image it needs to be visible.
-    context_menu.addMenu(&image_submenu);
-
-    if (hit_image_url.isValid()) {
-      m_contextImageUrl = hit_image_url;
-      image_submenu.addAction(m_actionOpenImageNewTab);
-
-#if QT_VERSION >= 0x040800
-      image_submenu.addAction(m_actionCopyImageUrl);
-#endif
-    }
-    image_submenu.addAction(m_actionCopyImage);
-    image_submenu.addAction(m_actionSaveImageAs);
-  }
-
-  if (!selectedText().isEmpty()) {
-    m_actionLookupText->setText(tr("Search \"%1\" via Google...").arg(TextFactory::shorten(selectedText())));
-    context_menu.addAction(m_actionLookupText);
-  }
-
-  // Display the menu.
-  setActionTexts();
-  context_menu.exec(mapToGlobal(pos));
+void WebView::popupContextMenu(const QPoint &pos) {  
+  page()->createStandardContextMenu()->exec(mapToGlobal(pos));
 }
 
 void WebView::printCurrentPage() {
@@ -350,7 +291,8 @@ void WebView::downloadLink(const QNetworkRequest &request) {
 }
 
 void WebView::mousePressEvent(QMouseEvent *event) {
-  if (event->button() & Qt::LeftButton && event->modifiers() & Qt::ControlModifier) {
+  // TODO: TODO
+  /*if (event->button() & Qt::LeftButton && event->modifiers() & Qt::ControlModifier) {
     QWebHitTestResult hit_result = page()->mainFrame()->hitTestContent(event->pos());
 
     // Check if user clicked with middle mouse button on some
@@ -367,12 +309,12 @@ void WebView::mousePressEvent(QMouseEvent *event) {
       return;
     }
   }
-  else if (event->button() & Qt::MiddleButton) {
+  else */if (event->button() & Qt::MiddleButton) {
     m_gestureOrigin = event->pos();
     return;
   }
 
-  QWebView::mousePressEvent(event);
+  QWebEngineView::mousePressEvent(event);
 }
 
 void WebView::mouseReleaseEvent(QMouseEvent *event) {
@@ -402,7 +344,7 @@ void WebView::mouseReleaseEvent(QMouseEvent *event) {
     }
   }
 
-  QWebView::mouseReleaseEvent(event);
+  QWebEngineView::mouseReleaseEvent(event);
 }
 
 void WebView::wheelEvent(QWheelEvent *event) {
@@ -419,7 +361,7 @@ void WebView::wheelEvent(QWheelEvent *event) {
     }
   }
 
-  QWebView::wheelEvent(event);
+  QWebEngineView::wheelEvent(event);
 }
 
 bool WebView::increaseWebPageZoom() {
diff --git a/src/network-web/webview.h b/src/network-web/webview.h
index 1313b94c0..8aa11e8b9 100755
--- a/src/network-web/webview.h
+++ b/src/network-web/webview.h
@@ -18,14 +18,14 @@
 #ifndef BASEWEBVIEW_H
 #define BASEWEBVIEW_H
 
-#include <QWebView>
+#include <QWebEngineView>
 
 
 class QAction;
 class QPaintEvent;
 class WebPage;
 
-class WebView : public QWebView {
+class WebView : public QWebEngineView {
     Q_OBJECT
 
   public:

From b871716d61266e9551787083147714ec6b453aa7 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 22 Mar 2016 13:47:55 +0100
Subject: [PATCH 02/31] Raise CMake min version.

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8734b354c..eb9d19578 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -93,7 +93,7 @@ if(POLICY CMP0054)
   cmake_policy(SET CMP0054 NEW)
 endif()
 
-cmake_minimum_required(VERSION 2.8.10)
+cmake_minimum_required(VERSION 3.4)
 
 message(STATUS "")
 message(STATUS "[${APP_LOW_NAME}] ==== Options summary ====")

From ff286f3d62370cc0ecd3b39ea0a0b4aff4a40d7d Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 22 Mar 2016 13:55:50 +0100
Subject: [PATCH 03/31] Removed conditional code.

---
 CMakeLists.txt                         |  4 ++--
 src/core/messagesmodel.cpp             |  5 -----
 src/definitions/definitions.h.in       |  4 ----
 src/gui/dialogs/formsettings.cpp       | 23 -----------------------
 src/gui/feedsview.cpp                  |  6 ------
 src/gui/messagesview.cpp               | 17 -----------------
 src/gui/notifications/notification.cpp |  6 ------
 src/main.cpp                           |  4 ----
 src/miscellaneous/debugging.cpp        | 11 -----------
 src/miscellaneous/debugging.h          |  5 -----
 src/miscellaneous/iofactory.cpp        |  4 ----
 src/miscellaneous/iofactory.h          |  5 -----
 src/miscellaneous/localization.cpp     |  5 -----
 src/miscellaneous/systemfactory.cpp    |  5 -----
 src/network-web/networkfactory.cpp     |  4 ----
 src/network-web/webfactory.cpp         | 14 --------------
 src/network-web/webview.cpp            | 18 ------------------
 src/network-web/webview.h              |  4 ----
 src/services/abstract/feed.cpp         |  2 --
 19 files changed, 2 insertions(+), 144 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eb9d19578..331cf1386 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,7 +234,7 @@ message(STATUS "[${APP_LOW_NAME}] Enabling fast QString concatenation.")
 add_definitions(-DQT_USE_FAST_CONCATENATION)
 add_definitions(-DQT_USE_FAST_OPERATOR_PLUS)
 
-# Configure executable "properties" for Windows or OS2.
+# Configure executable "properties" for Windows.
 if(WIN32)
   message(STATUS "[${APP_LOW_NAME}] Generating executable file properties for Windows.")
   configure_file (
@@ -248,7 +248,7 @@ if(WIN32 AND MSVC)
   set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} /SUBSYSTEM:WINDOWS,5.01" )
 endif(WIN32 AND MSVC)
 
-# Compile application icon if compiling with MinGW on WIN32 or with OS2.
+# Compile application icon if compiling with MinGW on WIN32.
 if(WIN32 AND MINGW)
   enable_language(RC)
   set(CMAKE_RC_COMPILER_INIT windres)
diff --git a/src/core/messagesmodel.cpp b/src/core/messagesmodel.cpp
index 8a4a25a20..b016f92d3 100755
--- a/src/core/messagesmodel.cpp
+++ b/src/core/messagesmodel.cpp
@@ -162,12 +162,7 @@ void MessagesModel::setupHeaderData() {
 Qt::ItemFlags MessagesModel::flags(const QModelIndex &index) const {
   Q_UNUSED(index)
 
-#if QT_VERSION >= 0x050000
   return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable | Qt::ItemNeverHasChildren;
-#else
-
-  return Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsEditable;
-#endif
 }
 
 QVariant MessagesModel::data(int row, int column, int role) const {
diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in
index 338567984..cf5e91a01 100755
--- a/src/definitions/definitions.h.in
+++ b/src/definitions/definitions.h.in
@@ -152,16 +152,12 @@
 #define APP_THEME_SUFFIX    ".png"
 
 #ifndef QSL
-#if QT_VERSION >= 0x050000
 // Thin macro wrapper for literal strings.
 // They are much more memory efficient and faster.
 // Use it for all literals except for two cases:
 //  a) Methods which take QLatin1String (use QLatin1String for literal argument too),
 //  b) Construction of empty literals "", use QString() instead of QStringLiteral("").
 #define QSL(x) QStringLiteral(x)
-#else
-#define QSL(x) QLatin1String(x)
-#endif
 #endif
 
 #ifndef QL1S
diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp
index 5065ac916..71e2d64ac 100755
--- a/src/gui/dialogs/formsettings.cpp
+++ b/src/gui/dialogs/formsettings.cpp
@@ -85,7 +85,6 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
                                      << tr("Author")
                                      << tr("E-mail"));
 
-#if QT_VERSION >= 0x050000
   // Setup languages.
   m_ui->m_treeLanguages->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
   m_ui->m_treeLanguages->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
@@ -98,20 +97,6 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
   m_ui->m_treeSkins->header()->setSectionResizeMode(1, QHeaderView::ResizeToContents);
   m_ui->m_treeSkins->header()->setSectionResizeMode(2, QHeaderView::ResizeToContents);
   m_ui->m_treeSkins->header()->setSectionResizeMode(3, QHeaderView::ResizeToContents);
-#else
-  // Setup languages.
-  m_ui->m_treeLanguages->header()->setResizeMode(0, QHeaderView::ResizeToContents);
-  m_ui->m_treeLanguages->header()->setResizeMode(1, QHeaderView::ResizeToContents);
-  m_ui->m_treeLanguages->header()->setResizeMode(2, QHeaderView::ResizeToContents);
-  m_ui->m_treeLanguages->header()->setResizeMode(3, QHeaderView::ResizeToContents);
-  m_ui->m_treeLanguages->header()->setResizeMode(4, QHeaderView::ResizeToContents);
-
-  // Setup skins.
-  m_ui->m_treeSkins->header()->setResizeMode(0, QHeaderView::ResizeToContents);
-  m_ui->m_treeSkins->header()->setResizeMode(1, QHeaderView::ResizeToContents);
-  m_ui->m_treeSkins->header()->setResizeMode(2, QHeaderView::ResizeToContents);
-  m_ui->m_treeSkins->header()->setResizeMode(3, QHeaderView::ResizeToContents);
-#endif
 
   // Establish needed connections.
   connect(m_ui->m_buttonBox, SIGNAL(accepted()), this, SLOT(saveSettings()));
@@ -749,15 +734,7 @@ void FormSettings::loadInterface() {
     m_ui->m_cmbIconTheme->setCurrentIndex(0);
   }
   else {
-#if QT_VERSION >= 0x050000
     m_ui->m_cmbIconTheme->setCurrentText(current_theme);
-#else
-    int theme_index = m_ui->m_cmbIconTheme->findText(current_theme);
-
-    if (theme_index >= 0) {
-      m_ui->m_cmbIconTheme->setCurrentIndex(theme_index);
-    }
-#endif
   }
 
   // Load skin.
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index a1475573b..09d4f6975 100755
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -433,15 +433,9 @@ QMenu *FeedsView::initializeContextMenuOtherItem(RootItem *clicked_item) {
 }
 
 void FeedsView::setupAppearance() {
-#if QT_VERSION >= 0x050000
   // Setup column resize strategies.
   header()->setSectionResizeMode(FDS_MODEL_TITLE_INDEX, QHeaderView::Stretch);
   header()->setSectionResizeMode(FDS_MODEL_COUNTS_INDEX, QHeaderView::ResizeToContents);
-#else
-  // Setup column resize strategies.
-  header()->setResizeMode(FDS_MODEL_TITLE_INDEX, QHeaderView::Stretch);
-  header()->setResizeMode(FDS_MODEL_COUNTS_INDEX, QHeaderView::ResizeToContents);
-#endif
 
   setUniformRowHeights(true);
   setAnimated(true);
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 79ce2b30f..8ff574b03 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -231,13 +231,11 @@ void MessagesView::loadItem(RootItem *item) {
   m_sourceModel->setSort(col, ord);
   m_sourceModel->loadMessages(item);
 
-#if QT_VERSION >= 0x050000
   // Messages are loaded, make sure that previously
   // active message is not shown in browser.
   // BUG: Qt 5 is probably bugged here. Selections
   // should be cleared automatically when SQL model is reset.
   emit currentMessagesRemoved();
-#endif
 }
 
 void MessagesView::openSelectedSourceMessagesExternally() {
@@ -506,7 +504,6 @@ void MessagesView::adjustColumns() {
   if (header()->count() > 0 && !m_columnsAdjusted) {
     m_columnsAdjusted = true;
 
-#if QT_VERSION >= 0x050000
     // Setup column resize strategies.
     header()->setSectionResizeMode(MSG_DB_ID_INDEX, QHeaderView::Interactive);
     header()->setSectionResizeMode(MSG_DB_READ_INDEX, QHeaderView::ResizeToContents);
@@ -519,20 +516,6 @@ void MessagesView::adjustColumns() {
     header()->setSectionResizeMode(MSG_DB_DCREATED_INDEX, QHeaderView::Interactive);
     header()->setSectionResizeMode(MSG_DB_CONTENTS_INDEX, QHeaderView::Interactive);
     header()->setSectionResizeMode(MSG_DB_PDELETED_INDEX, QHeaderView::Interactive);
-#else
-    // Setup column resize strategies.
-    header()->setResizeMode(MSG_DB_ID_INDEX, QHeaderView::Interactive);
-    header()->setResizeMode(MSG_DB_READ_INDEX, QHeaderView::ResizeToContents);
-    header()->setResizeMode(MSG_DB_DELETED_INDEX, QHeaderView::Interactive);
-    header()->setResizeMode(MSG_DB_IMPORTANT_INDEX, QHeaderView::ResizeToContents);
-    header()->setResizeMode(MSG_DB_FEED_INDEX, QHeaderView::Interactive);
-    header()->setResizeMode(MSG_DB_TITLE_INDEX, QHeaderView::Stretch);
-    header()->setResizeMode(MSG_DB_URL_INDEX, QHeaderView::Interactive);
-    header()->setResizeMode(MSG_DB_AUTHOR_INDEX, QHeaderView::Interactive);
-    header()->setResizeMode(MSG_DB_DCREATED_INDEX, QHeaderView::Interactive);
-    header()->setResizeMode(MSG_DB_CONTENTS_INDEX, QHeaderView::Interactive);
-    header()->setResizeMode(MSG_DB_PDELETED_INDEX, QHeaderView::Interactive);
-#endif
 
     // Hide columns.
     hideColumn(MSG_DB_ID_INDEX);
diff --git a/src/gui/notifications/notification.cpp b/src/gui/notifications/notification.cpp
index 671a55dc1..63c2094c3 100755
--- a/src/gui/notifications/notification.cpp
+++ b/src/gui/notifications/notification.cpp
@@ -221,11 +221,7 @@ void Notification::paintEvent(QPaintEvent *event) {
   }
 
   // Draw background.
-#if QT_VERSION >= 0x050000
   painter.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Qt4CompatiblePainting);
-#else
-  painter.setRenderHints(QPainter::HighQualityAntialiasing);
-#endif
   painter.setBrush(m_backgroundColor);
 
   painter.setPen(Qt::NoPen);
@@ -287,9 +283,7 @@ void Notification::setupWidget() {
   Qt::WindowFlags window_flags = Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
                                  Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint;
 
-#if QT_VERSION >= 0x050000
   window_flags |= Qt::WindowDoesNotAcceptFocus;
-#endif
 
 #if defined (Q_OS_MAC)
   window_flags |= Qt::SubWindow;
diff --git a/src/main.cpp b/src/main.cpp
index 4d28793b1..6ce6dadfe 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -56,11 +56,7 @@ int main(int argc, char *argv[]) {
 #endif
 
   // Setup debug output system.
-#if QT_VERSION >= 0x050000
   qInstallMessageHandler(Debugging::debugHandler);
-#else
-  qInstallMsgHandler(Debugging::debugHandler);
-#endif
 
   // Instantiate base application object.
   Application application(APP_LOW_NAME, argc, argv);
diff --git a/src/miscellaneous/debugging.cpp b/src/miscellaneous/debugging.cpp
index 9ea8e0ba4..0586c5e65 100755
--- a/src/miscellaneous/debugging.cpp
+++ b/src/miscellaneous/debugging.cpp
@@ -62,7 +62,6 @@ const char *Debugging::typeToString(QtMsgType type) {
   }
 }
 
-#if QT_VERSION >= 0x050000
 void Debugging::debugHandler(QtMsgType type, const QMessageLogContext &placement, const QString &message) {
 #ifndef QT_NO_DEBUG_OUTPUT
   performLog(qPrintable(message), type, placement.file, placement.function, placement.line);
@@ -72,13 +71,3 @@ void Debugging::debugHandler(QtMsgType type, const QMessageLogContext &placement
   Q_UNUSED(message)
 #endif
 }
-#else
-void Debugging::debugHandler(QtMsgType type, const char *message) {
-#ifndef QT_NO_DEBUG_OUTPUT
-  performLog(message, type);
-#else
-  Q_UNUSED(type)
-  Q_UNUSED(message)
-#endif
-}
-#endif
diff --git a/src/miscellaneous/debugging.h b/src/miscellaneous/debugging.h
index 396329423..b873dfa9f 100755
--- a/src/miscellaneous/debugging.h
+++ b/src/miscellaneous/debugging.h
@@ -25,12 +25,7 @@ class Debugging {
   public:
     // Specifies format of output console messages.
     // NOTE: QT_NO_DEBUG_OUTPUT - disables debug outputs completely!!!
-#if QT_VERSION >= 0x050000
     static void debugHandler(QtMsgType type, const QMessageLogContext &placement, const QString &message);
-#else
-    static void debugHandler(QtMsgType type, const char *message);
-#endif
-
     static void performLog(const char *message, QtMsgType type, const char *file = 0, const char *function = 0, int line = -1);
     static const char *typeToString(QtMsgType type);
 
diff --git a/src/miscellaneous/iofactory.cpp b/src/miscellaneous/iofactory.cpp
index 61956aa04..ee623378c 100755
--- a/src/miscellaneous/iofactory.cpp
+++ b/src/miscellaneous/iofactory.cpp
@@ -31,11 +31,7 @@ IOFactory::IOFactory() {
 }
 
 QString IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::StandardLocation location) {
-#if QT_VERSION >= 0x050000
   return SYSTEM_FOLDER_ENUM::writableLocation(location);
-#else
-  return SYSTEM_FOLDER_ENUM::storageLocation(location);
-#endif
 }
 
 QString IOFactory::ensureUniqueFilename(const QString &name, const QString &append_format) {
diff --git a/src/miscellaneous/iofactory.h b/src/miscellaneous/iofactory.h
index b00dd23b4..f99337b61 100755
--- a/src/miscellaneous/iofactory.h
+++ b/src/miscellaneous/iofactory.h
@@ -22,13 +22,8 @@
 
 #include "definitions/definitions.h"
 
-#if QT_VERSION >= 0x050000
 #include <QStandardPaths>
 #define SYSTEM_FOLDER_ENUM QStandardPaths
-#else
-#include <QDesktopServices>
-#define SYSTEM_FOLDER_ENUM QDesktopServices
-#endif
 
 
 class IOFactory {
diff --git a/src/miscellaneous/localization.cpp b/src/miscellaneous/localization.cpp
index 8e5d611b2..8ab6fada3 100755
--- a/src/miscellaneous/localization.cpp
+++ b/src/miscellaneous/localization.cpp
@@ -76,12 +76,7 @@ QList<Language> Localization::installedLanguages() const {
       new_language.m_version = translator.translate("QObject", "LANG_VERSION");
       new_language.m_author = translator.translate("QObject", "LANG_AUTHOR");
       new_language.m_email = translator.translate("QObject", "LANG_EMAIL");
-
-#if QT_VERSION >= 0x040800
       new_language.m_name = QLocale(new_language.m_code).nativeLanguageName();
-#else
-      new_language.m_name = translator.translate("QObject", "LANG_NAME");
-#endif
 
       languages << new_language;
     }
diff --git a/src/miscellaneous/systemfactory.cpp b/src/miscellaneous/systemfactory.cpp
index d1d2bb74d..ad4a74697 100755
--- a/src/miscellaneous/systemfactory.cpp
+++ b/src/miscellaneous/systemfactory.cpp
@@ -33,12 +33,7 @@
 #include <QDomAttr>
 #include <QFuture>
 #include <QFutureWatcher>
-
-#if QT_VERSION >= 0x050000
 #include <QtConcurrent/QtConcurrentRun>
-#else
-#include <QtConcurrentRun>
-#endif
 
 
 typedef QPair<UpdateInfo, QNetworkReply::NetworkError> UpdateCheck;
diff --git a/src/network-web/networkfactory.cpp b/src/network-web/networkfactory.cpp
index 7f63adf4c..0cc3c41f8 100755
--- a/src/network-web/networkfactory.cpp
+++ b/src/network-web/networkfactory.cpp
@@ -132,11 +132,7 @@ QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList<QString> &u
   QNetworkReply::NetworkError network_result;
 
   foreach (const QString &url, urls) {
-#if QT_VERSION >= 0x050000
     const QString google_s2_with_url = QString("http://www.google.com/s2/favicons?domain=%1").arg(url.toHtmlEscaped());
-#else
-    const QString google_s2_with_url = QString("http://www.google.com/s2/favicons?domain=%1").arg(Qt::escape(url));
-#endif
     QByteArray icon_data;
     network_result =  downloadFile(google_s2_with_url, timeout, icon_data).first;
 
diff --git a/src/network-web/webfactory.cpp b/src/network-web/webfactory.cpp
index 8e876f8bc..968481cfe 100755
--- a/src/network-web/webfactory.cpp
+++ b/src/network-web/webfactory.cpp
@@ -146,7 +146,6 @@ QString WebFactory::deEscapeHtml(const QString &text) {
 }
 
 QString WebFactory::toSecondLevelDomain(const QUrl &url) {
-#if QT_VERSION >= 0x040800
   const QString top_level_domain = url.topLevelDomain();
   const QString url_host = url.host();
 
@@ -165,19 +164,6 @@ QString WebFactory::toSecondLevelDomain(const QUrl &url) {
   }
 
   return domain + top_level_domain;
-#else
-  QString domain = url.host();
-
-  if (domain.count(QL1C('.')) == 0) {
-    return QString();
-  }
-
-  while (domain.count(QL1C('.')) != 1) {
-    domain = domain.mid(domain.indexOf(QL1C('.')) + 1);
-  }
-
-  return domain;
-#endif
 }
 
 void WebFactory::generetaEscapes() {
diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp
index 044d2c9a9..b80afde85 100755
--- a/src/network-web/webview.cpp
+++ b/src/network-web/webview.cpp
@@ -37,12 +37,7 @@
 #include <QDateTime>
 #include <QClipboard>
 #include <QFileDialog>
-
-#if QT_VERSION >= 0x050000
 #include <QtPrintSupport/QPrintPreviewDialog>
-#else
-#include <QPrintPreviewDialog>
-#endif
 
 
 WebView::WebView(QWidget *parent)
@@ -168,11 +163,7 @@ void WebView::setupIcons() {
   m_actionCopyImage->setIcon(qApp->icons()->fromTheme(QSL("edit-copy-image")));
   m_actionSaveHyperlinkAs->setIcon(qApp->icons()->fromTheme(QSL("document-download")));
   m_actionSaveImageAs->setIcon(qApp->icons()->fromTheme(QSL("document-download")));
-
-#if QT_VERSION >= 0x040800
   m_actionCopyImageUrl->setIcon(qApp->icons()->fromTheme(QSL("edit-copy")));
-#endif
-
   m_actionOpenLinkThisTab->setIcon(qApp->icons()->fromTheme(QSL("item-open-internal")));
   m_actionOpenLinkNewTab->setIcon(qApp->icons()->fromTheme(QSL("item-open-internal")));
   m_actionOpenLinkExternally->setIcon(qApp->icons()->fromTheme(QSL("item-open-external")));
@@ -192,11 +183,6 @@ void WebView::initializeActions() {
   m_actionCopySelectedItem = pageAction(QWebEnginePage::Copy);
   m_actionCopySelectedItem->setParent(this);
 
-#if defined(Q_OS_OS2)
-  m_actionCopySelectedItem->setShortcut(QKeySequence::Copy);
-  addAction(m_actionCopySelectedItem);
-#endif
-
   m_actionSaveHyperlinkAs = pageAction(QWebEnginePage::DownloadLinkToDisk);
   m_actionSaveHyperlinkAs->setParent(this);
 
@@ -210,10 +196,8 @@ void WebView::initializeActions() {
   m_actionSaveImageAs->setParent(this);
   m_actionSavePageAs = new QAction(qApp->icons()->fromTheme(QSL("document-download")), tr("Save page as..."), this);
 
-#if QT_VERSION >= 0x040800
   m_actionCopyImageUrl = pageAction(QWebEnginePage::CopyImageUrlToClipboard);
   m_actionCopyImageUrl->setParent(this);
-#endif
 
   m_actionOpenLinkNewTab = pageAction(QWebEnginePage::OpenLinkInNewTab);
   m_actionOpenLinkNewTab->setParent(this);
@@ -244,10 +228,8 @@ void WebView::setActionTexts() {
   m_actionSaveImageAs->setText(tr("Save image as..."));
   m_actionSaveImageAs->setToolTip(tr("Save image to disk."));
 
-#if QT_VERSION >= 0x040800
   m_actionCopyImageUrl->setText(tr("Copy image url"));
   m_actionCopyImageUrl->setToolTip(tr("Copy image url to clipboard."));
-#endif
 
   m_actionOpenLinkNewTab->setText(tr("Open link in new tab"));
   m_actionOpenLinkNewTab->setToolTip(tr("Open this hyperlink in new tab."));
diff --git a/src/network-web/webview.h b/src/network-web/webview.h
index 8aa11e8b9..1630f179b 100755
--- a/src/network-web/webview.h
+++ b/src/network-web/webview.h
@@ -104,11 +104,7 @@ class WebView : public QWebEngineView {
     QAction *m_actionSavePageAs;
     QAction *m_actionSaveHyperlinkAs;
     QAction *m_actionSaveImageAs;
-
-#if QT_VERSION >= 0x040800
     QAction *m_actionCopyImageUrl;
-#endif
-
     QAction *m_actionOpenLinkThisTab;
     QAction *m_actionOpenLinkNewTab;
     QAction *m_actionOpenLinkExternally;
diff --git a/src/services/abstract/feed.cpp b/src/services/abstract/feed.cpp
index 3df7fb925..956632a9f 100755
--- a/src/services/abstract/feed.cpp
+++ b/src/services/abstract/feed.cpp
@@ -222,9 +222,7 @@ int Feed::updateMessages(const QList<Message> &messages) {
       QString new_message_url = QUrl(url()).toString(QUrl::RemoveUserInfo |
                                                      QUrl::RemovePath |
                                                      QUrl::RemoveQuery |
-                                               #if QT_VERSION >= 0x050000
                                                      QUrl::RemoveFilename |
-                                               #endif
                                                      QUrl::StripTrailingSlash);
 
       new_message_url += message.m_url;

From 8e3e6d1b62b495a4beaf818d2c30bfd0628ad7de Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 22 Mar 2016 19:46:08 +0100
Subject: [PATCH 04/31] Empty interceptor.

---
 CMakeLists.txt                                 |  6 ++++--
 src/network-web/adblock/requestinterceptor.cpp |  5 +++++
 src/network-web/adblock/requestinterceptor.h   | 10 ++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 src/network-web/adblock/requestinterceptor.cpp
 create mode 100644 src/network-web/adblock/requestinterceptor.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 331cf1386..62c936630 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -223,9 +223,9 @@ endif(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
 # Setup libraries.
 if(UNIX)
   # On Unices, enable D-Bus support.
-  find_package(Qt5 REQUIRED DBus Sql WebEngineWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
+  find_package(Qt5 REQUIRED DBus Sql WebEngineCore WebEngineWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
 else(UNIX)
-  find_package(Qt5 REQUIRED Sql WebEngineWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
+  find_package(Qt5 REQUIRED Sql WebEngineCore WebEngineWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
 endif(UNIX)
 
 # Configure QStringBuilder behavior.
@@ -411,6 +411,7 @@ if(UNIX)
     Sql
     Network
     Xml
+    WebEngineCore
     WebEngineWidgets
     PrintSupport
   )
@@ -422,6 +423,7 @@ else(UNIX)
     Sql
     Network
     Xml
+    WebEngineCore
     WebEngineWidgets
     PrintSupport
   )
diff --git a/src/network-web/adblock/requestinterceptor.cpp b/src/network-web/adblock/requestinterceptor.cpp
new file mode 100644
index 000000000..1f192dc6b
--- /dev/null
+++ b/src/network-web/adblock/requestinterceptor.cpp
@@ -0,0 +1,5 @@
+#include "network-web/adblock/requestinterceptor.h"
+
+
+RequestInterceptor::RequestInterceptor(QObject *p) : QWebEngineUrlRequestInterceptor(p) {
+}
diff --git a/src/network-web/adblock/requestinterceptor.h b/src/network-web/adblock/requestinterceptor.h
new file mode 100644
index 000000000..d06b1503e
--- /dev/null
+++ b/src/network-web/adblock/requestinterceptor.h
@@ -0,0 +1,10 @@
+#ifndef REQUESTINTERCEPTOR_H
+#define REQUESTINTERCEPTOR_H
+
+
+class RequestInterceptor : public QWebEngineUrlRequestInterceptor {
+  public:
+    RequestInterceptor();
+};
+
+#endif // REQUESTINTERCEPTOR_H

From c7b127343edcc27d9e617e27ffe25b2736a26ac5 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 23 Mar 2016 08:22:55 +0100
Subject: [PATCH 05/31] Adblock works.

---
 resources/binaries                            |   2 +-
 src/gui/dialogs/formsettings.cpp              |   2 -
 src/miscellaneous/settings.cpp                |   5 +
 .../adblock/adblockblockednetworkreply.cpp    |  81 ----------
 .../adblock/adblockblockednetworkreply.h      |  73 ---------
 src/network-web/adblock/adblockicon.cpp       |  42 +-----
 src/network-web/adblock/adblockmanager.cpp    |  57 ++-----
 src/network-web/adblock/adblockmanager.h      |  17 +--
 src/network-web/adblock/adblockmatcher.cpp    | 139 ++----------------
 src/network-web/adblock/adblockmatcher.h      |  12 +-
 src/network-web/adblock/adblockrule.cpp       |  60 ++------
 src/network-web/adblock/adblockrule.h         |  16 +-
 src/network-web/adblock/adblocksearchtree.cpp |  17 ++-
 src/network-web/adblock/adblocksearchtree.h   |  10 +-
 src/network-web/adblock/adblocktreewidget.cpp |   4 -
 .../adblock/requestinterceptor.cpp            |  38 ++++-
 src/network-web/adblock/requestinterceptor.h  |  25 +++-
 .../webbrowsernetworkaccessmanager.cpp        |  70 ---------
 .../webbrowsernetworkaccessmanager.h          |  53 -------
 src/network-web/webpage.cpp                   |  48 ------
 src/network-web/webpage.h                     |  17 ---
 21 files changed, 142 insertions(+), 646 deletions(-)
 delete mode 100755 src/network-web/adblock/adblockblockednetworkreply.cpp
 delete mode 100755 src/network-web/adblock/adblockblockednetworkreply.h
 delete mode 100755 src/network-web/webbrowsernetworkaccessmanager.cpp
 delete mode 100755 src/network-web/webbrowsernetworkaccessmanager.h

diff --git a/resources/binaries b/resources/binaries
index 572da127b..176715f7b 160000
--- a/resources/binaries
+++ b/resources/binaries
@@ -1 +1 @@
-Subproject commit 572da127bb14842bba6f84e6315a5ecefb44ed07
+Subproject commit 176715f7b3229289e2fb0dffb000c436664a26ff
diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp
index 71e2d64ac..6fd996193 100755
--- a/src/gui/dialogs/formsettings.cpp
+++ b/src/gui/dialogs/formsettings.cpp
@@ -30,7 +30,6 @@
 #include "miscellaneous/skinfactory.h"
 #include "miscellaneous/textfactory.h"
 #include "network-web/webfactory.h"
-#include "network-web/webbrowsernetworkaccessmanager.h"
 #include "network-web/silentnetworkaccessmanager.h"
 #include "network-web/webbrowser.h"
 #include "gui/systemtrayicon.h"
@@ -448,7 +447,6 @@ void FormSettings::saveProxy() {
 
   // Reload settings for all network access managers.
   SilentNetworkAccessManager::instance()->loadSettings();
-  WebBrowserNetworkAccessManager::instance()->loadSettings();
 }
 
 void FormSettings::loadLanguage() {
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index e901730c0..0b81bb8f9 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -19,12 +19,14 @@
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/iofactory.h"
+#include "network-web/adblock/requestinterceptor.h"
 
 #include <QDebug>
 #include <QDir>
 #include <QPointer>
 #include <QWebEngineSettings>
 #include <QLocale>
+#include <QWebEngineProfile>
 
 
 // Feeds.
@@ -357,6 +359,9 @@ Settings *Settings::setupSettings(QObject *parent) {
   // Portable settings are available, use them.
   new_settings = new Settings(properties.m_absoluteSettingsFileName, QSettings::IniFormat, properties.m_type, parent);
 
+  // Set Blick communication interceptor for simple Adblocking.
+  QWebEngineProfile::defaultProfile()->setRequestInterceptor(new RequestInterceptor(new_settings));
+
   // Check if portable settings are available.
   if (properties.m_type == SettingsProperties::Portable) {
     qDebug("Initializing settings in '%s' (portable way).", qPrintable(QDir::toNativeSeparators(properties.m_absoluteSettingsFileName)));
diff --git a/src/network-web/adblock/adblockblockednetworkreply.cpp b/src/network-web/adblock/adblockblockednetworkreply.cpp
deleted file mode 100755
index 8431f3396..000000000
--- a/src/network-web/adblock/adblockblockednetworkreply.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
- *
- * 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 Benjamin Meyer 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 "network-web/adblock/adblockblockednetworkreply.h"
-
-#include "network-web/adblock/adblocksubscription.h"
-#include "network-web/adblock/adblockrule.h"
-
-#include <QNetworkRequest>
-#include <QTimer>
-
-
-AdBlockBlockedNetworkReply::AdBlockBlockedNetworkReply(const AdBlockRule *rule, QObject *parent)
-  : QNetworkReply(parent) {
-  setOperation(QNetworkAccessManager::GetOperation);
-  setError(QNetworkReply::ContentAccessDenied, QString("Adblock: %1 (%2)").arg(rule->subscription()->title(), rule->filter()));
-  open(QIODevice::ReadOnly);
-  QTimer::singleShot(0, this, SLOT(delayedFinished()));
-}
-
-void AdBlockBlockedNetworkReply::abort() {
-}
-
-void AdBlockBlockedNetworkReply::setRequest(const QNetworkRequest &request) {
-  QNetworkReply::setRequest(request);
-  setUrl(request.url());
-}
-
-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/network-web/adblock/adblockblockednetworkreply.h b/src/network-web/adblock/adblockblockednetworkreply.h
deleted file mode 100755
index 7ded70a29..000000000
--- a/src/network-web/adblock/adblockblockednetworkreply.h
+++ /dev/null
@@ -1,73 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
- *
- * 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 Benjamin Meyer 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>
-
-
-class AdBlockRule;
-class AdBlockSubscription;
-
-class AdBlockBlockedNetworkReply : public QNetworkReply{
-    Q_OBJECT
-
-  public:
-    explicit AdBlockBlockedNetworkReply(const AdBlockRule *rule, QObject *parent = 0);
-
-    void abort();
-    void setRequest(const QNetworkRequest &request);
-
-  protected:
-    qint64 readData(char *data, qint64 maxSize);
-
-  private slots:
-    void delayedFinished();
-};
-
-#endif // ADBLOCKBLOCKEDNETWORKREPLY_H
-
diff --git a/src/network-web/adblock/adblockicon.cpp b/src/network-web/adblock/adblockicon.cpp
index d138eea51..30ccab7b3 100755
--- a/src/network-web/adblock/adblockicon.cpp
+++ b/src/network-web/adblock/adblockicon.cpp
@@ -30,7 +30,6 @@
 
 #include <QMenu>
 #include <QMouseEvent>
-#include <QWebEnginePage>
 
 
 AdBlockIcon::AdBlockIcon(QWidget *window, QWidget *parent)
@@ -77,9 +76,9 @@ void AdBlockIcon::createMenu(QMenu *menu) {
   menu->addSeparator();
 
   if (!page_url.host().isEmpty() && m_enabled && manager->canRunOnScheme(page_url.scheme())) {
-    const QString host = page_url.host().contains(QLatin1String("www.")) ? page_url.host().mid(4) : page_url.host();
-    const QString host_filter = QString("@@||%1^$document").arg(host);
-    const QString page_filter = QString("@@|%1|$document").arg(page_url.toString());
+    const QString host = page_url.host().contains(QSL("www.")) ? page_url.host().mid(4) : page_url.host();
+    const QString host_filter = QString(QSL("@@||%1^$document")).arg(host);
+    const QString page_filter = QString(QSL("@@|%1|$document")).arg(page_url.toString());
 
     QAction *act;
 
@@ -97,41 +96,6 @@ void AdBlockIcon::createMenu(QMenu *menu) {
 
     menu->addSeparator();
   }
-
-  if (!m_blockedPopups.isEmpty()) {
-    menu->addAction(tr("Blocked popup windows"))->setEnabled(false);
-
-    for (int i = 0; i < m_blockedPopups.count(); i++) {
-      const QPair<AdBlockRule*,QUrl> &pair = m_blockedPopups.at(i);
-
-      const QString address = pair.second.toString().right(55);
-      QString action_text = tr("%1 with (%2)").arg(address,
-                                                   pair.first->filter()).replace(QLatin1Char('&'), QLatin1String("&&"));
-
-      QAction *action = menu->addAction(action_text, manager, SLOT(showRule()));
-      action->setData(QVariant::fromValue((void*)pair.first));
-    }
-  }
-
-  menu->addSeparator();
-
-  const QVector<WebPage::AdBlockedEntry> entries = page->adBlockedEntries();
-
-  if (entries.isEmpty()) {
-    menu->addAction(tr("No content blocked"))->setEnabled(false);
-  }
-  else {
-    menu->addAction(tr("Blocked some content - click to edit rule"))->setEnabled(false);
-
-    foreach (const WebPage::AdBlockedEntry &entry, entries) {
-      QString address = entry.url.toString().right(55);
-      QString action_text = tr("%1 with (%2)").arg(address,
-                                                   entry.rule->filter()).replace(QLatin1Char('&'), QLatin1String("&&"));
-
-      QAction *action = menu->addAction(action_text, manager, SLOT(showRule()));
-      action->setData(QVariant::fromValue((void*)entry.rule));
-    }
-  }
 }
 
 void AdBlockIcon::showMenu(const QPoint &pos) {
diff --git a/src/network-web/adblock/adblockmanager.cpp b/src/network-web/adblock/adblockmanager.cpp
index 9cdea163f..d685acff0 100755
--- a/src/network-web/adblock/adblockmanager.cpp
+++ b/src/network-web/adblock/adblockmanager.cpp
@@ -21,10 +21,8 @@
 #include "network-web/adblock/adblockdialog.h"
 #include "network-web/adblock/adblockmatcher.h"
 #include "network-web/adblock/adblocksubscription.h"
-#include "network-web/adblock/adblockblockednetworkreply.h"
 #include "network-web/adblock/adblockicon.h"
 #include "network-web/webpage.h"
-#include "network-web/silentnetworkaccessmanager.h"
 #include "miscellaneous/application.h"
 #include "miscellaneous/settings.h"
 #include "definitions/definitions.h"
@@ -34,7 +32,6 @@
 #include <QTextStream>
 #include <QDir>
 #include <QTimer>
-#include <QWebEnginePage>
 
 
 AdBlockManager *AdBlockManager::s_adBlockManager = NULL;
@@ -51,7 +48,7 @@ AdBlockManager::~AdBlockManager() {
 
 AdBlockManager *AdBlockManager::instance() {
   if (s_adBlockManager == NULL) {
-    s_adBlockManager = new AdBlockManager(SilentNetworkAccessManager::instance());
+    s_adBlockManager = new AdBlockManager(qApp);
   }
 
   return s_adBlockManager;
@@ -74,36 +71,27 @@ QList<AdBlockSubscription*> AdBlockManager::subscriptions() const {
   return m_subscriptions;
 }
 
-QNetworkReply *AdBlockManager::block(const QNetworkRequest &request) {
-  const QString url_string = request.url().toEncoded().toLower();
-  const QString url_domain = request.url().host().toLower();
-  const QString url_scheme = request.url().scheme().toLower();
+bool AdBlockManager::shouldBlock(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) {
+  const QString url_string = url.toEncoded().toLower();
+  const QString url_domain = url.host().toLower();
+  const QString url_scheme = url.scheme().toLower();
 
   if (!isEnabled() || !canRunOnScheme(url_scheme)) {
     return NULL;
   }
 
-  const AdBlockRule *blocked_rule = m_matcher->match(request, url_domain, url_string);
+  const AdBlockRule *blocked_rule = m_matcher->match(url, url_domain, url_string, referer, resource_type);
 
   if (blocked_rule != NULL) {
-    QVariant v = request.attribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100));
-    WebPage *web_page = static_cast<WebPage*>(v.value<void*>());
-
-    if (WebPage::isPointerSafeToUse(web_page)) {
-      if (!canBeBlocked(web_page->url())) {
-        return NULL;
-      }
-
-      web_page->addAdBlockRule(blocked_rule, request.url());
+    if (!canBeBlocked(url, referer, resource_type)) {
+      return false;
+    }
+    else {
+      return true;
     }
-
-    AdBlockBlockedNetworkReply *reply = new AdBlockBlockedNetworkReply(blocked_rule, this);
-    reply->setRequest(request);
-
-    return reply;
   }
 
-  return NULL;
+  return false;
 }
 
 QStringList AdBlockManager::disabledRules() const {
@@ -306,25 +294,8 @@ void AdBlockManager::setUseLimitedEasyList(bool use_limited) {
   }
 }
 
-bool AdBlockManager::canBeBlocked(const QUrl &url) const {
-  return !m_matcher->adBlockDisabledForUrl(url);
-}
-
-QString AdBlockManager::elementHidingRules() const {
-  return m_matcher->elementHidingRules();
-}
-
-QString AdBlockManager::elementHidingRulesForDomain(const QUrl &url) const {
-  if (!isEnabled() || !canRunOnScheme(url.scheme()) || !canBeBlocked(url)) {
-    return QString();
-  }
-  // Acid3 doesn't like the way element hiding rules are embedded into page
-  else if (url.host() == QL1S("acid3.acidtests.org")) {
-    return QString();
-  }
-  else {
-    return m_matcher->elementHidingRulesForDomain(url.host());
-  }
+bool AdBlockManager::canBeBlocked(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const {
+  return !m_matcher->adBlockDisabledForUrl(url, referer, resource_type);
 }
 
 AdBlockSubscription *AdBlockManager::subscriptionByName(const QString &name) const {
diff --git a/src/network-web/adblock/adblockmanager.h b/src/network-web/adblock/adblockmanager.h
index 02e6f3f21..2678a6c60 100755
--- a/src/network-web/adblock/adblockmanager.h
+++ b/src/network-web/adblock/adblockmanager.h
@@ -23,12 +23,10 @@
 
 #include <QStringList>
 #include <QPointer>
+#include <QWebEngineUrlRequestInfo>
 
 
 class QUrl;
-class QNetworkReply;
-class QNetworkRequest;
-
 class AdBlockRule;
 class AdBlockDialog;
 class AdBlockMatcher;
@@ -52,13 +50,10 @@ class AdBlockManager : public QObject {
     bool useLimitedEasyList() const;
     void setUseLimitedEasyList(bool use_limited);
 
-    QString elementHidingRules() const;
-    QString elementHidingRulesForDomain(const QUrl &url) const;
-
     AdBlockSubscription *subscriptionByName(const QString &name) const;
     QList<AdBlockSubscription*> subscriptions() const;
 
-    QNetworkReply *block(const QNetworkRequest &request);
+    bool shouldBlock(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type);
 
     QStringList disabledRules() const;
     void addDisabledRule(const QString &filter);
@@ -74,9 +69,6 @@ class AdBlockManager : public QObject {
     static QString baseSubscriptionDirectory();
     static AdBlockManager *instance();
 
-  signals:
-    void enabledChanged(bool enabled);
-
   public slots:
     void setEnabled(bool enabled);
     void showRule();
@@ -84,8 +76,11 @@ class AdBlockManager : public QObject {
 
     AdBlockDialog *showDialog();
 
+  signals:
+    void enabledChanged(bool enabled);
+
   private:
-    bool canBeBlocked(const QUrl &url) const;
+    bool canBeBlocked(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
 
     bool m_loaded;
     bool m_enabled;
diff --git a/src/network-web/adblock/adblockmatcher.cpp b/src/network-web/adblock/adblockmatcher.cpp
index 6a0b77edd..9874586c3 100755
--- a/src/network-web/adblock/adblockmatcher.cpp
+++ b/src/network-web/adblock/adblockmatcher.cpp
@@ -32,30 +32,31 @@ AdBlockMatcher::~AdBlockMatcher() {
   clear();
 }
 
-const AdBlockRule *AdBlockMatcher::match(const QNetworkRequest &request, const QString &url_domain,
-                                         const QString &url_string) const {
+const AdBlockRule *AdBlockMatcher::match(const QUrl &url, const QString &url_domain,
+                                         const QString &url_string, const QString &referer,
+                                         QWebEngineUrlRequestInfo::ResourceType resource_type) const {
   // Exception rules.
-  if (m_networkExceptionTree.find(request, url_domain, url_string)) {
+  if (m_networkExceptionTree.find(url, url_domain, url_string, referer, resource_type)) {
     return NULL;
   }
 
   for (int i = 0, count = m_networkExceptionRules.size(); i < count; i++) {
     const AdBlockRule *rule = m_networkExceptionRules.at(i);
 
-    if (rule->networkMatch(request, url_domain, url_string)) {
+    if (rule->networkMatch(url, url_domain, url_string, referer, resource_type)) {
       return NULL;
     }
   }
 
   // Block rules.
-  if (const AdBlockRule* rule = m_networkBlockTree.find(request, url_domain, url_string)) {
+  if (const AdBlockRule* rule = m_networkBlockTree.find(url, url_domain, url_string, referer, resource_type)) {
     return rule;
   }
 
   for (int i = 0, count = m_networkBlockRules.size(); i < count; i++) {
     const AdBlockRule *rule = m_networkBlockRules.at(i);
 
-    if (rule->networkMatch(request, url_domain, url_string)) {
+    if (rule->networkMatch(url, url_domain, url_string, referer, resource_type)) {
       return rule;
     }
   }
@@ -63,9 +64,10 @@ const AdBlockRule *AdBlockMatcher::match(const QNetworkRequest &request, const Q
   return NULL;
 }
 
-bool AdBlockMatcher::adBlockDisabledForUrl(const QUrl &url) const {
+bool AdBlockMatcher::adBlockDisabledForUrl(const QUrl &url, const QString &referer,
+                                           QWebEngineUrlRequestInfo::ResourceType resource_type) const {
   for (int i = 0, count = m_documentRules.size(); i < count; i++) {
-    if (m_documentRules.at(i)->urlMatch(url)) {
+    if (m_documentRules.at(i)->urlMatch(url, referer, resource_type)) {
       return true;
     }
   }
@@ -73,60 +75,9 @@ bool AdBlockMatcher::adBlockDisabledForUrl(const QUrl &url) const {
   return false;
 }
 
-bool AdBlockMatcher::elemHideDisabledForUrl(const QUrl &url) const {
-  if (adBlockDisabledForUrl(url)) {
-    return true;
-  }
-
-  for (int i = 0, count = m_elemhideRules.size(); i < count; i++) {
-    if (m_elemhideRules.at(i)->urlMatch(url)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-QString AdBlockMatcher::elementHidingRules() const {
-  return m_elementHidingRules;
-}
-
-QString AdBlockMatcher::elementHidingRulesForDomain(const QString &domain) const {
-  QString rules;
-  int added_rules_count = 0;
-
-  for (int i = 0, count = m_domainRestrictedCssRules.size(); i < count; i++) {
-    const AdBlockRule *rule = m_domainRestrictedCssRules.at(i);
-
-    if (!rule->matchDomain(domain)) {
-      continue;
-    }
-
-    if (added_rules_count == 1000) {
-      rules.append(rule->cssSelector());
-      rules.append(QL1S("{display:none !important;}\n"));
-      added_rules_count = 0;
-    }
-    else {
-      rules.append(rule->cssSelector() + QL1C(','));
-      added_rules_count++;
-    }
-  }
-
-  if (added_rules_count != 0) {
-    rules = rules.left(rules.size() - 1);
-    rules.append(QLatin1String("{display:none !important;}\n"));
-  }
-
-  return rules;
-}
-
 void AdBlockMatcher::update() {
   clear();
 
-  QHash<QString, const AdBlockRule*> css_rules_hash;
-  QVector<const AdBlockRule*> exception_css_rules;
-
   foreach (const AdBlockSubscription *subscription, m_manager->subscriptions()) {
     foreach (const AdBlockRule *rule, subscription->allRules()) {
       // Don't add internally disabled rules to cache
@@ -134,26 +85,9 @@ void AdBlockMatcher::update() {
         continue;
       }
 
-      if (rule->isCssRule()) {
-        // We will add only enabled css rules to cache, because there is no enabled/disabled
-        // check on match. They are directly embedded to pages.
-        if (!rule->isEnabled()) {
-          continue;
-        }
-
-        if (rule->isException()) {
-          exception_css_rules.append(rule);
-        }
-        else {
-          css_rules_hash.insert(rule->cssSelector(), rule);
-        }
-      }
-      else if (rule->isDocument()) {
+      if (rule->isDocument()) {
         m_documentRules.append(rule);
       }
-      else if (rule->isElemhide()) {
-        m_elemhideRules.append(rule);
-      }
       else if (rule->isException()) {
         if (!m_networkExceptionTree.add(rule)) {
           m_networkExceptionRules.append(rule);
@@ -166,52 +100,6 @@ void AdBlockMatcher::update() {
       }
     }
   }
-
-  foreach (const AdBlockRule *rule, exception_css_rules) {
-    const AdBlockRule *original_rule = css_rules_hash.value(rule->cssSelector());
-
-    // If we don't have this selector, the exception does nothing.
-    if (original_rule == NULL) {
-      continue;
-    }
-
-    AdBlockRule *copied_rule = original_rule->copy();
-
-    copied_rule->m_options |= AdBlockRule::DomainRestrictedOption;
-    copied_rule->m_blockedDomains.append(rule->m_allowedDomains);
-    css_rules_hash[rule->cssSelector()] = copied_rule;
-    m_createdRules.append(copied_rule);
-  }
-
-  // Apparently, excessive amount of selectors for one CSS rule is not what WebKit likes.
-  // (In my testings, 4931 is the number that makes it crash)
-  // So let's split it by 1000 selectors.
-  int hiding_rules_count = 0;
-
-  QHashIterator<QString,const AdBlockRule*> it(css_rules_hash);
-
-  while (it.hasNext()) {
-    it.next();
-    const AdBlockRule *rule = it.value();
-
-    if (rule->isDomainRestricted()) {
-      m_domainRestrictedCssRules.append(rule);
-    }
-    else if (hiding_rules_count == 1000) {
-      m_elementHidingRules.append(rule->cssSelector());
-      m_elementHidingRules.append(QL1S("{display:none !important;} "));
-      hiding_rules_count = 0;
-    }
-    else {
-      m_elementHidingRules.append(rule->cssSelector() + QL1C(','));
-      hiding_rules_count++;
-    }
-  }
-
-  if (hiding_rules_count != 0) {
-    m_elementHidingRules = m_elementHidingRules.left(m_elementHidingRules.size() - 1);
-    m_elementHidingRules.append(QLatin1String("{display:none !important;} "));
-  }
 }
 
 void AdBlockMatcher::clear() {
@@ -222,12 +110,7 @@ void AdBlockMatcher::clear() {
   m_networkBlockRules.clear();
 
   m_domainRestrictedCssRules.clear();
-  m_elementHidingRules.clear();
   m_documentRules.clear();
-  m_elemhideRules.clear();
-
-  qDeleteAll(m_createdRules);
-  m_createdRules.clear();
 }
 
 void AdBlockMatcher::enabledChanged(bool enabled) {
diff --git a/src/network-web/adblock/adblockmatcher.h b/src/network-web/adblock/adblockmatcher.h
index ed5fd85ec..dcc695803 100755
--- a/src/network-web/adblock/adblockmatcher.h
+++ b/src/network-web/adblock/adblockmatcher.h
@@ -37,13 +37,10 @@ class AdBlockMatcher : public QObject {
     explicit AdBlockMatcher(AdBlockManager *manager);
     virtual ~AdBlockMatcher();
 
-    const AdBlockRule *match(const QNetworkRequest &request, const QString &url_domain, const QString &url_string) const;
+    const AdBlockRule *match(const QUrl &url, const QString &url_domain, const QString &url_string,
+                             const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
 
-    bool adBlockDisabledForUrl(const QUrl &url) const;
-    bool elemHideDisabledForUrl(const QUrl &url) const;
-
-    QString elementHidingRules() const;
-    QString elementHidingRulesForDomain(const QString &domain) const;
+    bool adBlockDisabledForUrl(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
 
   public slots:
     void update();
@@ -55,14 +52,11 @@ class AdBlockMatcher : public QObject {
   private:
     AdBlockManager *m_manager;
 
-    QVector<AdBlockRule*> m_createdRules;
     QVector<const AdBlockRule*> m_networkExceptionRules;
     QVector<const AdBlockRule*> m_networkBlockRules;
     QVector<const AdBlockRule*> m_domainRestrictedCssRules;
     QVector<const AdBlockRule*> m_documentRules;
-    QVector<const AdBlockRule*> m_elemhideRules;
 
-    QString m_elementHidingRules;
     AdBlockSearchTree m_networkBlockTree;
     AdBlockSearchTree m_networkExceptionTree;
 };
diff --git a/src/network-web/adblock/adblockrule.cpp b/src/network-web/adblock/adblockrule.cpp
index e364c959e..40c77626d 100755
--- a/src/network-web/adblock/adblockrule.cpp
+++ b/src/network-web/adblock/adblockrule.cpp
@@ -111,14 +111,6 @@ void AdBlockRule::setFilter(const QString &filter) {
   parseFilter();
 }
 
-bool AdBlockRule::isCssRule() const {
-  return m_type == CssRule;
-}
-
-QString AdBlockRule::cssSelector() const {
-  return m_matchString;
-}
-
 bool AdBlockRule::isDocument() const {
   return hasOption(DocumentOption);
 }
@@ -155,17 +147,19 @@ bool AdBlockRule::isInternalDisabled() const {
   return m_isInternalDisabled;
 }
 
-bool AdBlockRule::urlMatch(const QUrl &url) const {
+bool AdBlockRule::urlMatch(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const {
   if (!hasOption(DocumentOption) && !hasOption(ElementHideOption)) {
     return false;
   }
   else {
-    return networkMatch(QNetworkRequest(url), url.host(), url.toEncoded());
+    return networkMatch(url, url.host(), url.toEncoded(), referer, resource_type);
   }
 }
 
-bool AdBlockRule::networkMatch(const QNetworkRequest &request, const QString &domain, const QString &encoded_url) const {
-  if (m_type == CssRule || !m_isEnabled || m_isInternalDisabled) {
+bool AdBlockRule::networkMatch(const QUrl &url, const QString &domain,
+                               const QString &encoded_url, const QString &referer,
+                               QWebEngineUrlRequestInfo::ResourceType resource_type) const {
+  if (!m_isEnabled || m_isInternalDisabled) {
     return false;
   }
 
@@ -195,22 +189,22 @@ bool AdBlockRule::networkMatch(const QNetworkRequest &request, const QString &do
     }
 
     // Check third-party restriction.
-    if (hasOption(ThirdPartyOption) && !matchThirdParty(request)) {
+    if (hasOption(ThirdPartyOption) && !matchThirdParty(referer, url)) {
       return false;
     }
 
     // Check object restrictions.
-    if (hasOption(ObjectOption) && !matchObject(request)) {
+    if (hasOption(ObjectOption) && !matchObject(resource_type)) {
       return false;
     }
 
     // Check subdocument restriction.
-    if (hasOption(SubdocumentOption) && !matchSubdocument(request)) {
+    if (hasOption(SubdocumentOption)) {
       return false;
     }
 
     // Check xmlhttprequest restriction
-    if (hasOption(XMLHttpRequestOption) && !matchXmlHttpRequest(request)) {
+    if (hasOption(XMLHttpRequestOption)) {
       return false;
     }
 
@@ -265,38 +259,26 @@ bool AdBlockRule::matchDomain(const QString &domain) const {
   return false;
 }
 
-bool AdBlockRule::matchThirdParty(const QNetworkRequest &request) const {
-  const QString referer = request.attribute(QNetworkRequest::Attribute(QNetworkRequest::User + 151), QString()).toString();
-
+bool AdBlockRule::matchThirdParty(const QString &referer, const QUrl &url) const {
   if (referer.isEmpty()) {
     return false;
   }
 
   // Third-party matching should be performed on second-level domains.
   const QString refererHost = WebFactory::instance()->toSecondLevelDomain(QUrl(referer));
-  const QString host = WebFactory::instance()->toSecondLevelDomain(request.url());
+  const QString host = WebFactory::instance()->toSecondLevelDomain(url);
 
   bool match = refererHost != host;
 
   return hasException(ThirdPartyOption) ? !match : match;
 }
 
-bool AdBlockRule::matchObject(const QNetworkRequest &request) const {
-  bool match = request.attribute(QNetworkRequest::Attribute(QNetworkRequest::User + 150)).toString() == QL1S("object");
+bool AdBlockRule::matchObject(QWebEngineUrlRequestInfo::ResourceType type) const {
+  bool match = type == QWebEngineUrlRequestInfo::ResourceTypeObject;
 
   return hasException(ObjectOption) ? !match : match;
 }
 
-bool AdBlockRule::matchSubdocument(const QNetworkRequest &request) const {
-  return false;
-}
-
-bool AdBlockRule::matchXmlHttpRequest(const QNetworkRequest &request) const {
-  bool match = request.rawHeader("X-Requested-With") == QByteArray("XMLHttpRequest");
-
-  return hasException(XMLHttpRequestOption) ? !match : match;
-}
-
 bool AdBlockRule::matchImage(const QString &encoded_url) const {
   bool match = encoded_url.endsWith(QL1S(".png")) ||
                encoded_url.endsWith(QL1S(".jpg")) ||
@@ -321,19 +303,7 @@ void AdBlockRule::parseFilter() {
 
   // CSS Element hiding rule.
   if (parsed_line.contains(QL1S("##")) || parsed_line.contains(QL1S("#@#"))) {
-    m_type = CssRule;
-    int pos = parsed_line.indexOf(QL1C('#'));
-
-    // Domain restricted rule
-    if (!parsed_line.startsWith(QL1S("##"))) {
-      QString domains = parsed_line.left(pos);
-      parseDomains(domains, QL1C(','));
-    }
-
-    m_isException = parsed_line.at(pos + 1) == QL1C('@');
-    m_matchString = parsed_line.mid(m_isException ? pos + 3 : pos + 2);
-
-    // CSS rule cannot have more options -> stop parsing.
+    // Do not parse CSS rules.
     return;
   }
 
diff --git a/src/network-web/adblock/adblockrule.h b/src/network-web/adblock/adblockrule.h
index 19b1a37a0..5a6e2b5c9 100755
--- a/src/network-web/adblock/adblockrule.h
+++ b/src/network-web/adblock/adblockrule.h
@@ -49,6 +49,7 @@
 
 #include <QObject>
 #include <QStringList>
+#include <QWebEngineUrlRequestInfo>
 
 class QNetworkRequest;
 class QUrl;
@@ -72,9 +73,6 @@ class AdBlockRule {
     QString filter() const;
     void setFilter(const QString &filter);
 
-    bool isCssRule() const;
-    QString cssSelector() const;
-
     bool isDocument() const;
     bool isElemhide() const;
 
@@ -88,14 +86,13 @@ class AdBlockRule {
     bool isSlow() const;
     bool isInternalDisabled() const;
 
-    bool urlMatch(const QUrl &url) const;
-    bool networkMatch(const QNetworkRequest &request, const QString &domain, const QString &encoded_url) const;
+    bool urlMatch(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
+    bool networkMatch(const QUrl &url, const QString &domain, const QString &encoded_url,
+                      const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
 
     bool matchDomain(const QString &domain) const;
-    bool matchThirdParty(const QNetworkRequest &request) const;
-    bool matchObject(const QNetworkRequest &request) const;
-    bool matchSubdocument(const QNetworkRequest &request) const;
-    bool matchXmlHttpRequest(const QNetworkRequest &request) const;
+    bool matchThirdParty(const QString &referer, const QUrl &url) const;
+    bool matchObject(QWebEngineUrlRequestInfo::ResourceType type) const;
     bool matchImage(const QString &encoded_url) const;
 
   protected:
@@ -105,7 +102,6 @@ class AdBlockRule {
 
   private:
     enum RuleType {
-      CssRule = 0,
       DomainMatchRule = 1,
       RegExpMatchRule = 2,
       StringEndsMatchRule = 3,
diff --git a/src/network-web/adblock/adblocksearchtree.cpp b/src/network-web/adblock/adblocksearchtree.cpp
index 969b731c8..f7f272e89 100755
--- a/src/network-web/adblock/adblocksearchtree.cpp
+++ b/src/network-web/adblock/adblocksearchtree.cpp
@@ -65,8 +65,9 @@ bool AdBlockSearchTree::add(const AdBlockRule *rule) {
   return true;
 }
 
-const AdBlockRule *AdBlockSearchTree::find(const QNetworkRequest &request, const QString &domain,
-                                           const QString &url_string) const {
+const AdBlockRule *AdBlockSearchTree::find(const QUrl &url, const QString &domain,
+                                           const QString &url_string, const QString &referer,
+                                           QWebEngineUrlRequestInfo::ResourceType resource_type) const {
   const int len = url_string.size();
 
   if (len <= 0) {
@@ -76,7 +77,7 @@ const AdBlockRule *AdBlockSearchTree::find(const QNetworkRequest &request, const
   const QChar *string = url_string.constData();
 
   for (int i = 0; i < len; i++) {
-    const AdBlockRule *rule = prefixSearch(request, domain, url_string, string++, len - i);
+    const AdBlockRule *rule = prefixSearch(url, domain, url_string, string++, referer, resource_type, len - i);
 
     if (rule != NULL) {
       return rule;
@@ -86,8 +87,10 @@ const AdBlockRule *AdBlockSearchTree::find(const QNetworkRequest &request, const
   return NULL;
 }
 
-const AdBlockRule *AdBlockSearchTree::prefixSearch(const QNetworkRequest &request, const QString &domain,
-                                                   const QString &url_string, const QChar* string, int len) const {
+const AdBlockRule *AdBlockSearchTree::prefixSearch(const QUrl &url, const QString &domain,
+                                                   const QString &url_string, const QChar* string,
+                                                   const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type,
+                                                   int len) const {
   if (len <= 0) {
     return NULL;
   }
@@ -103,7 +106,7 @@ const AdBlockRule *AdBlockSearchTree::prefixSearch(const QNetworkRequest &reques
   for (int i = 1; i < len; i++) {
     const QChar c = (++string)[0];
 
-    if (node->rule && node->rule->networkMatch(request, domain, url_string)) {
+    if (node->rule && node->rule->networkMatch(url, domain, url_string, referer, resource_type)) {
       return node->rule;
     }
 
@@ -114,7 +117,7 @@ const AdBlockRule *AdBlockSearchTree::prefixSearch(const QNetworkRequest &reques
     node = node->children[c];
   }
 
-  if (node->rule && node->rule->networkMatch(request, domain, url_string)) {
+  if (node->rule && node->rule->networkMatch(url, domain, url_string, referer, resource_type)) {
     return node->rule;
   }
 
diff --git a/src/network-web/adblock/adblocksearchtree.h b/src/network-web/adblock/adblocksearchtree.h
index 83e3c6431..09a539ad8 100755
--- a/src/network-web/adblock/adblocksearchtree.h
+++ b/src/network-web/adblock/adblocksearchtree.h
@@ -21,6 +21,8 @@
 
 #include <QChar>
 #include <QHash>
+#include <QUrl>
+#include <QWebEngineUrlRequestInfo>
 
 
 class QNetworkRequest;
@@ -34,7 +36,8 @@ class AdBlockSearchTree {
     void clear();
 
     bool add(const AdBlockRule *rule);
-    const AdBlockRule *find(const QNetworkRequest &request, const QString &domain, const QString &url_string) const;
+    const AdBlockRule *find(const QUrl &url, const QString &domain, const QString &url_string,
+                            const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
 
   private:
     struct Node {
@@ -48,8 +51,9 @@ class AdBlockSearchTree {
     };
 
     void deleteNode(Node *node);
-    const AdBlockRule *prefixSearch(const QNetworkRequest &request, const QString &domain,
-                                    const QString &url_string, const QChar* string, int len) const;
+    const AdBlockRule *prefixSearch(const QUrl &url, const QString &domain,
+                                    const QString &url_string, const QChar* string, const QString &referer,
+                                    QWebEngineUrlRequestInfo::ResourceType resource_type, int len) const;
 
     Node *m_root;
 };
diff --git a/src/network-web/adblock/adblocktreewidget.cpp b/src/network-web/adblock/adblocktreewidget.cpp
index f5909139b..77110f5d4 100755
--- a/src/network-web/adblock/adblocktreewidget.cpp
+++ b/src/network-web/adblock/adblocktreewidget.cpp
@@ -203,10 +203,6 @@ void AdBlockTreeWidget::adjustItemFeatures(QTreeWidgetItem *item, const AdBlockR
     item->setForeground(0, QColor(Qt::darkGreen));
     item->setFont(0, QFont());
   }
-  else if (rule->isCssRule()) {
-    item->setForeground(0, QColor(Qt::darkBlue));
-    item->setFont(0, QFont());
-  }
   else {
     item->setForeground(0, QColor());
     item->setFont(0, QFont());
diff --git a/src/network-web/adblock/requestinterceptor.cpp b/src/network-web/adblock/requestinterceptor.cpp
index 1f192dc6b..d9c53d354 100644
--- a/src/network-web/adblock/requestinterceptor.cpp
+++ b/src/network-web/adblock/requestinterceptor.cpp
@@ -1,5 +1,41 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
 #include "network-web/adblock/requestinterceptor.h"
 
+#include "network-web/adblock/adblockmanager.h"
+#include "miscellaneous/application.h"
 
-RequestInterceptor::RequestInterceptor(QObject *p) : QWebEngineUrlRequestInterceptor(p) {
+
+RequestInterceptor::RequestInterceptor(QObject *parent) : QWebEngineUrlRequestInterceptor(parent) {
+}
+
+RequestInterceptor::~RequestInterceptor() {
+}
+
+void RequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info) {
+  if (AdBlockManager::instance()->shouldBlock(info.requestUrl(), info.firstPartyUrl().toString(), info.resourceType())) {
+    info.block(true);
+    qWarning("%s just blocked network resource:\n URL: '%s'.", APP_NAME, qPrintable(info.requestUrl().toString()));
+
+    /*
+    qApp->showGuiMessage(tr("Network resource blocked"),
+                         tr("%1 just blocked network resource:\n URL: %2").arg(APP_NAME, info.requestUrl().toString()),
+                         QSystemTrayIcon::Information);
+    */
+  }
 }
diff --git a/src/network-web/adblock/requestinterceptor.h b/src/network-web/adblock/requestinterceptor.h
index d06b1503e..2b8eafc95 100644
--- a/src/network-web/adblock/requestinterceptor.h
+++ b/src/network-web/adblock/requestinterceptor.h
@@ -1,10 +1,33 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
 #ifndef REQUESTINTERCEPTOR_H
 #define REQUESTINTERCEPTOR_H
 
+#include <QWebEngineUrlRequestInterceptor>
+
+
 
 class RequestInterceptor : public QWebEngineUrlRequestInterceptor {
   public:
-    RequestInterceptor();
+    explicit RequestInterceptor(QObject *parent = 0);
+    virtual ~RequestInterceptor();
+
+    void interceptRequest(QWebEngineUrlRequestInfo &info);
 };
 
 #endif // REQUESTINTERCEPTOR_H
diff --git a/src/network-web/webbrowsernetworkaccessmanager.cpp b/src/network-web/webbrowsernetworkaccessmanager.cpp
deleted file mode 100755
index 643d0cf4b..000000000
--- a/src/network-web/webbrowsernetworkaccessmanager.cpp
+++ /dev/null
@@ -1,70 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/webbrowsernetworkaccessmanager.h"
-
-#include "miscellaneous/application.h"
-
-#include "network-web/adblock/adblockmanager.h"
-
-#include <QNetworkReply>
-
-
-QPointer<WebBrowserNetworkAccessManager> WebBrowserNetworkAccessManager::s_instance;
-
-WebBrowserNetworkAccessManager::WebBrowserNetworkAccessManager(WebPage *page, QObject *parent)
-  : BaseNetworkAccessManager(parent), m_page(page) {
-  connect(this, SIGNAL(authenticationRequired(QNetworkReply*,QAuthenticator*)),
-          this, SLOT(onAuthenticationRequired(QNetworkReply*,QAuthenticator*)));
-}
-
-WebBrowserNetworkAccessManager::~WebBrowserNetworkAccessManager() {
-  qDebug("Destroying WebBrowserNetworkAccessManager instance.");
-}
-
-void WebBrowserNetworkAccessManager::onAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator) {
-  Q_UNUSED(authenticator);
-
-  // FIXME: Support authentication for web pages.
-  qDebug("URL '%s' requested authentication but username/password is not available.", qPrintable(reply->url().toString()));
-}
-
-QNetworkReply *WebBrowserNetworkAccessManager::createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &request, QIODevice *outgoingData) {
-  if (m_page != NULL) {
-    QNetworkRequest page_request = request;
-    m_page->populateNetworkRequest(page_request);
-    return WebBrowserNetworkAccessManager::instance()->createRequest(op, page_request, outgoingData);
-  }
-
-  if (op == QNetworkAccessManager::GetOperation) {
-    QNetworkReply *reply = AdBlockManager::instance()->block(request);
-
-    if (reply != NULL) {
-      return reply;
-    }
-  }
-
-  return BaseNetworkAccessManager::createRequest(op, request, outgoingData);
-}
-
-WebBrowserNetworkAccessManager *WebBrowserNetworkAccessManager::instance() {
-  if (s_instance.isNull()) {
-    s_instance = new WebBrowserNetworkAccessManager(0, qApp);
-  }
-
-  return s_instance;
-}
diff --git a/src/network-web/webbrowsernetworkaccessmanager.h b/src/network-web/webbrowsernetworkaccessmanager.h
deleted file mode 100755
index b4893cee7..000000000
--- a/src/network-web/webbrowsernetworkaccessmanager.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef WEBBROWSERNETWORKACCESSMANAGER_H
-#define WEBBROWSERNETWORKACCESSMANAGER_H
-
-#include "network-web/basenetworkaccessmanager.h"
-
-#include "webpage.h"
-
-#include <QPointer>
-
-
-// This is network access manager for web browsers.
-class WebBrowserNetworkAccessManager : public BaseNetworkAccessManager {
-    Q_OBJECT
-
-  public:
-    // Constructors and destructors.
-    explicit WebBrowserNetworkAccessManager(WebPage *page = 0, QObject *parent = 0);
-    virtual ~WebBrowserNetworkAccessManager();
-
-    // Returns pointer to global network access manager
-    // used by ALL web browsers and download manager.
-    static WebBrowserNetworkAccessManager *instance();
-
-  protected:
-    QNetworkReply *createRequest(Operation op, const QNetworkRequest &request, QIODevice *outgoingData);
-
-  protected slots:
-    void onAuthenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator);
-
-  private:
-    WebPage *m_page;
-
-    static QPointer<WebBrowserNetworkAccessManager> s_instance;
-};
-
-#endif // WEBBROWSERNETWORKACCESSMANAGER_H
diff --git a/src/network-web/webpage.cpp b/src/network-web/webpage.cpp
index 74063dc1c..81bdb5ded 100755
--- a/src/network-web/webpage.cpp
+++ b/src/network-web/webpage.cpp
@@ -20,24 +20,14 @@
 #include "network-web/webbrowser.h"
 #include "miscellaneous/application.h"
 
-#include "network-web/adblock/adblockmanager.h"
-
-#include <QNetworkReply>
-
-
-QList<WebPage*> WebPage::s_livingPages;
 
 WebPage::WebPage(QObject *parent)
   : QWebEnginePage(parent), m_loadProgress(-1) {
   connect(this, SIGNAL(loadProgress(int)), this, SLOT(progress(int)));
   connect(this, SIGNAL(loadFinished(bool)), this, SLOT(finished()));
-  connect(this, SIGNAL(urlChanged(QUrl)), this, SLOT(urlChanged(QUrl)));
-
-  s_livingPages.append(this);
 }
 
 WebPage::~WebPage() {
-  s_livingPages.removeOne(this);
 }
 
 bool WebPage::isLoading() const {
@@ -52,44 +42,6 @@ void WebPage::finished() {
   progress(100);
 }
 
-void WebPage::urlChanged(const QUrl &url) {
-  Q_UNUSED(url)
-
-  if (isLoading()) {
-    m_adBlockedEntries.clear();
-  }
-}
-
-void WebPage::addAdBlockRule(const AdBlockRule *rule, const QUrl &url) {
-  AdBlockedEntry entry;
-
-  entry.rule = rule;
-  entry.url = url;
-
-  if (!m_adBlockedEntries.contains(entry)) {
-    m_adBlockedEntries.append(entry);
-  }
-}
-
-QVector<WebPage::AdBlockedEntry> WebPage::adBlockedEntries() const {
-  return m_adBlockedEntries;
-}
-
-bool WebPage::isPointerSafeToUse(WebPage *page) {
-  // Pointer to WebPage is passed with every QNetworkRequest casted to void*
-  // So there is no way to test whether pointer is still valid or not, except
-  // this hack.
-
-  return page == 0 ? false : s_livingPages.contains(page);
-}
-
-void WebPage::populateNetworkRequest(QNetworkRequest &request) {
-  WebPage *page_pointer = this;
-
-  QVariant variant = QVariant::fromValue((void*) page_pointer);
-  request.setAttribute((QNetworkRequest::Attribute)(QNetworkRequest::User + 100), variant);
-}
-
 QString WebPage::toHtml() const {
   return QString();
   // TODO: TODO
diff --git a/src/network-web/webpage.h b/src/network-web/webpage.h
index eb61186e1..1da11261a 100755
--- a/src/network-web/webpage.h
+++ b/src/network-web/webpage.h
@@ -28,35 +28,18 @@ class WebPage : public QWebEnginePage {
     Q_OBJECT
 
   public:
-    struct AdBlockedEntry {
-        const AdBlockRule *rule;
-        QUrl url;
-
-        bool operator==(const AdBlockedEntry &other) const {
-          return (this->rule == other.rule && this->url == other.url);
-        }
-    };
-
     // Constructors and destructors.
     explicit WebPage(QObject *parent = 0);
     virtual ~WebPage();
 
     QString toHtml() const;
     bool isLoading() const;
-    QVector<AdBlockedEntry> adBlockedEntries() const;
-
-    void populateNetworkRequest(QNetworkRequest &request);
-    void addAdBlockRule(const AdBlockRule *rule, const QUrl &url);
-
-    static bool isPointerSafeToUse(WebPage *page);
 
   private slots:
     void progress(int prog);
     void finished();
-    void urlChanged(const QUrl &url);
 
   private:
-    QVector<AdBlockedEntry> m_adBlockedEntries;
     int m_loadProgress;
 
     static QList<WebPage*> s_livingPages;

From 1759d31a8b2609fbe9482b694cf3a7664574d015 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 23 Mar 2016 09:20:23 +0100
Subject: [PATCH 06/31] Remove adblock completely.

---
 CMakeLists.txt                                |   4 +-
 src/gui/statusbar.cpp                         |  18 +-
 src/gui/statusbar.h                           |   3 -
 src/miscellaneous/application.cpp             |   2 -
 src/miscellaneous/settings.cpp                |   5 -
 .../adblock/adblockaddsubscriptiondialog.cpp  | 129 ----
 .../adblock/adblockaddsubscriptiondialog.h    |  70 --
 .../adblock/adblockaddsubscriptiondialog.ui   | 114 ----
 src/network-web/adblock/adblockdialog.cpp     | 213 ------
 src/network-web/adblock/adblockdialog.h       |  84 ---
 src/network-web/adblock/adblockdialog.ui      | 154 -----
 src/network-web/adblock/adblockicon.cpp       | 151 -----
 src/network-web/adblock/adblockicon.h         |  61 --
 src/network-web/adblock/adblockmanager.cpp    | 328 ---------
 src/network-web/adblock/adblockmanager.h      |  97 ---
 src/network-web/adblock/adblockmatcher.cpp    | 123 ----
 src/network-web/adblock/adblockmatcher.h      |  64 --
 src/network-web/adblock/adblockrule.cpp       | 638 ------------------
 src/network-web/adblock/adblockrule.h         | 176 -----
 src/network-web/adblock/adblocksearchtree.cpp | 140 ----
 src/network-web/adblock/adblocksearchtree.h   |  61 --
 .../adblock/adblocksubscription.cpp           | 393 -----------
 src/network-web/adblock/adblocksubscription.h | 141 ----
 src/network-web/adblock/adblocktreewidget.cpp | 337 ---------
 src/network-web/adblock/adblocktreewidget.h   |  75 --
 .../adblock/requestinterceptor.cpp            |  41 --
 src/network-web/adblock/requestinterceptor.h  |  33 -
 27 files changed, 3 insertions(+), 3652 deletions(-)
 delete mode 100755 src/network-web/adblock/adblockaddsubscriptiondialog.cpp
 delete mode 100755 src/network-web/adblock/adblockaddsubscriptiondialog.h
 delete mode 100755 src/network-web/adblock/adblockaddsubscriptiondialog.ui
 delete mode 100755 src/network-web/adblock/adblockdialog.cpp
 delete mode 100755 src/network-web/adblock/adblockdialog.h
 delete mode 100755 src/network-web/adblock/adblockdialog.ui
 delete mode 100755 src/network-web/adblock/adblockicon.cpp
 delete mode 100755 src/network-web/adblock/adblockicon.h
 delete mode 100755 src/network-web/adblock/adblockmanager.cpp
 delete mode 100755 src/network-web/adblock/adblockmanager.h
 delete mode 100755 src/network-web/adblock/adblockmatcher.cpp
 delete mode 100755 src/network-web/adblock/adblockmatcher.h
 delete mode 100755 src/network-web/adblock/adblockrule.cpp
 delete mode 100755 src/network-web/adblock/adblockrule.h
 delete mode 100755 src/network-web/adblock/adblocksearchtree.cpp
 delete mode 100755 src/network-web/adblock/adblocksearchtree.h
 delete mode 100755 src/network-web/adblock/adblocksubscription.cpp
 delete mode 100755 src/network-web/adblock/adblocksubscription.h
 delete mode 100755 src/network-web/adblock/adblocktreewidget.cpp
 delete mode 100755 src/network-web/adblock/adblocktreewidget.h
 delete mode 100644 src/network-web/adblock/requestinterceptor.cpp
 delete mode 100644 src/network-web/adblock/requestinterceptor.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 62c936630..e02fb7505 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -291,7 +291,6 @@ file( GLOB APP_SOURCES_GL
   "src/services/owncloud/network/*.cpp"
   "src/services/owncloud/gui/*.cpp"
   "src/network-web/*.cpp"
-  "src/network-web/adblock/*.cpp"
   "src/*.cpp")
 
 set(APP_SOURCES
@@ -322,8 +321,7 @@ file( GLOB APP_HEADERS
   "src/services/owncloud/*.h"
   "src/services/owncloud/network/*.h"
   "src/services/owncloud/gui/*.h"
-  "src/network-web/*.h"
-  "src/network-web/adblock/*.h")
+  "src/network-web/*.h")
 
 # APP forms.
 file( GLOB APP_FORMS
diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp
index cacaecf82..54133e47c 100755
--- a/src/gui/statusbar.cpp
+++ b/src/gui/statusbar.cpp
@@ -20,7 +20,6 @@
 #include "gui/dialogs/formmain.h"
 #include "gui/tabwidget.h"
 #include "gui/plaintoolbutton.h"
-#include "network-web/adblock/adblockicon.h"
 #include "miscellaneous/iconfactory.h"
 
 #include <QToolButton>
@@ -33,13 +32,6 @@ StatusBar::StatusBar(QWidget *parent) : QStatusBar(parent) {
   setSizeGripEnabled(false);
   setContentsMargins(2, 2, 2, 2);
 
-  m_adBlockIcon = new AdBlockIcon(this);
-  m_adBlockIcon->activate();
-  m_adBlockIcon->setObjectName(QSL("m_adBlockIcon"));
-
-  m_adBlockIconAction = new QAction(qApp->icons()->fromTheme("web-adblock"), tr("Adblock"), this);
-  m_adBlockIconAction->setObjectName(QSL("m_adBlockIconAction"));
-
   m_barProgressFeeds = new QProgressBar(this);
   m_barProgressFeeds->setTextVisible(false);
   m_barProgressFeeds->setFixedWidth(100);
@@ -88,7 +80,7 @@ QList<QAction*> StatusBar::availableActions() const {
   QList<QAction*> actions = qApp->userActions();
 
   // Now, add placeholder actions for custom stuff.
-  actions << m_adBlockIconAction << m_barProgressDownloadAction << m_barProgressFeedsAction <<
+  actions << m_barProgressDownloadAction << m_barProgressFeedsAction <<
              m_lblProgressDownloadAction << m_lblProgressFeedsAction;
 
   return actions;
@@ -121,13 +113,7 @@ void StatusBar::loadChangeableActions(const QStringList &action_names) {
     QAction *action_to_add;
     QWidget *widget_to_add;
 
-    if (matching_action == m_adBlockIconAction) {
-      widget_to_add = m_adBlockIcon;
-      action_to_add = m_adBlockIconAction;
-
-      widget_to_add->setVisible(true);
-    }
-    else if (matching_action == m_barProgressDownloadAction) {
+    if (matching_action == m_barProgressDownloadAction) {
       widget_to_add = m_barProgressDownload;
       action_to_add = m_barProgressDownloadAction;
 
diff --git a/src/gui/statusbar.h b/src/gui/statusbar.h
index a3428d401..39b3c36b8 100755
--- a/src/gui/statusbar.h
+++ b/src/gui/statusbar.h
@@ -66,9 +66,6 @@ class StatusBar : public QStatusBar, public BaseBar {
 
     QLabel *m_lblProgressDownload;
     QAction *m_lblProgressDownloadAction;
-
-    AdBlockIcon* m_adBlockIcon;
-    QAction *m_adBlockIconAction;
 };
 
 #endif // STATUSBAR_H
diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp
index ffcce7c88..6848fbddb 100755
--- a/src/miscellaneous/application.cpp
+++ b/src/miscellaneous/application.cpp
@@ -26,7 +26,6 @@
 #include "gui/statusbar.h"
 #include "gui/dialogs/formmain.h"
 #include "exceptions/applicationexception.h"
-#include "adblock/adblockmanager.h"
 
 #include "services/abstract/serviceroot.h"
 #include "services/standard/standardserviceroot.h"
@@ -279,7 +278,6 @@ void Application::onAboutToQuit() {
   mainForm()->tabWidget()->feedMessageViewer()->quit();
   database()->saveDatabase();
   mainForm()->saveSize();
-  AdBlockManager::instance()->save();
 
   if (locked_safely) {
     // Application obtained permission to close in a safe way.
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index 0b81bb8f9..ed03109b0 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -19,8 +19,6 @@
 
 #include "miscellaneous/application.h"
 #include "miscellaneous/iofactory.h"
-#include "network-web/adblock/requestinterceptor.h"
-
 #include <QDebug>
 #include <QDir>
 #include <QPointer>
@@ -359,9 +357,6 @@ Settings *Settings::setupSettings(QObject *parent) {
   // Portable settings are available, use them.
   new_settings = new Settings(properties.m_absoluteSettingsFileName, QSettings::IniFormat, properties.m_type, parent);
 
-  // Set Blick communication interceptor for simple Adblocking.
-  QWebEngineProfile::defaultProfile()->setRequestInterceptor(new RequestInterceptor(new_settings));
-
   // Check if portable settings are available.
   if (properties.m_type == SettingsProperties::Portable) {
     qDebug("Initializing settings in '%s' (portable way).", qPrintable(QDir::toNativeSeparators(properties.m_absoluteSettingsFileName)));
diff --git a/src/network-web/adblock/adblockaddsubscriptiondialog.cpp b/src/network-web/adblock/adblockaddsubscriptiondialog.cpp
deleted file mode 100755
index 9d78ac0fd..000000000
--- a/src/network-web/adblock/adblockaddsubscriptiondialog.cpp
+++ /dev/null
@@ -1,129 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/adblock/adblockaddsubscriptiondialog.h"
-
-#include "network-web/adblock/adblockmanager.h"
-#include "definitions/definitions.h"
-#include "miscellaneous/application.h"
-#include "miscellaneous/iconfactory.h"
-#include "gui/lineeditwithstatus.h"
-
-#include <QPushButton>
-
-
-AdBlockAddSubscriptionDialog::AdBlockAddSubscriptionDialog(QWidget *parent)
-  : QDialog(parent), m_ui(new Ui::AdBlockAddSubscriptionDialog) {
-  m_ui->setupUi(this);
-
-  setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint);
-  setWindowIcon(qApp->icons()->fromTheme("web-adblock"));
-
-  setTabOrder(m_ui->m_cmbPresets, m_ui->m_txtTitle->lineEdit());
-  setTabOrder(m_ui->m_txtTitle->lineEdit(), m_ui->m_txtUrl->lineEdit());
-  setTabOrder(m_ui->m_txtUrl->lineEdit(), m_ui->m_buttonBox);
-
-  loadPresets();
-
-  connect(m_ui->m_cmbPresets, SIGNAL(currentIndexChanged(int)), this, SLOT(onSubscriptionPresetChanged(int)));
-  connect(m_ui->m_txtTitle->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkInputs()));
-  connect(m_ui->m_txtUrl->lineEdit(), SIGNAL(textChanged(QString)), this, SLOT(checkInputs()));
-
-  onSubscriptionPresetChanged(0);
-}
-
-void AdBlockAddSubscriptionDialog::loadPresets() {
-  m_knownSubscriptions << Subscription("EasyList (English)", ADBLOCK_EASYLIST_URL)
-                       << Subscription("Fanboy's List (English)", "http://www.fanboy.co.nz/adblock/fanboy-adblock.txt")
-                       << Subscription("Adversity (English)", "https://raw.githubusercontent.com/Hubird-au/Adversity/master/Adversity.txt")
-                       << Subscription("BSI Lista Polska (Polish)", "http://www.bsi.info.pl/filtrABP.txt")
-                       << Subscription("Easylist Czech and Slovak (Czech)", "https://raw.githubusercontent.com/tomasko126/easylistczechandslovak/master/filters.txt")
-                       << Subscription("dutchblock (Dutch)", "http://groenewoudt.net/dutchblock/list.txt")
-                       << Subscription("Filtros Nauscopicos (Spanish)", "http://abp.mozilla-hispano.org/nauscopio/filtros.txt")
-                       << Subscription("hufilter (Hungarian)", "http://www.hufilter.hu/hufilter.txt")
-                       << Subscription("IsraelList (Hebrew)", "http://secure.fanboy.co.nz/israelilist/IsraelList.txt")
-                       << Subscription("Lista Basa (Polish)", "http://plok.studentlive.pl/abp.txt")
-                       << Subscription("NLBlock (Dutch)", "http://www.verzijlbergh.com/adblock/nlblock.txt")
-                       << Subscription("Peter Lowe's list (English)", "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=adblockplus&mimetype=plaintext")
-                       << Subscription("PLgeneral (Polish)", "http://www.niecko.pl/adblock/adblock.txt")
-                       << Subscription("Schacks Adblock Plus liste (Danish)", "http://adblock.schack.dk/block.txt")
-                       << Subscription("Xfiles (Italian)", "http://mozilla.gfsolone.com/filtri.txt")
-                       << Subscription("Adblock Warning Removal List", "https://easylist-downloads.adblockplus.org/antiadblockfilters.txt")
-                       << Subscription("EasyPrivacy (English)", "http://easylist-downloads.adblockplus.org/easyprivacy.txt")
-                       << Subscription("Antisocial (English)", "https://raw.githubusercontent.com/Hubird-au/Adversity/master/Antisocial.txt")
-                       << Subscription("RuAdList+EasyList (Russian, Ukrainian)", "https://easylist-downloads.adblockplus.org/ruadlist+easylist.txt")
-                       << Subscription("RU AdList (Russian, Ukrainian)", "https://easylist-downloads.adblockplus.org/advblock.txt")
-                       << Subscription("ABPindo (Indonesian)", "https://raw.githubusercontent.com/heradhis/indonesianadblockrules/master/subscriptions/abpindo.txt")
-                       << Subscription("ChinaList (Chinese)", "http://adblock-chinalist.googlecode.com/svn/trunk/adblock.txt")
-                       << Subscription("Malware Domains list", "https://easylist-downloads.adblockplus.org/malwaredomains_full.txt") <<
-                          Subscription(tr("Another subscription"), QString());
-
-  foreach (const Subscription &subscription, m_knownSubscriptions) {
-    m_ui->m_cmbPresets->addItem(subscription.m_title);
-  }
-}
-
-QString AdBlockAddSubscriptionDialog::title() const {
-  return m_ui->m_txtTitle->lineEdit()->text();
-}
-
-QString AdBlockAddSubscriptionDialog::url() const {
-  return m_ui->m_txtUrl->lineEdit()->text();
-}
-
-void AdBlockAddSubscriptionDialog::onSubscriptionPresetChanged(int index) {
-  const Subscription subscription = m_knownSubscriptions.at(index);
-
-  // "Other" entry.
-  if (subscription.m_url.isEmpty()) {
-    m_ui->m_txtTitle->lineEdit()->clear();
-    m_ui->m_txtUrl->lineEdit()->clear();
-  }
-  else {
-    m_ui->m_txtTitle->lineEdit()->setText( subscription.m_title);
-    m_ui->m_txtTitle->lineEdit()->setCursorPosition(0);
-    m_ui->m_txtUrl->lineEdit()->setText(subscription.m_url);
-    m_ui->m_txtUrl->lineEdit()->setCursorPosition(0);
-  }
-}
-
-void AdBlockAddSubscriptionDialog::checkInputs() {
-  bool is_ok = true;
-
-  if (!m_ui->m_txtTitle->lineEdit()->text().simplified().isEmpty()) {
-    m_ui->m_txtTitle->setStatus(WidgetWithStatus::Ok, tr("Entered title is okay."));
-  }
-  else {
-    m_ui->m_txtTitle->setStatus(WidgetWithStatus::Error, tr("Entered title is empty."));
-    is_ok = false;
-  }
-
-  if (!m_ui->m_txtUrl->lineEdit()->text().simplified().isEmpty()) {
-    m_ui->m_txtUrl->setStatus(WidgetWithStatus::Ok, tr("Entered url is okay."));
-  }
-  else {
-    m_ui->m_txtUrl->setStatus(WidgetWithStatus::Error, tr("Entered url is empty."));
-    is_ok = false;
-  }
-
-  m_ui->m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(is_ok);
-}
-
-AdBlockAddSubscriptionDialog::~AdBlockAddSubscriptionDialog() {
-  qDebug("Destroying AdBlockAddSubscriptionDialog instance.");
-}
diff --git a/src/network-web/adblock/adblockaddsubscriptiondialog.h b/src/network-web/adblock/adblockaddsubscriptiondialog.h
deleted file mode 100755
index ad4435090..000000000
--- a/src/network-web/adblock/adblockaddsubscriptiondialog.h
+++ /dev/null
@@ -1,70 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef ADBLOCKADDSUBSCRIPTIONDIALOG_H
-#define ADBLOCKADDSUBSCRIPTIONDIALOG_H
-
-#include <QDialog>
-
-#include "ui_adblockaddsubscriptiondialog.h"
-
-#include <QVector>
-
-
-namespace Ui {
-  class AdBlockAddSubscriptionDialog;
-}
-
-class AdBlockAddSubscriptionDialog : public QDialog {
-    Q_OBJECT
-
-  public:
-    // Constructors.
-    explicit AdBlockAddSubscriptionDialog(QWidget *parent = 0);
-    virtual ~AdBlockAddSubscriptionDialog();
-
-    QString title() const;
-    QString url() const;
-
-  private slots:
-    // Index of selected list changed.
-    void onSubscriptionPresetChanged(int index);
-    void checkInputs();
-
-  private:
-    void loadPresets();
-
-    struct Subscription {
-      public:
-        QString m_title;
-        QString m_url;
-
-        explicit Subscription() {
-        }
-
-        explicit Subscription(const QString &title, const QString &url) {
-          m_title = title;
-          m_url = url;
-        }
-    };
-
-    QScopedPointer<Ui::AdBlockAddSubscriptionDialog> m_ui;
-    QVector<Subscription> m_knownSubscriptions;
-};
-
-#endif // ADBLOCKADDSUBSCRIPTIONDIALOG_H
diff --git a/src/network-web/adblock/adblockaddsubscriptiondialog.ui b/src/network-web/adblock/adblockaddsubscriptiondialog.ui
deleted file mode 100755
index 7c1b64517..000000000
--- a/src/network-web/adblock/adblockaddsubscriptiondialog.ui
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>AdBlockAddSubscriptionDialog</class>
- <widget class="QDialog" name="AdBlockAddSubscriptionDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>557</width>
-    <height>142</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Add subscription</string>
-  </property>
-  <layout class="QFormLayout">
-   <item row="0" column="0" colspan="2">
-    <widget class="QComboBox" name="m_cmbPresets"/>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="m_lblTitle">
-     <property name="text">
-      <string>Title</string>
-     </property>
-     <property name="buddy">
-      <cstring>m_txtTitle</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="0">
-    <widget class="QLabel" name="m_lblUrl">
-     <property name="text">
-      <string>Address</string>
-     </property>
-     <property name="buddy">
-      <cstring>m_txtUrl</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="1">
-    <widget class="QDialogButtonBox" name="m_buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0" colspan="2">
-    <spacer name="m_vertSpacer">
-     <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="1" column="1">
-    <widget class="LineEditWithStatus" name="m_txtTitle" native="true"/>
-   </item>
-   <item row="2" column="1">
-    <widget class="LineEditWithStatus" name="m_txtUrl" native="true"/>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>LineEditWithStatus</class>
-   <extends>QWidget</extends>
-   <header>lineeditwithstatus.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections>
-  <connection>
-   <sender>m_buttonBox</sender>
-   <signal>accepted()</signal>
-   <receiver>AdBlockAddSubscriptionDialog</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>m_buttonBox</sender>
-   <signal>rejected()</signal>
-   <receiver>AdBlockAddSubscriptionDialog</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-web/adblock/adblockdialog.cpp b/src/network-web/adblock/adblockdialog.cpp
deleted file mode 100755
index 9b7a64a87..000000000
--- a/src/network-web/adblock/adblockdialog.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/adblock/adblockdialog.h"
-
-#include "network-web/adblock/adblockmanager.h"
-#include "network-web/adblock/adblocksubscription.h"
-#include "network-web/adblock/adblocktreewidget.h"
-#include "network-web/adblock/adblockaddsubscriptiondialog.h"
-#include "miscellaneous/application.h"
-#include "miscellaneous/iconfactory.h"
-#include "gui/tabwidget.h"
-#include "gui/dialogs/formmain.h"
-
-#include <QDesktopWidget>
-#include <QMenu>
-#include <QTimer>
-#include <QMessageBox>
-#include <QInputDialog>
-
-
-AdBlockDialog::AdBlockDialog(QWidget* parent) : QDialog(parent), m_ui(new Ui::AdBlockDialog),
-  m_manager(AdBlockManager::instance()), m_currentTreeWidget(NULL),
-  m_currentSubscription(NULL), m_loaded(false), m_useLimitedEasyList(false) {
-  m_ui->setupUi(this);
-  setAttribute(Qt::WA_DeleteOnClose);
-  setWindowFlags(Qt::MSWindowsFixedSizeDialogHint | Qt::Dialog | Qt::WindowSystemMenuHint);
-  setWindowIcon(qApp->icons()->fromTheme("web-adblock"));
-
-  m_ui->m_checkEnable->setChecked(m_manager->isEnabled());
-  m_ui->m_checkUseLimitedEasyList->setVisible(false);
-  m_ui->m_btnOptions->setIcon(qApp->icons()->fromTheme("web-adblock"));
-  m_ui->m_btnOptions->setText(m_ui->m_btnOptions->text() + "   ");
-
-  // Setup the menu.
-  setupMenu();
-
-  // Initialize connections.
-  createConnections();
-
-  // Load the contents.
-  load();
-}
-
-AdBlockDialog::~AdBlockDialog() {
-  qDebug("Destroying AdBlockDialog instance.");
-}
-
-void AdBlockDialog::setupMenu() {
-  QMenu *menu = new QMenu(m_ui->m_btnOptions);
-
-  m_actionAddRule = menu->addAction(tr("Add rule"), this, SLOT(addRule()));
-  m_actionRemoveRule = menu->addAction(tr("Remove rule"), this, SLOT(removeRule()));
-  menu->addSeparator();
-  m_actionAddSubscription = menu->addAction(tr("Add subscription"), this, SLOT(addSubscription()));
-  m_actionRemoveSubscription = menu->addAction(tr("Remove subscription"), this, SLOT(removeSubscription()));
-  menu->addAction(tr("Update subscriptions"), m_manager, SLOT(updateAllSubscriptions()));
-  menu->addSeparator();
-  menu->addAction(tr("Rules writing guide"), this, SLOT(learnAboutRules()));
-
-  m_ui->m_btnOptions->setMenu(menu);
-}
-
-void AdBlockDialog::createConnections() {
-  connect(m_ui->m_btnOptions->menu(), SIGNAL(aboutToShow()), this, SLOT(aboutToShowMenu()));
-  connect(m_ui->m_checkEnable, SIGNAL(toggled(bool)), this, SLOT(enableAdBlock(bool)));
-  connect(m_ui->m_txtFilter, SIGNAL(textChanged(QString)), this, SLOT(filterString(QString)));
-  connect(m_ui->m_tabs, SIGNAL(currentChanged(int)), this, SLOT(currentChanged(int)));
-  connect(m_ui->m_buttonBox, SIGNAL(accepted()), this, SLOT(close()));
-}
-
-void AdBlockDialog::showRule(const AdBlockRule *rule) const {
-  const AdBlockSubscription *subscription = rule->subscription();
-
-  if (subscription == NULL) {
-    return;
-  }
-
-  for (int i = 0; i < m_ui->m_tabs->count(); i++) {
-    AdBlockTreeWidget *tree_widget = qobject_cast<AdBlockTreeWidget*>(m_ui->m_tabs->widget(i));
-
-    if (subscription == tree_widget->subscription()) {
-      tree_widget->showRule(rule);
-      m_ui->m_tabs->setCurrentIndex(i);
-      tree_widget->setFocus();
-      break;
-    }
-  }
-}
-
-void AdBlockDialog::addRule() {
-  m_currentTreeWidget->addRule();
-}
-
-void AdBlockDialog::removeRule() {
-  m_currentTreeWidget->removeRule();
-}
-
-void AdBlockDialog::addSubscription() {
-  QScopedPointer<AdBlockAddSubscriptionDialog> dialog(new AdBlockAddSubscriptionDialog(this));
-
-  if (dialog.data()->exec() == QDialog::Accepted) {
-    const QString title = dialog.data()->title();
-    const QString url = dialog.data()->url();
-
-    if (AdBlockSubscription *subscription = m_manager->addSubscription(title, url)) {
-      AdBlockTreeWidget *tree = new AdBlockTreeWidget(subscription, this);
-      connect(tree, SIGNAL(refreshStatusChanged(bool)), this, SLOT(setDisabled(bool)));
-
-      const int index = m_ui->m_tabs->insertTab(m_ui->m_tabs->count() - 1, tree, subscription->title());
-      m_ui->m_tabs->setCurrentIndex(index);
-    }
-  }
-
-  //delete dialog.data();
-}
-
-void AdBlockDialog::removeSubscription() {
-  if (m_manager->removeSubscription(m_currentSubscription)) {
-    delete m_currentTreeWidget;
-  }
-}
-
-void AdBlockDialog::currentChanged(int index) {
-  if (index != -1) {
-    m_currentTreeWidget = qobject_cast<AdBlockTreeWidget*>(m_ui->m_tabs->widget(index));
-    m_currentSubscription = m_currentTreeWidget->subscription();
-
-    const bool is_easylist = m_currentSubscription->url() == QUrl(ADBLOCK_EASYLIST_URL);
-    m_ui->m_checkUseLimitedEasyList->setEnabled(is_easylist && m_ui->m_checkEnable->isChecked());
-    m_ui->m_checkUseLimitedEasyList->setVisible(is_easylist);
-
-    m_ui->m_txtFilter->blockSignals(true);
-    m_ui->m_txtFilter->clear();
-    m_ui->m_txtFilter->blockSignals(false);
-  }
-}
-
-void AdBlockDialog::filterString(const QString &string) {
-  if (m_currentTreeWidget && m_ui->m_checkEnable->isChecked()) {
-    m_currentTreeWidget->filterString(string);
-  }
-}
-
-void AdBlockDialog::enableAdBlock(bool state) {
-  m_manager->setEnabled(state);
-
-  if (state) {
-    load();
-  }
-}
-
-void AdBlockDialog::aboutToShowMenu() {
-  const bool subscription_editable = m_currentSubscription && m_currentSubscription->canEditRules();
-  const bool subscription_removable = m_currentSubscription && m_currentSubscription->canBeRemoved();
-
-  m_actionAddRule->setEnabled(subscription_editable);
-  m_actionRemoveRule->setEnabled(subscription_editable);
-  m_actionRemoveSubscription->setEnabled(subscription_removable);
-}
-
-void AdBlockDialog::learnAboutRules() {
-  qApp->mainForm()->tabWidget()->addBrowser(true, true, QUrl(ADBLOCK_FILTERS_HELP));
-  QTimer::singleShot(100, this, SLOT(close()));
-}
-
-void AdBlockDialog::loadSubscriptions() {
-  for (int i = 0; i < m_ui->m_tabs->count(); ++i) {
-    qobject_cast<AdBlockTreeWidget*>(m_ui->m_tabs->widget(i))->refresh();
-  }
-}
-
-void AdBlockDialog::load() {
-  if (m_loaded || !m_ui->m_checkEnable->isChecked()) {
-    return;
-  }
-
-  foreach (AdBlockSubscription *subscription, m_manager->subscriptions()) {
-    AdBlockTreeWidget *tree = new AdBlockTreeWidget(subscription, this);
-
-    connect(tree, SIGNAL(refreshStatusChanged(bool)), this, SLOT(setDisabled(bool)));
-    m_ui->m_tabs->addTab(tree, subscription->title());
-  }
-
-  m_useLimitedEasyList = m_manager->useLimitedEasyList();
-  m_ui->m_checkUseLimitedEasyList->setChecked(m_useLimitedEasyList);
-  m_loaded = true;
-
-  QTimer::singleShot(100, this, SLOT(loadSubscriptions()));
-}
-
-void AdBlockDialog::closeEvent(QCloseEvent *event) {
-  if (m_ui->m_checkUseLimitedEasyList->isChecked() != m_useLimitedEasyList) {
-    m_manager->setUseLimitedEasyList(m_ui->m_checkUseLimitedEasyList->isChecked());
-  }
-
-  QWidget::closeEvent(event);
-}
diff --git a/src/network-web/adblock/adblockdialog.h b/src/network-web/adblock/adblockdialog.h
deleted file mode 100755
index 69eb39235..000000000
--- a/src/network-web/adblock/adblockdialog.h
+++ /dev/null
@@ -1,84 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef ADBLOCKDIALOG_H
-#define ADBLOCKDIALOG_H
-
-#include <QDialog>
-
-#include "ui_adblockdialog.h"
-
-
-namespace Ui {
-  class AdBlockDialog;
-}
-
-class AdBlockSubscription;
-class AdBlockTreeWidget;
-class AdBlockManager;
-class AdBlockRule;
-
-class AdBlockDialog : public QDialog {
-    Q_OBJECT
-
-  public:
-    // Constructors.
-    explicit AdBlockDialog(QWidget *parent = 0);
-    virtual ~AdBlockDialog();
-
-    void showRule(const AdBlockRule *rule) const;
-
-  private slots:
-    void addRule();
-    void removeRule();
-
-    void addSubscription();
-    void removeSubscription();
-
-    void currentChanged(int index);
-    void filterString(const QString &string);
-    void enableAdBlock(bool state);
-
-    void aboutToShowMenu();
-    void learnAboutRules();
-
-    void loadSubscriptions();
-    void load();
-
-  protected:
-    void closeEvent(QCloseEvent *event);
-
-  private:
-    void setupMenu();
-    void createConnections();
-
-    QScopedPointer<Ui::AdBlockDialog> m_ui;
-    AdBlockManager *m_manager;
-    AdBlockTreeWidget *m_currentTreeWidget;
-    AdBlockSubscription *m_currentSubscription;
-
-    QAction *m_actionAddRule;
-    QAction *m_actionRemoveRule;
-    QAction *m_actionAddSubscription;
-    QAction *m_actionRemoveSubscription;
-
-    bool m_loaded;
-    bool m_useLimitedEasyList;
-};
-
-#endif // ADBLOCKDIALOG_H
diff --git a/src/network-web/adblock/adblockdialog.ui b/src/network-web/adblock/adblockdialog.ui
deleted file mode 100755
index 5cf6ba3bf..000000000
--- a/src/network-web/adblock/adblockdialog.ui
+++ /dev/null
@@ -1,154 +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>535</width>
-    <height>466</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Adblock settings</string>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
-    <widget class="QCheckBox" name="m_checkEnable">
-     <property name="text">
-      <string>Enable Adblock</string>
-     </property>
-     <property name="checked">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QLabel" name="m_lblInfo">
-     <property name="font">
-      <font>
-       <italic>true</italic>
-      </font>
-     </property>
-     <property name="text">
-      <string>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</string>
-     </property>
-     <property name="wordWrap">
-      <bool>true</bool>
-     </property>
-    </widget>
-   </item>
-   <item>
-    <widget class="QWidget" name="m_adBlockWidget" native="true">
-     <property name="enabled">
-      <bool>true</bool>
-     </property>
-     <layout class="QGridLayout" name="gridLayout">
-      <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>
-      <item row="4" column="0" colspan="2">
-       <layout class="QHBoxLayout" name="horizontalLayout">
-        <item>
-         <widget class="QPushButton" name="m_btnOptions">
-          <property name="text">
-           <string>Options</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLineEdit" name="m_txtFilter">
-          <property name="placeholderText">
-           <string>Filter rules</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
-      </item>
-      <item row="2" column="0">
-       <widget class="QTabWidget" name="m_tabs"/>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
-     <item>
-      <widget class="QCheckBox" name="m_checkUseLimitedEasyList">
-       <property name="enabled">
-        <bool>false</bool>
-       </property>
-       <property name="text">
-        <string>Use only essential part of EasyList (for performance reasons)</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QDialogButtonBox" name="m_buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Close</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-  </layout>
- </widget>
- <tabstops>
-  <tabstop>m_checkEnable</tabstop>
-  <tabstop>m_tabs</tabstop>
-  <tabstop>m_btnOptions</tabstop>
-  <tabstop>m_txtFilter</tabstop>
-  <tabstop>m_checkUseLimitedEasyList</tabstop>
- </tabstops>
- <resources/>
- <connections>
-  <connection>
-   <sender>m_checkEnable</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_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>
-  <connection>
-   <sender>m_buttonBox</sender>
-   <signal>clicked(QAbstractButton*)</signal>
-   <receiver>AdBlockDialog</receiver>
-   <slot>close()</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>434</x>
-     <y>440</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>272</x>
-     <y>230</y>
-    </hint>
-   </hints>
-  </connection>
- </connections>
-</ui>
diff --git a/src/network-web/adblock/adblockicon.cpp b/src/network-web/adblock/adblockicon.cpp
deleted file mode 100755
index 30ccab7b3..000000000
--- a/src/network-web/adblock/adblockicon.cpp
+++ /dev/null
@@ -1,151 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/adblock/adblockicon.h"
-
-#include "network-web/adblock/adblockrule.h"
-#include "network-web/adblock/adblockmanager.h"
-#include "network-web/adblock/adblocksubscription.h"
-#include "network-web/webpage.h"
-#include "network-web/webbrowser.h"
-#include "miscellaneous/application.h"
-#include "gui/plaintoolbutton.h"
-#include "gui/tabwidget.h"
-#include "gui/dialogs/formmain.h"
-
-#include <QMenu>
-#include <QMouseEvent>
-
-
-AdBlockIcon::AdBlockIcon(QWidget *window, QWidget *parent)
-  : PlainToolButton(parent), m_window(window), m_menuAction(NULL), m_enabled(false) {
-  connect(this, SIGNAL(clicked(QPoint)), this, SLOT(showMenu(QPoint)));
-  connect(AdBlockManager::instance(), SIGNAL(enabledChanged(bool)), this, SLOT(setEnabled(bool)));
-}
-
-QAction *AdBlockIcon::menuAction() {
-  if (m_menuAction == NULL) {
-    m_menuAction = new QAction(tr("Adblock"), this);
-    m_menuAction->setMenu(new QMenu(this));
-
-    connect(m_menuAction->menu(), SIGNAL(aboutToShow()), this, SLOT(createMenu()));
-  }
-
-  m_menuAction->setIcon(m_enabled ? qApp->icons()->fromTheme("web-adblock") : qApp->icons()->fromTheme("web-adblock"));
-
-  return m_menuAction;
-}
-
-void AdBlockIcon::activate() {
-  setEnabled(AdBlockManager::instance()->shouldBeEnabled());
-}
-
-void AdBlockIcon::createMenu(QMenu *menu) {
-  if (menu == NULL) {
-    menu = qobject_cast<QMenu*>(sender());
-
-    if (menu == NULL) {
-      return;
-    }
-  }
-
-  menu->clear();
-
-  AdBlockManager *manager = AdBlockManager::instance();
-  AdBlockCustomList *custom_list = manager->customList();
-
-  WebPage *page = qApp->mainForm()->tabWidget()->currentWidget()->webBrowser()->view()->page();
-  const QUrl page_url = page->url();
-
-  menu->addAction(tr("Show Adblock &settings"), manager, SLOT(showDialog()));
-  menu->addSeparator();
-
-  if (!page_url.host().isEmpty() && m_enabled && manager->canRunOnScheme(page_url.scheme())) {
-    const QString host = page_url.host().contains(QSL("www.")) ? page_url.host().mid(4) : page_url.host();
-    const QString host_filter = QString(QSL("@@||%1^$document")).arg(host);
-    const QString page_filter = QString(QSL("@@|%1|$document")).arg(page_url.toString());
-
-    QAction *act;
-
-    act = menu->addAction(tr("Disable on %1").arg(host));
-    act->setCheckable(true);
-    act->setChecked(custom_list->containsFilter(host_filter));
-    act->setData(host_filter);
-    connect(act, SIGNAL(triggered()), this, SLOT(toggleCustomFilter()));
-
-    act = menu->addAction(tr("Disable only on this page"));
-    act->setCheckable(true);
-    act->setChecked(custom_list->containsFilter(page_filter));
-    act->setData(page_filter);
-    connect(act, SIGNAL(triggered()), this, SLOT(toggleCustomFilter()));
-
-    menu->addSeparator();
-  }
-}
-
-void AdBlockIcon::showMenu(const QPoint &pos) {
-  QMenu menu;
-  createMenu(&menu);
-  menu.exec(pos);
-}
-
-void AdBlockIcon::toggleCustomFilter() {
-  const QAction *action = qobject_cast<QAction*>(sender());
-
-  if (action == NULL) {
-    return;
-  }
-
-  const QString filter = action->data().toString();
-  AdBlockManager *manager = AdBlockManager::instance();
-  AdBlockCustomList *custom_list = manager->customList();
-
-  if (custom_list->containsFilter(filter)) {
-    custom_list->removeFilter(filter);
-  }
-  else {
-    AdBlockRule *rule = new AdBlockRule(filter, custom_list);
-    custom_list->addRule(rule);
-  }
-}
-
-void AdBlockIcon::setEnabled(bool enabled) {
-  if (enabled) {
-    setToolTip(tr("Adblock - up and running"));
-    setIcon(qApp->icons()->fromTheme("web-adblock"));
-  }
-  else {
-    setToolTip(tr("Adblock - not running"));
-    setIcon(qApp->icons()->fromTheme("web-adblock-disabled"));
-  }
-
-  m_enabled = enabled;
-}
-
-void AdBlockIcon::mouseReleaseEvent(QMouseEvent *event) {
-  if (event->button() == Qt::LeftButton) {
-    emit clicked(event->globalPos());
-  }
-  else {
-    QToolButton::mouseReleaseEvent(event);
-  }
-}
-
-AdBlockIcon::~AdBlockIcon() {
-  qDebug("Destroying AdBlockIcon instance.");
-}
diff --git a/src/network-web/adblock/adblockicon.h b/src/network-web/adblock/adblockicon.h
deleted file mode 100755
index 5622cec48..000000000
--- a/src/network-web/adblock/adblockicon.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef ADBLOCKICON_H
-#define ADBLOCKICON_H
-
-#include "gui/plaintoolbutton.h"
-
-
-class QMenu;
-class QUrl;
-class AdBlockRule;
-
-class AdBlockIcon : public PlainToolButton {
-    Q_OBJECT
-
-  public:
-    // Constructors.
-    explicit AdBlockIcon(QWidget *window, QWidget *parent = 0);
-    virtual ~AdBlockIcon();
-
-    QAction *menuAction();
-
-  public slots:
-    void activate();
-    void setEnabled(bool enabled);
-    void createMenu(QMenu *menu = NULL);
-
-  private slots:
-    void showMenu(const QPoint &pos);
-    void toggleCustomFilter();
-
-  protected:
-    void mouseReleaseEvent(QMouseEvent *event);
-
-  signals:
-    void clicked(QPoint);
-
-  private:
-    QWidget *m_window;
-    QAction *m_menuAction;
-    QVector<QPair<AdBlockRule*,QUrl> > m_blockedPopups;
-    bool m_enabled;
-};
-
-#endif // ADBLOCKICON_H
diff --git a/src/network-web/adblock/adblockmanager.cpp b/src/network-web/adblock/adblockmanager.cpp
deleted file mode 100755
index d685acff0..000000000
--- a/src/network-web/adblock/adblockmanager.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/adblock/adblockmanager.h"
-
-#include "network-web/adblock/adblockdialog.h"
-#include "network-web/adblock/adblockmatcher.h"
-#include "network-web/adblock/adblocksubscription.h"
-#include "network-web/adblock/adblockicon.h"
-#include "network-web/webpage.h"
-#include "miscellaneous/application.h"
-#include "miscellaneous/settings.h"
-#include "definitions/definitions.h"
-#include "gui/dialogs/formmain.h"
-
-#include <QDateTime>
-#include <QTextStream>
-#include <QDir>
-#include <QTimer>
-
-
-AdBlockManager *AdBlockManager::s_adBlockManager = NULL;
-
-AdBlockManager::AdBlockManager(QObject* parent)
-  : QObject(parent), m_loaded(false), m_enabled(false), m_useLimitedEasyList(true),
-    m_subscriptions(QList<AdBlockSubscription*>()), m_matcher(new AdBlockMatcher(this)) {
-  load();
-}
-
-AdBlockManager::~AdBlockManager() {
-  qDeleteAll(m_subscriptions);
-}
-
-AdBlockManager *AdBlockManager::instance() {
-  if (s_adBlockManager == NULL) {
-    s_adBlockManager = new AdBlockManager(qApp);
-  }
-
-  return s_adBlockManager;
-}
-
-void AdBlockManager::setEnabled(bool enabled) {
-  if (m_enabled == enabled) {
-    return;
-  }
-
-  m_enabled = enabled;
-  emit enabledChanged(enabled);
-  qApp->settings()->setValue(GROUP(AdBlock), AdBlock::Enabled, m_enabled);
-
-  // Load subscriptions and other data.
-  load();
-}
-
-QList<AdBlockSubscription*> AdBlockManager::subscriptions() const {
-  return m_subscriptions;
-}
-
-bool AdBlockManager::shouldBlock(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) {
-  const QString url_string = url.toEncoded().toLower();
-  const QString url_domain = url.host().toLower();
-  const QString url_scheme = url.scheme().toLower();
-
-  if (!isEnabled() || !canRunOnScheme(url_scheme)) {
-    return NULL;
-  }
-
-  const AdBlockRule *blocked_rule = m_matcher->match(url, url_domain, url_string, referer, resource_type);
-
-  if (blocked_rule != NULL) {
-    if (!canBeBlocked(url, referer, resource_type)) {
-      return false;
-    }
-    else {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-QStringList AdBlockManager::disabledRules() const {
-  return m_disabledRules;
-}
-
-void AdBlockManager::addDisabledRule(const QString &filter) {
-  m_disabledRules.append(filter);
-}
-
-void AdBlockManager::removeDisabledRule(const QString &filter) {
-  m_disabledRules.removeOne(filter);
-}
-
-AdBlockSubscription *AdBlockManager::addSubscription(const QString &title, const QString &url) {
-  if (title.isEmpty() || url.isEmpty()) {
-    return NULL;
-  }
-
-  const QString file_name = IOFactory::filterBadCharsFromFilename(title.toLower()) + QL1S(".txt");
-  const QString file_path = IOFactory::ensureUniqueFilename(baseSubscriptionDirectory() + QDir::separator() + file_name);
-  QFile file(file_path);
-
-  if (!file.open(QFile::WriteOnly | QFile::Truncate | QFile::Unbuffered)) {
-    qWarning("Cannot write to file '%s'.",qPrintable(file_path));
-    return NULL;
-  }
-
-  file.write(QString("Title: %1\nUrl: %2\n[Adblock Plus 1.1.1]").arg(title, url).toLatin1());
-  file.close();
-
-  AdBlockSubscription *subscription = new AdBlockSubscription(title, this);
-  subscription->setUrl(QUrl(url));
-  subscription->setFilePath(file_path);
-  subscription->loadSubscription(m_disabledRules);
-
-  // This expects that there is at least "Custom rules" subscription available in
-  // active subscriptions.
-  m_subscriptions.insert(m_subscriptions.size() - 1, subscription);
-  m_matcher->update();
-
-  return subscription;
-}
-
-bool AdBlockManager::removeSubscription(AdBlockSubscription *subscription) {
-  if (!m_subscriptions.contains(subscription) || !subscription->canBeRemoved()) {
-    return false;
-  }
-  else {
-    QFile::remove(subscription->filePath());
-    m_subscriptions.removeOne(subscription);
-    delete subscription;
-    m_matcher->update();
-    return true;
-  }
-}
-
-AdBlockCustomList *AdBlockManager::customList() const {
-  foreach (AdBlockSubscription *subscription, m_subscriptions) {
-    AdBlockCustomList *list = qobject_cast<AdBlockCustomList*>(subscription);
-
-    if (list != NULL) {
-      return list;
-    }
-  }
-
-  return NULL;
-}
-
-QString AdBlockManager::baseSubscriptionDirectory() {
-  QString directory;
-
-  if (qApp->settings()->type() == SettingsProperties::Portable) {
-    directory = qApp->applicationDirPath();
-  }
-  else {
-    directory = qApp->homeFolderPath() + QDir::separator() + QString(APP_LOW_H_NAME);
-  }
-
-  directory += QString(QDir::separator()) + ADBLOCK_BASE_DIRECTORY_NAME;
-  return QDir::toNativeSeparators(directory);
-}
-
-bool AdBlockManager::shouldBeEnabled() const {
-  return qApp->settings()->value(GROUP(AdBlock), SETTING(AdBlock::Enabled)).toBool();
-}
-
-void AdBlockManager::load() {
-  if (m_loaded) {
-    // It is already loaded: subscriptions are loaded from files into objects,
-    // enabled status is determined, disabled rules are also determined.
-    return;
-  }
-
-  const Settings *settings = qApp->settings();
-  m_enabled = settings->value(GROUP(AdBlock), SETTING(AdBlock::Enabled)).toBool();
-  m_useLimitedEasyList = settings->value(GROUP(AdBlock), SETTING(AdBlock::UseLimitedEasyList)).toBool();
-  m_disabledRules = settings->value(GROUP(AdBlock), SETTING(AdBlock::DisabledRules)).toStringList();
-
-  if (!m_enabled) {
-    // We loaded settings, but Adblock should be disabled. Do not continue to save memory.
-    return;
-  }
-
-  QDir adblock_dir(baseSubscriptionDirectory());
-
-  if (!adblock_dir.exists()) {
-    adblock_dir.mkpath(adblock_dir.absolutePath());
-  }
-
-  foreach (const QString &file_name, adblock_dir.entryList(QStringList(QL1S("*.txt")), QDir::Files)) {
-    if (file_name == QSL(ADBLOCK_CUSTOM_LIST_FILENAME)) {
-      continue;
-    }
-
-    const QString absolute_path = adblock_dir.absoluteFilePath(file_name);
-    QFile file(absolute_path);
-
-    if (!file.open(QFile::ReadOnly)) {
-      continue;
-    }
-
-    QTextStream stream(&file);
-    stream.setCodec("UTF-8");
-    const QString title = stream.readLine(1024).remove(QSL("Title: "));
-    const QUrl url = QUrl(stream.readLine(1024).remove(QSL("Url: ")));
-
-    // Close the file.
-    file.close();
-
-    if (title.isEmpty() || !url.isValid()) {
-      qWarning("Invalid subscription file '%s'.", qPrintable(absolute_path));
-      continue;
-    }
-
-    AdBlockSubscription *subscription = new AdBlockSubscription(title, this);
-    subscription->setUrl(url);
-    subscription->setFilePath(absolute_path);
-
-    m_subscriptions.append(subscription);
-  }
-
-  // Append list for "Custom rules".
-  m_subscriptions.append(new AdBlockCustomList(this));
-
-  // Load all subscriptions, including obligatory "Custom rules" list.
-  foreach (AdBlockSubscription *subscription, m_subscriptions) {
-    subscription->loadSubscription(m_disabledRules);
-
-    connect(subscription, SIGNAL(subscriptionChanged()), m_matcher, SLOT(update()));
-  }
-
-  // Notify matcher about loaded subscriptions
-  // and mark all this shit as loaded.
-  m_matcher->update();
-  m_loaded = true;
-}
-
-void AdBlockManager::updateAllSubscriptions() {
-  foreach (AdBlockSubscription *subscription, m_subscriptions) {
-    subscription->updateSubscription();
-  }
-
-  qApp->settings()->setValue(GROUP(AdBlock), AdBlock::LastUpdated, QDateTime::currentDateTime());
-}
-
-void AdBlockManager::save() {
-  if (m_loaded) {
-    foreach (AdBlockSubscription *subscription, m_subscriptions) {
-      subscription->saveSubscription();
-    }
-
-    Settings *settings = qApp->settings();
-    settings->setValue(GROUP(AdBlock), AdBlock::Enabled, m_enabled);
-    settings->setValue(GROUP(AdBlock), AdBlock::UseLimitedEasyList, m_useLimitedEasyList);
-    settings->setValue(GROUP(AdBlock), AdBlock::DisabledRules, m_disabledRules);
-  }
-}
-
-bool AdBlockManager::isEnabled() const {
-  return m_enabled;
-}
-
-bool AdBlockManager::canRunOnScheme(const QString &scheme) const {
-  return !(scheme == QL1S("file") || scheme == QL1S("qrc") || scheme == QL1S("data") || scheme == QL1S("abp"));
-}
-
-bool AdBlockManager::useLimitedEasyList() const {
-  return m_useLimitedEasyList;
-}
-
-void AdBlockManager::setUseLimitedEasyList(bool use_limited) {
-  m_useLimitedEasyList = use_limited;
-
-  foreach (AdBlockSubscription *subscription, m_subscriptions) {
-    if (subscription->url() == QUrl(ADBLOCK_EASYLIST_URL)) {
-      // User really has EasyList activated, update it.
-      subscription->updateSubscription();
-    }
-  }
-}
-
-bool AdBlockManager::canBeBlocked(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const {
-  return !m_matcher->adBlockDisabledForUrl(url, referer, resource_type);
-}
-
-AdBlockSubscription *AdBlockManager::subscriptionByName(const QString &name) const {
-  foreach (AdBlockSubscription *subscription, m_subscriptions) {
-    if (subscription->title() == name) {
-      return subscription;
-    }
-  }
-
-  return NULL;
-}
-
-AdBlockDialog *AdBlockManager::showDialog() {
-  QPointer<AdBlockDialog> form_pointer = new AdBlockDialog(qApp->mainForm());
-  form_pointer.data()->setModal(true);
-  form_pointer.data()->show();
-  form_pointer.data()->raise();
-  form_pointer.data()->activateWindow();
-  return form_pointer.data();
-}
-
-void AdBlockManager::showRule() {
-  if (QAction *action = qobject_cast<QAction*>(sender())) {
-    const AdBlockRule* rule = static_cast<const AdBlockRule*>(action->data().value<void*>());
-
-    if (rule != NULL) {
-      showDialog()->showRule(rule);
-    }
-  }
-}
diff --git a/src/network-web/adblock/adblockmanager.h b/src/network-web/adblock/adblockmanager.h
deleted file mode 100755
index 2678a6c60..000000000
--- a/src/network-web/adblock/adblockmanager.h
+++ /dev/null
@@ -1,97 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef ADBLOCKMANAGER_H
-#define ADBLOCKMANAGER_H
-
-#include <QObject>
-
-#include <QStringList>
-#include <QPointer>
-#include <QWebEngineUrlRequestInfo>
-
-
-class QUrl;
-class AdBlockRule;
-class AdBlockDialog;
-class AdBlockMatcher;
-class AdBlockCustomList;
-class AdBlockSubscription;
-
-class AdBlockManager : public QObject {
-    Q_OBJECT
-
-  public:
-    // Constructors.
-    explicit AdBlockManager(QObject* parent = 0);
-    virtual ~AdBlockManager();
-
-    void load();
-    void save();
-
-    bool isEnabled() const;
-    bool canRunOnScheme(const QString &scheme) const;
-
-    bool useLimitedEasyList() const;
-    void setUseLimitedEasyList(bool use_limited);
-
-    AdBlockSubscription *subscriptionByName(const QString &name) const;
-    QList<AdBlockSubscription*> subscriptions() const;
-
-    bool shouldBlock(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type);
-
-    QStringList disabledRules() const;
-    void addDisabledRule(const QString &filter);
-    void removeDisabledRule(const QString &filter);
-
-    AdBlockSubscription *addSubscription(const QString &title, const QString &url);
-    bool removeSubscription(AdBlockSubscription* subscription);
-
-    AdBlockCustomList *customList() const;
-
-    bool shouldBeEnabled() const;
-
-    static QString baseSubscriptionDirectory();
-    static AdBlockManager *instance();
-
-  public slots:
-    void setEnabled(bool enabled);
-    void showRule();
-    void updateAllSubscriptions();
-
-    AdBlockDialog *showDialog();
-
-  signals:
-    void enabledChanged(bool enabled);
-
-  private:
-    bool canBeBlocked(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
-
-    bool m_loaded;
-    bool m_enabled;
-    bool m_useLimitedEasyList;
-
-    QList<AdBlockSubscription*> m_subscriptions;
-    AdBlockMatcher* m_matcher;
-    QStringList m_disabledRules;
-
-    static AdBlockManager* s_adBlockManager;
-};
-
-#endif // ADBLOCKMANAGER_H
-
diff --git a/src/network-web/adblock/adblockmatcher.cpp b/src/network-web/adblock/adblockmatcher.cpp
deleted file mode 100755
index 9874586c3..000000000
--- a/src/network-web/adblock/adblockmatcher.cpp
+++ /dev/null
@@ -1,123 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/adblock/adblockmatcher.h"
-
-#include "network-web/adblock/adblockmanager.h"
-#include "network-web/adblock/adblockrule.h"
-#include "network-web/adblock/adblocksubscription.h"
-#include "definitions/definitions.h"
-
-
-AdBlockMatcher::AdBlockMatcher(AdBlockManager *manager) : QObject(manager), m_manager(manager) {
-  connect(manager, SIGNAL(enabledChanged(bool)), this, SLOT(enabledChanged(bool)));
-}
-
-AdBlockMatcher::~AdBlockMatcher() {
-  clear();
-}
-
-const AdBlockRule *AdBlockMatcher::match(const QUrl &url, const QString &url_domain,
-                                         const QString &url_string, const QString &referer,
-                                         QWebEngineUrlRequestInfo::ResourceType resource_type) const {
-  // Exception rules.
-  if (m_networkExceptionTree.find(url, url_domain, url_string, referer, resource_type)) {
-    return NULL;
-  }
-
-  for (int i = 0, count = m_networkExceptionRules.size(); i < count; i++) {
-    const AdBlockRule *rule = m_networkExceptionRules.at(i);
-
-    if (rule->networkMatch(url, url_domain, url_string, referer, resource_type)) {
-      return NULL;
-    }
-  }
-
-  // Block rules.
-  if (const AdBlockRule* rule = m_networkBlockTree.find(url, url_domain, url_string, referer, resource_type)) {
-    return rule;
-  }
-
-  for (int i = 0, count = m_networkBlockRules.size(); i < count; i++) {
-    const AdBlockRule *rule = m_networkBlockRules.at(i);
-
-    if (rule->networkMatch(url, url_domain, url_string, referer, resource_type)) {
-      return rule;
-    }
-  }
-
-  return NULL;
-}
-
-bool AdBlockMatcher::adBlockDisabledForUrl(const QUrl &url, const QString &referer,
-                                           QWebEngineUrlRequestInfo::ResourceType resource_type) const {
-  for (int i = 0, count = m_documentRules.size(); i < count; i++) {
-    if (m_documentRules.at(i)->urlMatch(url, referer, resource_type)) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-void AdBlockMatcher::update() {
-  clear();
-
-  foreach (const AdBlockSubscription *subscription, m_manager->subscriptions()) {
-    foreach (const AdBlockRule *rule, subscription->allRules()) {
-      // Don't add internally disabled rules to cache
-      if (rule->isInternalDisabled()) {
-        continue;
-      }
-
-      if (rule->isDocument()) {
-        m_documentRules.append(rule);
-      }
-      else if (rule->isException()) {
-        if (!m_networkExceptionTree.add(rule)) {
-          m_networkExceptionRules.append(rule);
-        }
-      }
-      else {
-        if (!m_networkBlockTree.add(rule)) {
-          m_networkBlockRules.append(rule);
-        }
-      }
-    }
-  }
-}
-
-void AdBlockMatcher::clear() {
-  m_networkExceptionTree.clear();
-  m_networkExceptionRules.clear();
-
-  m_networkBlockTree.clear();
-  m_networkBlockRules.clear();
-
-  m_domainRestrictedCssRules.clear();
-  m_documentRules.clear();
-}
-
-void AdBlockMatcher::enabledChanged(bool enabled) {
-  if (enabled) {
-    update();
-  }
-  else {
-    clear();
-  }
-}
diff --git a/src/network-web/adblock/adblockmatcher.h b/src/network-web/adblock/adblockmatcher.h
deleted file mode 100755
index dcc695803..000000000
--- a/src/network-web/adblock/adblockmatcher.h
+++ /dev/null
@@ -1,64 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef ADBLOCKMATCHER_H
-#define ADBLOCKMATCHER_H
-
-#include <QObject>
-
-#include <QUrl>
-#include <QVector>
-
-#include "network-web/adblock/adblocksearchtree.h"
-
-
-class AdBlockManager;
-class AdBlockRule;
-
-class AdBlockMatcher : public QObject {
-    Q_OBJECT
-
-  public:
-    explicit AdBlockMatcher(AdBlockManager *manager);
-    virtual ~AdBlockMatcher();
-
-    const AdBlockRule *match(const QUrl &url, const QString &url_domain, const QString &url_string,
-                             const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
-
-    bool adBlockDisabledForUrl(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
-
-  public slots:
-    void update();
-    void clear();
-
-  private slots:
-    void enabledChanged(bool enabled);
-
-  private:
-    AdBlockManager *m_manager;
-
-    QVector<const AdBlockRule*> m_networkExceptionRules;
-    QVector<const AdBlockRule*> m_networkBlockRules;
-    QVector<const AdBlockRule*> m_domainRestrictedCssRules;
-    QVector<const AdBlockRule*> m_documentRules;
-
-    AdBlockSearchTree m_networkBlockTree;
-    AdBlockSearchTree m_networkExceptionTree;
-};
-
-#endif // ADBLOCKMATCHER_H
diff --git a/src/network-web/adblock/adblockrule.cpp b/src/network-web/adblock/adblockrule.cpp
deleted file mode 100755
index 40c77626d..000000000
--- a/src/network-web/adblock/adblockrule.cpp
+++ /dev/null
@@ -1,638 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Copyright (c) 2009, Zsombor Gegesy <gzsombor@gmail.com>
- * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
- *
- * 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 Benjamin Meyer 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 "network-web/adblock/adblockrule.h"
-
-#include "network-web/adblock/adblocksubscription.h"
-#include "network-web/adblock/adblockmanager.h"
-#include "network-web/webfactory.h"
-#include "definitions/definitions.h"
-
-#include <QUrl>
-#include <QString>
-#include <QStringList>
-#include <QNetworkRequest>
-#include <QWebEnginePage>
-
-
-AdBlockRule::AdBlockRule(const QString &filter, AdBlockSubscription* subscription)
-  : m_subscription(subscription), m_type(StringContainsMatchRule), m_caseSensitivity(Qt::CaseInsensitive), m_isEnabled(true),
-    m_isException(false), m_isInternalDisabled(false), m_regExp(NULL) {
-  setFilter(filter);
-}
-
-AdBlockRule::~AdBlockRule() {
-  delete m_regExp;
-}
-
-AdBlockRule *AdBlockRule::copy() const {
-  AdBlockRule* rule = new AdBlockRule();
-
-  rule->m_subscription = m_subscription;
-  rule->m_type = m_type;
-  rule->m_options = m_options;
-  rule->m_exceptions = m_exceptions;
-  rule->m_filter = m_filter;
-  rule->m_matchString = m_matchString;
-  rule->m_caseSensitivity = m_caseSensitivity;
-  rule->m_isEnabled = m_isEnabled;
-  rule->m_isException = m_isException;
-  rule->m_isInternalDisabled = m_isInternalDisabled;
-  rule->m_allowedDomains = m_allowedDomains;
-  rule->m_blockedDomains = m_blockedDomains;
-
-  if (m_regExp != NULL) {
-    rule->m_regExp = new RegExp();
-    rule->m_regExp->regExp = m_regExp->regExp;
-    rule->m_regExp->matchers = m_regExp->matchers;
-  }
-
-  return rule;
-}
-
-AdBlockSubscription *AdBlockRule::subscription() const {
-  return m_subscription;
-}
-
-void AdBlockRule::setSubscription(AdBlockSubscription *subscription) {
-  m_subscription = subscription;
-}
-
-QString AdBlockRule::filter() const {
-  return m_filter;
-}
-
-void AdBlockRule::setFilter(const QString &filter) {
-  m_filter = filter;
-  parseFilter();
-}
-
-bool AdBlockRule::isDocument() const {
-  return hasOption(DocumentOption);
-}
-
-bool AdBlockRule::isElemhide() const {
-  return hasOption(ElementHideOption);
-}
-
-bool AdBlockRule::isDomainRestricted() const {
-  return hasOption(DomainRestrictedOption);
-}
-
-bool AdBlockRule::isException() const {
-  return m_isException;
-}
-
-bool AdBlockRule::isComment() const {
-  return m_filter.startsWith(QL1C('!'));
-}
-
-bool AdBlockRule::isEnabled() const {
-  return m_isEnabled;
-}
-
-void AdBlockRule::setEnabled(bool enabled) {
-  m_isEnabled = enabled;
-}
-
-bool AdBlockRule::isSlow() const {
-  return m_regExp != NULL;
-}
-
-bool AdBlockRule::isInternalDisabled() const {
-  return m_isInternalDisabled;
-}
-
-bool AdBlockRule::urlMatch(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const {
-  if (!hasOption(DocumentOption) && !hasOption(ElementHideOption)) {
-    return false;
-  }
-  else {
-    return networkMatch(url, url.host(), url.toEncoded(), referer, resource_type);
-  }
-}
-
-bool AdBlockRule::networkMatch(const QUrl &url, const QString &domain,
-                               const QString &encoded_url, const QString &referer,
-                               QWebEngineUrlRequestInfo::ResourceType resource_type) const {
-  if (!m_isEnabled || m_isInternalDisabled) {
-    return false;
-  }
-
-  bool matched = false;
-
-  if (m_type == StringContainsMatchRule) {
-    matched = encoded_url.contains(m_matchString, m_caseSensitivity);
-  }
-  else if (m_type == DomainMatchRule) {
-    matched = isMatchingDomain(domain, m_matchString);
-  }
-  else if (m_type == StringEndsMatchRule) {
-    matched = encoded_url.endsWith(m_matchString, m_caseSensitivity);
-  }
-  else if (m_type == RegExpMatchRule) {
-    if (!isMatchingRegExpStrings(encoded_url)) {
-      return false;
-    }
-
-    matched = (m_regExp->regExp.indexIn(encoded_url) != -1);
-  }
-
-  if (matched) {
-    // Check domain restrictions.
-    if (hasOption(DomainRestrictedOption) && !matchDomain(domain)) {
-      return false;
-    }
-
-    // Check third-party restriction.
-    if (hasOption(ThirdPartyOption) && !matchThirdParty(referer, url)) {
-      return false;
-    }
-
-    // Check object restrictions.
-    if (hasOption(ObjectOption) && !matchObject(resource_type)) {
-      return false;
-    }
-
-    // Check subdocument restriction.
-    if (hasOption(SubdocumentOption)) {
-      return false;
-    }
-
-    // Check xmlhttprequest restriction
-    if (hasOption(XMLHttpRequestOption)) {
-      return false;
-    }
-
-    // Check image restriction
-    if (hasOption(ImageOption) && !matchImage(encoded_url)) {
-      return false;
-    }
-  }
-
-  return matched;
-}
-
-bool AdBlockRule::matchDomain(const QString &domain) const {
-  if (!m_isEnabled) {
-    return false;
-  }
-
-  if (!hasOption(DomainRestrictedOption)) {
-    return true;
-  }
-
-  if (m_blockedDomains.isEmpty()) {
-    foreach (const QString &d, m_allowedDomains) {
-      if (isMatchingDomain(domain, d)) {
-        return true;
-      }
-    }
-  }
-  else if (m_allowedDomains.isEmpty()) {
-    foreach (const QString &d, m_blockedDomains) {
-      if (isMatchingDomain(domain, d)) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-  else {
-    foreach (const QString &d, m_blockedDomains) {
-      if (isMatchingDomain(domain, d)) {
-        return false;
-      }
-    }
-
-    foreach (const QString &d, m_allowedDomains) {
-      if (isMatchingDomain(domain, d)) {
-        return true;
-      }
-    }
-  }
-
-  return false;
-}
-
-bool AdBlockRule::matchThirdParty(const QString &referer, const QUrl &url) const {
-  if (referer.isEmpty()) {
-    return false;
-  }
-
-  // Third-party matching should be performed on second-level domains.
-  const QString refererHost = WebFactory::instance()->toSecondLevelDomain(QUrl(referer));
-  const QString host = WebFactory::instance()->toSecondLevelDomain(url);
-
-  bool match = refererHost != host;
-
-  return hasException(ThirdPartyOption) ? !match : match;
-}
-
-bool AdBlockRule::matchObject(QWebEngineUrlRequestInfo::ResourceType type) const {
-  bool match = type == QWebEngineUrlRequestInfo::ResourceTypeObject;
-
-  return hasException(ObjectOption) ? !match : match;
-}
-
-bool AdBlockRule::matchImage(const QString &encoded_url) const {
-  bool match = encoded_url.endsWith(QL1S(".png")) ||
-               encoded_url.endsWith(QL1S(".jpg")) ||
-               encoded_url.endsWith(QL1S(".gif")) ||
-               encoded_url.endsWith(QL1S(".jpeg"));
-
-  return hasException(ImageOption) ? !match : match;
-}
-
-void AdBlockRule::parseFilter() {
-  QString parsed_line = m_filter;
-
-  // Empty rule or just comment.
-  if (m_filter.trimmed().isEmpty() || m_filter.startsWith(QL1C('!'))) {
-    // We want to differentiate rule disabled by user and rule disabled in subscription file
-    // m_isInternalDisabled is also used when rule is disabled due to all options not being supported.
-    m_isEnabled = false;
-    m_isInternalDisabled = true;
-    m_type = Invalid;
-    return;
-  }
-
-  // CSS Element hiding rule.
-  if (parsed_line.contains(QL1S("##")) || parsed_line.contains(QL1S("#@#"))) {
-    // Do not parse CSS rules.
-    return;
-  }
-
-  // Exception always starts with @@
-  if (parsed_line.startsWith(QL1S("@@"))) {
-    m_isException = true;
-    parsed_line = parsed_line.mid(2);
-  }
-
-  // Parse all options following $ char.
-  int optionsIndex = parsed_line.indexOf(QL1C('$'));
-  if (optionsIndex >= 0) {
-    const QStringList options = parsed_line.mid(optionsIndex + 1).split(QL1C(','), QString::SkipEmptyParts);
-
-    int handledOptions = 0;
-    foreach (const QString &option, options) {
-      if (option.startsWith(QL1S("domain="))) {
-        parseDomains(option.mid(7), QL1C('|'));
-        ++handledOptions;
-      }
-      else if (option == QL1S("match-case")) {
-        m_caseSensitivity = Qt::CaseSensitive;
-        ++handledOptions;
-      }
-      else if (option.endsWith(QL1S("third-party"))) {
-        setOption(ThirdPartyOption);
-        setException(ThirdPartyOption, option.startsWith(QL1C('~')));
-        ++handledOptions;
-      }
-      else if (option.endsWith(QL1S("object"))) {
-        setOption(ObjectOption);
-        setException(ObjectOption, option.startsWith(QL1C('~')));
-        ++handledOptions;
-      }
-      else if (option.endsWith(QL1S("subdocument"))) {
-        setOption(SubdocumentOption);
-        setException(SubdocumentOption, option.startsWith(QL1C('~')));
-        ++handledOptions;
-      }
-      else if (option.endsWith(QL1S("xmlhttprequest"))) {
-        setOption(XMLHttpRequestOption);
-        setException(XMLHttpRequestOption, option.startsWith(QL1C('~')));
-        ++handledOptions;
-      }
-      else if (option.endsWith(QL1S("image"))) {
-        setOption(ImageOption);
-        setException(ImageOption, option.startsWith(QL1C('~')));
-        ++handledOptions;
-      }
-      else if (option == QL1S("document") && m_isException) {
-        setOption(DocumentOption);
-        ++handledOptions;
-      }
-      else if (option == QL1S("elemhide") && m_isException) {
-        setOption(ElementHideOption);
-        ++handledOptions;
-      }
-      else if (option == QL1S("collapse")) {
-        // Hiding placeholders of blocked elements is enabled by default.
-        ++handledOptions;
-      }
-    }
-
-    // If we don't handle all options, it's safer to just disable this rule.
-    if (handledOptions != options.count()) {
-      m_isInternalDisabled = true;
-      m_type = Invalid;
-      return;
-    }
-
-    parsed_line = parsed_line.left(optionsIndex);
-  }
-
-  // Rule is classic regexp.
-  if (parsed_line.startsWith(QL1C('/')) && parsed_line.endsWith(QL1C('/'))) {
-    parsed_line = parsed_line.mid(1);
-    parsed_line = parsed_line.left(parsed_line.size() - 1);
-
-    m_type = RegExpMatchRule;
-    m_regExp = new RegExp();
-    m_regExp->regExp = QRegExp(parsed_line, m_caseSensitivity);
-    m_regExp->matchers = createStringMatchers(parseRegExpFilter(parsed_line));
-    return;
-  }
-
-  // Remove starting and ending wildcards (*).
-  if (parsed_line.startsWith(QL1C('*'))) {
-    parsed_line = parsed_line.mid(1);
-  }
-
-  if (parsed_line.endsWith(QL1C('*'))) {
-    parsed_line = parsed_line.left(parsed_line.size() - 1);
-  }
-
-  // We can use fast string matching for domain here.
-  if (filterIsOnlyDomain(parsed_line)) {
-    parsed_line = parsed_line.mid(2);
-    parsed_line = parsed_line.left(parsed_line.size() - 1);
-
-    m_type = DomainMatchRule;
-    m_matchString = parsed_line;
-    return;
-  }
-
-  // If rule contains only | at end, we can also use string matching.
-  if (filterIsOnlyEndsMatch(parsed_line)) {
-    parsed_line = parsed_line.left(parsed_line.size() - 1);
-
-    m_type = StringEndsMatchRule;
-    m_matchString = parsed_line;
-    return;
-  }
-
-  // If we still find a wildcard (*) or separator (^) or (|)
-  // we must modify parsedLine to comply with QzRegExp.
-  if (parsed_line.contains(QL1C('*')) ||
-      parsed_line.contains(QL1C('^')) ||
-      parsed_line.contains(QL1C('|'))
-      ) {
-    m_type = RegExpMatchRule;
-    m_regExp = new RegExp;
-    m_regExp->regExp = QRegExp(createRegExpFromFilter(parsed_line), m_caseSensitivity);
-    m_regExp->matchers = createStringMatchers(parseRegExpFilter(parsed_line));
-    return;
-  }
-
-  // We haven't found anything that needs use of regexp, yay!
-  m_type = StringContainsMatchRule;
-  m_matchString = parsed_line;
-}
-
-void AdBlockRule::parseDomains(const QString &domains, const QChar &separator) {
-  QStringList domains_list = domains.split(separator, QString::SkipEmptyParts);
-
-  foreach (const QString domain, domains_list) {
-    if (!domain.isEmpty()) {
-      if (domain.startsWith(QL1C('~'))) {
-        m_blockedDomains.append(domain.mid(1));
-      }
-      else {
-        m_allowedDomains.append(domain);
-      }
-    }
-  }
-
-  if (!m_blockedDomains.isEmpty() || !m_allowedDomains.isEmpty()) {
-    setOption(DomainRestrictedOption);
-  }
-}
-
-bool AdBlockRule::filterIsOnlyDomain(const QString &filter) const {
-  if (!filter.endsWith(QL1C('^')) || !filter.startsWith(QL1S("||"))) {
-    return false;
-  }
-
-  for (int i = 0; i < filter.size(); i++) {
-    switch (filter.at(i).toLatin1()) {
-      case '/':
-      case ':':
-      case '?':
-      case '=':
-      case '&':
-      case '*':
-        return false;
-
-      default:
-        break;
-    }
-  }
-
-  return true;
-}
-
-bool AdBlockRule::filterIsOnlyEndsMatch(const QString &filter) const {
-  for (int i = 0; i < filter.size(); ++i) {
-    switch (filter.at(i).toLatin1()) {
-      case '^':
-      case '*':
-        return false;
-
-      case '|':
-        return i == filter.size() - 1;
-
-      default:
-        break;
-    }
-  }
-
-  return false;
-}
-
-static bool wordCharacter(const QChar &c) {
-  return c.isLetterOrNumber() || c.isMark() || c == QL1C('_');
-}
-
-QString AdBlockRule::createRegExpFromFilter(const QString &filter) const {
-  QString parsed;
-  parsed.reserve(filter.size());
-
-  bool hadWildcard = false; // Filter multiple wildcards.
-
-  for (int i = 0; i < filter.size(); i++) {
-    const QChar c = filter.at(i);
-
-    switch (c.toLatin1()) {
-      case '^':
-        parsed.append(QL1S("(?:[^\\w\\d\\-.%]|$)"));
-        break;
-
-      case '*':
-        if (!hadWildcard)
-          parsed.append(QL1S(".*"));
-        break;
-
-      case '|':
-        if (i == 0) {
-          if (filter.size() > 1 && filter.at(1) == QL1C('|')) {
-            parsed.append(QL1S("^[\\w\\-]+:\\/+(?!\\/)(?:[^\\/]+\\.)?"));
-            i++;
-          }
-          else {
-            parsed.append('^');
-          }
-          break;
-        }
-        else if (i == filter.size() - 1) {
-          parsed.append(QL1C('$'));
-          break;
-        }
-        // Fall through.
-
-      default:
-        if (!wordCharacter(c)) {
-          parsed.append(QL1C('\\') + c);
-        }
-        else {
-          parsed.append(c);
-        }
-    }
-
-    hadWildcard = c == QL1C('*');
-  }
-
-  return parsed;
-}
-
-QList<QStringMatcher> AdBlockRule::createStringMatchers(const QStringList &filters) const {
-  QList<QStringMatcher> matchers;
-  matchers.reserve(filters.size());
-
-  foreach (const QString &filter, filters) {
-    matchers.append(QStringMatcher(filter, m_caseSensitivity));
-  }
-
-  return matchers;
-}
-
-bool AdBlockRule::isMatchingDomain(const QString &domain, const QString &pattern) const {
-  if (pattern == domain) {
-    return true;
-  }
-
-  if (!domain.endsWith(pattern)) {
-    return false;
-  }
-
-  int index = domain.indexOf(pattern);
-
-  return index > 0 && domain[index - 1] == QLatin1Char('.');
-}
-
-bool AdBlockRule::isMatchingRegExpStrings(const QString &url) const {
-  Q_ASSERT(m_regExp);
-
-  foreach (const QStringMatcher &matcher, m_regExp->matchers) {
-    if (matcher.indexIn(url) == -1) {
-      return false;
-    }
-  }
-
-  return true;
-}
-
-// Split regexp filter into strings that can be used with QString::contains.
-// Don't use parts that contains only 1 char and duplicated parts.
-QStringList AdBlockRule::parseRegExpFilter(const QString &filter) const {
-  QStringList list;
-  int start_pos = -1;
-
-  for (int i = 0; i < filter.size(); i++) {
-    const QChar c = filter.at(i);
-
-    // Meta characters in AdBlock rules are "| * ^".
-    if (c == QL1C('|') || c == QL1C('*') || c == QL1C('^')) {
-      const QString sub = filter.mid(start_pos, i - start_pos);
-
-      if (sub.size() > 1) {
-        list.append(sub);
-      }
-
-      start_pos = i + 1;
-    }
-  }
-
-  const QString sub = filter.mid(start_pos);
-
-  if (sub.size() > 1) {
-    list.append(sub);
-  }
-
-  list.removeDuplicates();
-
-  return list;
-}
-
-bool AdBlockRule::hasOption(const AdBlockRule::RuleOption &opt) const {
-  return (m_options & opt);
-}
-
-bool AdBlockRule::hasException(const AdBlockRule::RuleOption &opt) const {
-  return (m_exceptions & opt);
-}
-
-void AdBlockRule::setOption(const AdBlockRule::RuleOption &opt) {
-  m_options |= opt;
-}
-
-void AdBlockRule::setException(const AdBlockRule::RuleOption &opt, bool on) {
-  if (on) {
-    m_exceptions |= opt;
-  }
-}
diff --git a/src/network-web/adblock/adblockrule.h b/src/network-web/adblock/adblockrule.h
deleted file mode 100755
index 5a6e2b5c9..000000000
--- a/src/network-web/adblock/adblockrule.h
+++ /dev/null
@@ -1,176 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
- *
- * 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 Benjamin Meyer 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 <QObject>
-#include <QStringList>
-#include <QWebEngineUrlRequestInfo>
-
-class QNetworkRequest;
-class QUrl;
-
-class AdBlockSubscription;
-
-class AdBlockRule {
-    friend class AdBlockMatcher;
-    friend class AdBlockSearchTree;
-    friend class AdBlockSubscription;
-
-  public:
-    explicit AdBlockRule(const QString &filter = QString(), AdBlockSubscription* subscription = NULL);
-    virtual ~AdBlockRule();
-
-    AdBlockRule *copy() const;
-
-    AdBlockSubscription *subscription() const;
-    void setSubscription(AdBlockSubscription *subscription);
-
-    QString filter() const;
-    void setFilter(const QString &filter);
-
-    bool isDocument() const;
-    bool isElemhide() const;
-
-    bool isDomainRestricted() const;
-    bool isException() const;
-
-    bool isComment() const;
-    bool isEnabled() const;
-    void setEnabled(bool enabled);
-
-    bool isSlow() const;
-    bool isInternalDisabled() const;
-
-    bool urlMatch(const QUrl &url, const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
-    bool networkMatch(const QUrl &url, const QString &domain, const QString &encoded_url,
-                      const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
-
-    bool matchDomain(const QString &domain) const;
-    bool matchThirdParty(const QString &referer, const QUrl &url) const;
-    bool matchObject(QWebEngineUrlRequestInfo::ResourceType type) const;
-    bool matchImage(const QString &encoded_url) const;
-
-  protected:
-    bool isMatchingDomain(const QString &domain, const QString &pattern) const;
-    bool isMatchingRegExpStrings(const QString &url) const;
-    QStringList parseRegExpFilter(const QString &filter) const;
-
-  private:
-    enum RuleType {
-      DomainMatchRule = 1,
-      RegExpMatchRule = 2,
-      StringEndsMatchRule = 3,
-      StringContainsMatchRule = 4,
-      Invalid = 5
-    };
-
-    enum RuleOption {
-      DomainRestrictedOption = 1,
-      ThirdPartyOption = 2,
-      ObjectOption = 4,
-      SubdocumentOption = 8,
-      XMLHttpRequestOption = 16,
-      ImageOption = 32,
-
-      // Exception only options.
-      DocumentOption = 64,
-      ElementHideOption = 128
-    };
-
-    Q_DECLARE_FLAGS(RuleOptions, RuleOption)
-
-    inline bool hasOption(const RuleOption &opt) const;
-    inline bool hasException(const RuleOption &opt) const;
-
-    inline void setOption(const RuleOption &opt);
-    inline void setException(const RuleOption &opt, bool on);
-
-    void parseFilter();
-    void parseDomains(const QString &domains, const QChar &separator);
-    bool filterIsOnlyDomain(const QString &filter) const;
-    bool filterIsOnlyEndsMatch(const QString &filter) const;
-    QString createRegExpFromFilter(const QString &filter) const;
-    QList<QStringMatcher> createStringMatchers(const QStringList &filters) const;
-
-    AdBlockSubscription *m_subscription;
-
-    RuleType m_type;
-    RuleOptions m_options;
-    RuleOptions m_exceptions;
-
-    // Original rule filter.
-    QString m_filter;
-
-    // Parsed rule for string matching (CSS Selector for CSS rules).
-    QString m_matchString;
-
-    // Case sensitivity for string matching.
-    Qt::CaseSensitivity m_caseSensitivity;
-
-    bool m_isEnabled;
-    bool m_isException;
-    bool m_isInternalDisabled;
-
-    QStringList m_allowedDomains;
-    QStringList m_blockedDomains;
-
-    struct RegExp {
-      public:
-        explicit RegExp() {
-        }
-
-        QRegExp regExp;
-        QList<QStringMatcher> matchers;
-    };
-
-    // Use dynamic allocation to save memory
-    RegExp *m_regExp;
-};
-
-#endif // ADBLOCKRULE_H
-
diff --git a/src/network-web/adblock/adblocksearchtree.cpp b/src/network-web/adblock/adblocksearchtree.cpp
deleted file mode 100755
index f7f272e89..000000000
--- a/src/network-web/adblock/adblocksearchtree.cpp
+++ /dev/null
@@ -1,140 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/adblock/adblocksearchtree.h"
-#include "network-web/adblock/adblockrule.h"
-
-
-AdBlockSearchTree::AdBlockSearchTree() : m_root(new Node()) {
-}
-
-AdBlockSearchTree::~AdBlockSearchTree() {
-  deleteNode(m_root);
-}
-
-void AdBlockSearchTree::clear() {
-  deleteNode(m_root);
-  m_root = new Node();
-}
-
-bool AdBlockSearchTree::add(const AdBlockRule *rule) {
-  if (rule->m_type != AdBlockRule::StringContainsMatchRule) {
-    return false;
-  }
-
-  const QString filter = rule->m_matchString;
-  const int len = filter.size();
-
-  if (len <= 0) {
-    qWarning("Inserting rule with filter len <= 0!");
-    return false;
-  }
-
-  Node *node = m_root;
-
-  for (int i = 0; i < len; i++) {
-    const QChar c = filter.at(i);
-
-    if (!node->children.contains(c)) {
-      Node *n = new Node();
-      n->c = c;
-
-      node->children[c] = n;
-    }
-
-    node = node->children[c];
-  }
-
-  node->rule = rule;
-
-  return true;
-}
-
-const AdBlockRule *AdBlockSearchTree::find(const QUrl &url, const QString &domain,
-                                           const QString &url_string, const QString &referer,
-                                           QWebEngineUrlRequestInfo::ResourceType resource_type) const {
-  const int len = url_string.size();
-
-  if (len <= 0) {
-    return NULL;
-  }
-
-  const QChar *string = url_string.constData();
-
-  for (int i = 0; i < len; i++) {
-    const AdBlockRule *rule = prefixSearch(url, domain, url_string, string++, referer, resource_type, len - i);
-
-    if (rule != NULL) {
-      return rule;
-    }
-  }
-
-  return NULL;
-}
-
-const AdBlockRule *AdBlockSearchTree::prefixSearch(const QUrl &url, const QString &domain,
-                                                   const QString &url_string, const QChar* string,
-                                                   const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type,
-                                                   int len) const {
-  if (len <= 0) {
-    return NULL;
-  }
-
-  QChar c = string[0];
-
-  if (!m_root->children.contains(c)) {
-    return NULL;
-  }
-
-  Node *node = m_root->children[c];
-
-  for (int i = 1; i < len; i++) {
-    const QChar c = (++string)[0];
-
-    if (node->rule && node->rule->networkMatch(url, domain, url_string, referer, resource_type)) {
-      return node->rule;
-    }
-
-    if (!node->children.contains(c)) {
-      return NULL;
-    }
-
-    node = node->children[c];
-  }
-
-  if (node->rule && node->rule->networkMatch(url, domain, url_string, referer, resource_type)) {
-    return node->rule;
-  }
-
-  return NULL;
-}
-
-void AdBlockSearchTree::deleteNode(Node *node) {
-  if (node == NULL) {
-    return;
-  }
-
-  QHashIterator<QChar,Node*> i(node->children);
-
-  while (i.hasNext()) {
-    i.next();
-    deleteNode(i.value());
-  }
-
-  delete node;
-}
diff --git a/src/network-web/adblock/adblocksearchtree.h b/src/network-web/adblock/adblocksearchtree.h
deleted file mode 100755
index 09a539ad8..000000000
--- a/src/network-web/adblock/adblocksearchtree.h
+++ /dev/null
@@ -1,61 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef ADBLOCKSEARCHTREE_H
-#define ADBLOCKSEARCHTREE_H
-
-#include <QChar>
-#include <QHash>
-#include <QUrl>
-#include <QWebEngineUrlRequestInfo>
-
-
-class QNetworkRequest;
-class AdBlockRule;
-
-class AdBlockSearchTree {
-  public:
-    explicit AdBlockSearchTree();
-    virtual ~AdBlockSearchTree();
-
-    void clear();
-
-    bool add(const AdBlockRule *rule);
-    const AdBlockRule *find(const QUrl &url, const QString &domain, const QString &url_string,
-                            const QString &referer, QWebEngineUrlRequestInfo::ResourceType resource_type) const;
-
-  private:
-    struct Node {
-      public:
-        QChar c;
-        const AdBlockRule *rule;
-        QHash<QChar,Node*> children;
-
-        Node() : c(0) , rule(0) {
-        }
-    };
-
-    void deleteNode(Node *node);
-    const AdBlockRule *prefixSearch(const QUrl &url, const QString &domain,
-                                    const QString &url_string, const QChar* string, const QString &referer,
-                                    QWebEngineUrlRequestInfo::ResourceType resource_type, int len) const;
-
-    Node *m_root;
-};
-
-#endif // ADBLOCKSEARCHTREE_H
diff --git a/src/network-web/adblock/adblocksubscription.cpp b/src/network-web/adblock/adblocksubscription.cpp
deleted file mode 100755
index fa92b473d..000000000
--- a/src/network-web/adblock/adblocksubscription.cpp
+++ /dev/null
@@ -1,393 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
- *
- * 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 Benjamin Meyer 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 "network-web/adblock/adblocksubscription.h"
-
-#include "network-web/adblock/adblockmanager.h"
-#include "network-web/adblock/adblocksearchtree.h"
-#include "network-web/downloader.h"
-#include "miscellaneous/iofactory.h"
-#include "miscellaneous/application.h"
-#include "exceptions/applicationexception.h"
-
-#include <QFile>
-#include <QTimer>
-#include <QNetworkReply>
-#include <QDir>
-#include <QWebEnginePage>
-
-
-AdBlockSubscription::AdBlockSubscription(const QString &title, QObject *parent)
-  : QObject(parent), m_title(title), m_downloadingSubscription(false), m_updated(false) {
-}
-
-QString AdBlockSubscription::title() const {
-  return m_title;
-}
-
-void AdBlockSubscription::setTitle(const QString &title) {
-  m_title = title;
-}
-
-QString AdBlockSubscription::filePath() const {
-  return m_filePath;
-}
-
-void AdBlockSubscription::setFilePath(const QString &path) {
-  m_filePath = path;
-}
-
-QUrl AdBlockSubscription::url() const {
-  return m_url;
-}
-
-void AdBlockSubscription::setUrl(const QUrl &url) {
-  m_url = url;
-}
-
-void AdBlockSubscription::loadSubscription(const QStringList &disabled_rules) {
-  QFile file(m_filePath);
-
-  if (!file.exists()) {
-    qWarning("Cannot load subscription '%s'. Requesting its update.", qPrintable(title()));
-    QTimer::singleShot(0, this, SLOT(updateSubscription()));
-    return;
-  }
-
-  if (!file.open(QFile::ReadOnly)) {
-    qWarning("Unable to open subscription file '%s' for reading.", qPrintable(QDir::toNativeSeparators(m_filePath)));
-    QTimer::singleShot(0, this, SLOT(updateSubscription()));
-    return;
-  }
-
-  QTextStream textStream(&file);
-  textStream.setCodec("UTF-8");
-
-  // Header is on 3rd line.
-  textStream.readLine(1024);
-  textStream.readLine(1024);
-  QString header = textStream.readLine(1024);
-
-  if (!header.startsWith(QL1S("[Adblock")) || m_title.isEmpty()) {
-    qWarning("Invalid format of subscription file '%s'.", qPrintable(QDir::toNativeSeparators(m_filePath)));
-    file.close();
-    QTimer::singleShot(0, this, SLOT(updateSubscription()));
-    return;
-  }
-
-  m_rules.clear();
-
-  while (!textStream.atEnd()) {
-    AdBlockRule *rule = new AdBlockRule(textStream.readLine(), this);
-
-    if (disabled_rules.contains(rule->filter())) {
-      rule->setEnabled(false);
-    }
-
-    m_rules.append(rule);
-  }
-
-  file.close();
-
-  // Initial update.
-  if (m_rules.isEmpty() && !m_updated) {
-    QTimer::singleShot(0, this, SLOT(updateSubscription()));
-  }
-}
-
-void AdBlockSubscription::saveSubscription() {
-}
-
-void AdBlockSubscription::updateSubscription() {
-  if (m_downloadingSubscription || !m_url.isValid()) {
-    return;
-  }
-
-  m_downloadingSubscription = true;
-
-  Downloader *downloader = new Downloader();
-
-  connect(downloader, SIGNAL(completed(QNetworkReply::NetworkError,QByteArray)), this, SLOT(subscriptionDownloaded()));
-  downloader->downloadFile(m_url.toString());
-}
-
-void AdBlockSubscription::subscriptionDownloaded() {
-  Downloader *downloader = qobject_cast<Downloader*>(sender());
-
-  if (downloader == NULL) {
-    return;
-  }
-
-  bool error = false;
-  QByteArray response = QString::fromUtf8(downloader->lastOutputData()).toUtf8();
-
-  if (response.startsWith(' ')) {
-    // Deal with " [Adblock".
-    response = response.remove(0, 1);
-  }
-
-  if (downloader->lastOutputError() != QNetworkReply::NoError ||
-      !response.startsWith(QByteArray("[Adblock")) ||
-      !saveDownloadedData(response)) {
-    error = true;
-  }
-
-  downloader->deleteLater();
-
-  if (error) {
-    emit subscriptionError(tr("Cannot load subscription!"));
-  }
-  else {
-    loadSubscription(AdBlockManager::instance()->disabledRules());
-
-    emit subscriptionUpdated();
-    emit subscriptionChanged();
-  }
-
-  m_downloadingSubscription = false;
-}
-
-bool AdBlockSubscription::saveDownloadedData(const QByteArray &data) {
-  QFile file(m_filePath);
-
-  if (!file.open(QFile::ReadWrite | QFile::Truncate)) {
-    qWarning("Unable to open subscription file '%s' for writting.", qPrintable(QDir::toNativeSeparators(m_filePath)));
-    return false;
-  }
-
-  // Write subscription header
-  file.write(QString("Title: %1\nUrl: %2\n").arg(title(), url().toString()).toUtf8());
-
-  if (AdBlockManager::instance()->useLimitedEasyList() && m_url == QUrl(ADBLOCK_EASYLIST_URL)) {
-    // Third-party advertisers rules are with start domain (||) placeholder which needs regexps
-    // So we are ignoring it for keeping good performance
-    // But we will use whitelist rules at the end of list
-
-    QByteArray part1 = data.left(data.indexOf(QL1S("!-----------------------------Third-party adverts-----------------------------!")));
-    QByteArray part2 = data.mid(data.indexOf(QL1S("!---------------------------------Whitelists----------------------------------!")));
-
-    file.write(part1);
-    file.write(part2);
-  }
-  else {
-    file.write(data);
-  }
-
-  file.flush();
-  file.close();
-
-  return true;
-}
-
-const AdBlockRule *AdBlockSubscription::rule(int offset) const{
-  if (offset >= 0 && m_rules.size() > offset) {
-    return m_rules[offset];
-
-  }
-  else {
-    return NULL;
-  }
-}
-
-QVector<AdBlockRule*> AdBlockSubscription::allRules() const {
-  return m_rules;
-}
-
-const AdBlockRule *AdBlockSubscription::enableRule(int offset) {
-  if (offset >= 0 && m_rules.size() > offset) {
-    AdBlockRule *rule = m_rules[offset];
-    rule->setEnabled(true);
-    AdBlockManager::instance()->removeDisabledRule(rule->filter());
-
-    emit subscriptionChanged();
-
-    return rule;
-  }
-  else {
-    return NULL;
-  }
-}
-
-const AdBlockRule *AdBlockSubscription::disableRule(int offset) {
-  if (offset >= 0 && m_rules.size() > offset) {
-    AdBlockRule *rule = m_rules[offset];
-    rule->setEnabled(false);
-    AdBlockManager::instance()->addDisabledRule(rule->filter());
-
-    emit subscriptionChanged();
-
-    return rule;
-  }
-  else {
-    return NULL;
-  }
-}
-
-bool AdBlockSubscription::canEditRules() const {
-  return false;
-}
-
-bool AdBlockSubscription::canBeRemoved() const {
-  return true;
-}
-
-int AdBlockSubscription::addRule(AdBlockRule *rule) {
-  Q_UNUSED(rule)
-  return -1;
-}
-
-bool AdBlockSubscription::removeRule(int offset) {
-  Q_UNUSED(offset)
-  return false;
-}
-
-const AdBlockRule *AdBlockSubscription::replaceRule(AdBlockRule *rule, int offset) {
-  Q_UNUSED(rule)
-  Q_UNUSED(offset)
-  return 0;
-}
-
-AdBlockSubscription::~AdBlockSubscription() {
-  qDeleteAll(m_rules);
-}
-
-AdBlockCustomList::AdBlockCustomList(QObject *parent) : AdBlockSubscription(tr("Custom rules"), parent) {
-  setTitle(tr("Custom rules"));
-  setFilePath(AdBlockManager::baseSubscriptionDirectory() + QDir::separator() + ADBLOCK_CUSTOM_LIST_FILENAME);
-}
-
-AdBlockCustomList::~AdBlockCustomList() {
-}
-
-void AdBlockCustomList::saveSubscription() {
-  QFile file(m_filePath);
-
-  if (!file.open(QFile::WriteOnly | QFile::Truncate)) {
-    qWarning("Unable to open custom subscription file '%s' for writting.", qPrintable(QDir::toNativeSeparators(m_filePath)));
-    return;
-  }
-
-  QTextStream textStream(&file);
-  textStream.setCodec("UTF-8");
-  textStream << "Title: " << title() << endl;
-  textStream << "Url: " << url().toString() << endl;
-  textStream << "[Adblock Plus 1.1.1]" << endl;
-
-  foreach (const AdBlockRule *rule, m_rules) {
-    textStream << rule->filter() << endl;
-  }
-
-  file.flush();
-  file.close();
-}
-
-bool AdBlockCustomList::canEditRules() const {
-  return true;
-}
-
-bool AdBlockCustomList::canBeRemoved() const {
-  return false;
-}
-
-bool AdBlockCustomList::containsFilter(const QString &filter) const {
-  foreach (const AdBlockRule *rule, m_rules) {
-    if (rule->filter() == filter) {
-      return true;
-    }
-  }
-
-  return false;
-}
-
-bool AdBlockCustomList::removeFilter(const QString &filter) {
-  for (int i = 0; i < m_rules.size(); i++) {
-    const AdBlockRule *rule = m_rules.at(i);
-
-    if (rule->filter() == filter) {
-      return removeRule(i);
-    }
-  }
-
-  return false;
-}
-
-int AdBlockCustomList::addRule(AdBlockRule *rule) {
-  m_rules.append(rule);
-  emit subscriptionChanged();
-
-  return m_rules.size() - 1;
-}
-
-bool AdBlockCustomList::removeRule(int offset) {
-  if (offset >= 0 && m_rules.size() > offset) {
-    AdBlockRule *rule = m_rules.at(offset);
-    const QString filter = rule->filter();
-
-    m_rules.remove(offset);
-    emit subscriptionChanged();
-
-    AdBlockManager::instance()->removeDisabledRule(filter);
-    delete rule;
-    return true;
-  }
-  else {
-    return false;
-  }
-}
-
-const AdBlockRule *AdBlockCustomList::replaceRule(AdBlockRule *rule, int offset) {
-  if (offset >= 0 && m_rules.size() > offset) {
-    AdBlockRule *oldRule = m_rules.at(offset);
-    m_rules[offset] = rule;
-    emit subscriptionChanged();
-
-    delete oldRule;
-    return m_rules[offset];
-  }
-  else {
-    return NULL;
-  }
-}
diff --git a/src/network-web/adblock/adblocksubscription.h b/src/network-web/adblock/adblocksubscription.h
deleted file mode 100755
index 531f5926b..000000000
--- a/src/network-web/adblock/adblocksubscription.h
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-/**
- * Copyright (c) 2009, Benjamin C. Meyer <ben@meyerhome.net>
- *
- * 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 Benjamin Meyer 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>
-
-#include <QVector>
-#include <QUrl>
-
-#include "network-web/adblock/adblockrule.h"
-#include "network-web/adblock/adblocksearchtree.h"
-
-
-class QNetworkRequest;
-class QNetworkReply;
-class QUrl;
-class FollowRedirectReply;
-
-class AdBlockSubscription : public QObject {
-    Q_OBJECT
-
-  public:
-    explicit AdBlockSubscription(const QString &title, QObject *parent = 0);
-    virtual ~AdBlockSubscription();
-
-    QString title() const;
-    void setTitle(const QString &title);
-
-    QString filePath() const;
-    void setFilePath(const QString &path);
-
-    QUrl url() const;
-    void setUrl(const QUrl &url);
-
-    virtual void loadSubscription(const QStringList &disabled_rules);
-    virtual void saveSubscription();
-
-    const AdBlockRule *rule(int offset) const;
-    QVector<AdBlockRule*> allRules() const;
-
-    const AdBlockRule *enableRule(int offset);
-    const AdBlockRule *disableRule(int offset);
-
-    virtual bool canEditRules() const;
-    virtual bool canBeRemoved() const;
-
-    virtual int addRule(AdBlockRule *rule);
-    virtual bool removeRule(int offset);
-    virtual const AdBlockRule *replaceRule(AdBlockRule *rule, int offset);
-
-  public slots:
-    void updateSubscription();
-
-  signals:
-    void subscriptionChanged();
-    void subscriptionUpdated();
-    void subscriptionError(const QString &message);
-
-  protected slots:
-    void subscriptionDownloaded();
-
-  protected:
-    virtual bool saveDownloadedData(const QByteArray &data);
-
-    QVector<AdBlockRule*> m_rules;
-    QString m_title;
-    QString m_filePath;
-
-  private:
-    bool m_downloadingSubscription;
-    QUrl m_url;
-    bool m_updated;
-};
-
-class AdBlockCustomList : public AdBlockSubscription {
-    Q_OBJECT
-
-  public:
-    explicit AdBlockCustomList(QObject* parent = 0);
-    virtual ~AdBlockCustomList();
-
-    void saveSubscription();
-
-    bool canEditRules() const;
-    bool canBeRemoved() const;
-
-    bool containsFilter(const QString &filter) const;
-    bool removeFilter(const QString &filter);
-
-    int addRule(AdBlockRule *rule);
-    bool removeRule(int offset);
-    const AdBlockRule *replaceRule(AdBlockRule *rule, int offset);
-};
-
-#endif // ADBLOCKSUBSCRIPTION_H
-
diff --git a/src/network-web/adblock/adblocktreewidget.cpp b/src/network-web/adblock/adblocktreewidget.cpp
deleted file mode 100755
index 77110f5d4..000000000
--- a/src/network-web/adblock/adblocktreewidget.cpp
+++ /dev/null
@@ -1,337 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/adblock/adblocktreewidget.h"
-
-#include "network-web/adblock/adblocksubscription.h"
-#include "miscellaneous/application.h"
-
-#include <QMenu>
-#include <QKeyEvent>
-#include <QClipboard>
-#include <QInputDialog>
-
-
-AdBlockTreeWidget::AdBlockTreeWidget(AdBlockSubscription *subscription, QWidget *parent)
-  : QTreeWidget(parent), m_subscription(subscription), m_topItem(NULL),
-    m_itemChangingBlock(false), m_refreshAllItemsNeeded(true) {
-  setContextMenuPolicy(Qt::CustomContextMenu);
-  setHeaderHidden(true);
-  setAlternatingRowColors(true);
-  setFrameStyle(QFrame::NoFrame);
-
-  connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(contextMenuRequested(QPoint)));
-  connect(this, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*)));
-  connect(m_subscription, SIGNAL(subscriptionUpdated()), this, SLOT(subscriptionUpdated()));
-  connect(m_subscription, SIGNAL(subscriptionError(QString)), this, SLOT(subscriptionError(QString)));
-}
-
-AdBlockSubscription *AdBlockTreeWidget::subscription() const {
-  return m_subscription;
-}
-
-void AdBlockTreeWidget::showRule(const AdBlockRule *rule) {
-  if (m_topItem == NULL && rule) {
-    // Dialog is not loaded yet. Mark rule for late loading.
-    m_ruleToBeSelected = rule->filter();
-  }
-  else if (!m_ruleToBeSelected.isEmpty()) {
-    QList<QTreeWidgetItem*> items = findItems(m_ruleToBeSelected, Qt::MatchRecursive);
-
-    if (!items.isEmpty()) {
-      QTreeWidgetItem *item = items.at(0);
-
-      setCurrentItem(item);
-      scrollToItem(item, QAbstractItemView::PositionAtCenter);
-    }
-
-    m_ruleToBeSelected.clear();
-  }
-}
-
-void AdBlockTreeWidget::contextMenuRequested(const QPoint &pos) {
-  if (!m_subscription->canEditRules()) {
-    return;
-  }
-
-  QTreeWidgetItem *item = itemAt(pos);
-
-  if (item != NULL) {
-    QMenu menu;
-    menu.addAction(tr("Add rule"), this, SLOT(addRule()));
-    menu.addSeparator();
-
-    QAction *delete_action = menu.addAction(tr("Remove rule"), this, SLOT(removeRule()));
-
-    if (item->parent() == NULL) {
-      delete_action->setDisabled(true);
-    }
-
-    menu.exec(viewport()->mapToGlobal(pos));
-  }
-}
-
-void AdBlockTreeWidget::itemChanged(QTreeWidgetItem *item) {
-  m_refreshAllItemsNeeded = true;
-
-  if (item == NULL || m_itemChangingBlock) {
-    return;
-  }
-
-  m_itemChangingBlock = true;
-
-  int offset = item->data(0, Qt::UserRole + 10).toInt();
-  const AdBlockRule *old_rle = m_subscription->rule(offset);
-
-  if (item->checkState(0) == Qt::Unchecked && old_rle->isEnabled()) {
-    // Disable rule.
-    const AdBlockRule *rule = m_subscription->disableRule(offset);
-
-    adjustItemFeatures(item, rule);
-  }
-  else if (item->checkState(0) == Qt::Checked && !old_rle->isEnabled()) {
-    // Enable rule
-    const AdBlockRule *rule = m_subscription->enableRule(offset);
-
-    adjustItemFeatures(item, rule);
-  }
-  else if (m_subscription->canEditRules()) {
-    // Custom rule has been changed
-    AdBlockRule *new_rule = new AdBlockRule(item->text(0), m_subscription);
-    const AdBlockRule *rule = m_subscription->replaceRule(new_rule, offset);
-
-    adjustItemFeatures(item, rule);
-  }
-
-  m_itemChangingBlock = false;
-}
-
-void AdBlockTreeWidget::copyFilter() {
-  QTreeWidgetItem *item = currentItem();
-
-  if (item != NULL) {
-    Application::clipboard()->setText(item->text(0));
-  }
-}
-
-void AdBlockTreeWidget::addRule() {
-  if (!m_subscription->canEditRules()) {
-    return;
-  }
-
-  QString new_rule = QInputDialog::getText(this, tr("Add rule"), tr("Please write your rule here"));
-  if (new_rule.isEmpty()) {
-    return;
-  }
-
-  AdBlockRule *rule = new AdBlockRule(new_rule, m_subscription);
-  int offset = m_subscription->addRule(rule);
-
-  QTreeWidgetItem *item = new QTreeWidgetItem();
-  item->setText(0, new_rule);
-  item->setData(0, Qt::UserRole + 10, offset);
-  item->setFlags(item->flags() | Qt::ItemIsEditable);
-
-  m_itemChangingBlock = true;
-  m_topItem->addChild(item);
-  m_itemChangingBlock = false;
-
-  adjustItemFeatures(item, rule);
-}
-
-void AdBlockTreeWidget::removeRule() {
-  QTreeWidgetItem *item = currentItem();
-  if (item == NULL || !m_subscription->canEditRules() || item == m_topItem) {
-    return;
-  }
-
-  int offset = item->data(0, Qt::UserRole + 10).toInt();
-  m_subscription->removeRule(offset);
-  delete item;
-}
-
-void AdBlockTreeWidget::subscriptionUpdated() {
-  refresh();
-
-  m_itemChangingBlock = true;
-  m_topItem->setText(0, tr("%1 (recently updated)").arg(m_subscription->title()));
-  m_itemChangingBlock = false;
-}
-
-void AdBlockTreeWidget::subscriptionError(const QString &message) {
-  refresh();
-
-  m_itemChangingBlock = true;
-  m_topItem->setText(0, tr("%1 (error: %2)").arg(m_subscription->title(), message));
-  m_itemChangingBlock = false;
-}
-
-void AdBlockTreeWidget::adjustItemFeatures(QTreeWidgetItem *item, const AdBlockRule *rule) {
-  if (!rule->isEnabled()) {
-    QFont font;
-    font.setItalic(true);
-    item->setForeground(0, QColor(Qt::gray));
-
-    if (!rule->isComment()) {
-      item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-      item->setCheckState(0, Qt::Unchecked);
-      item->setFont(0, font);
-    }
-
-    return;
-  }
-
-  item->setFlags(item->flags() | Qt::ItemIsUserCheckable);
-  item->setCheckState(0, Qt::Checked);
-
-  if (rule->isException()) {
-    item->setForeground(0, QColor(Qt::darkGreen));
-    item->setFont(0, QFont());
-  }
-  else {
-    item->setForeground(0, QColor());
-    item->setFont(0, QFont());
-  }
-}
-
-void AdBlockTreeWidget::keyPressEvent(QKeyEvent* event) {
-  if (event->key() == Qt::Key_C && event->modifiers() & Qt::ControlModifier) {
-    copyFilter();
-  }
-
-  if (event->key() == Qt::Key_Delete) {
-    removeRule();
-  }
-
-  QTreeWidget::keyPressEvent(event);
-}
-
-void AdBlockTreeWidget::refresh() {
-  // Disable GUI editing for parent.
-  emit refreshStatusChanged(true);
-  setUpdatesEnabled(false);
-
-  m_itemChangingBlock = true;
-  clear();
-
-  QFont bold_font;
-  bold_font.setBold(true);
-
-  m_topItem = new QTreeWidgetItem(this);
-  m_topItem->setText(0, m_subscription->title());
-  m_topItem->setFont(0, bold_font);
-  m_topItem->setExpanded(true);
-  addTopLevelItem(m_topItem);
-
-  const QVector<AdBlockRule*> &all_rules = m_subscription->allRules();
-  int index = 0;
-
-  foreach (const AdBlockRule *rule, all_rules) {
-    QTreeWidgetItem *item = new QTreeWidgetItem(m_topItem);
-    item->setText(0, rule->filter());
-    item->setData(0, Qt::UserRole + 10, index);
-
-    if (m_subscription->canEditRules()) {
-      item->setFlags(item->flags() | Qt::ItemIsEditable);
-    }
-
-    adjustItemFeatures(item, rule);
-    index++;
-
-    if (index % 100 == 0) {
-      qApp->processEvents();
-    }
-  }
-
-  showRule(0);
-  m_itemChangingBlock = false;
-  setUpdatesEnabled(true);
-  emit refreshStatusChanged(false);
-}
-
-void AdBlockTreeWidget::clear() {
-  QTreeWidget::clear();
-  m_allTreeItems.clear();
-}
-
-void AdBlockTreeWidget::addTopLevelItem(QTreeWidgetItem *item) {
-  m_allTreeItems.append(item);
-  QTreeWidget::addTopLevelItem(item);
-}
-
-void AdBlockTreeWidget::iterateAllItems(QTreeWidgetItem *parent)
-{
-  int count = parent ? parent->childCount() : topLevelItemCount();
-
-  for (int i = 0; i < count; i++) {
-    QTreeWidgetItem *item = parent ? parent->child(i) : topLevelItem(i);
-
-    if (item->childCount() == 0) {
-      m_allTreeItems.append(item);
-    }
-
-    iterateAllItems(item);
-  }
-}
-
-QList<QTreeWidgetItem*> AdBlockTreeWidget::allItems() {
-  if (m_refreshAllItemsNeeded) {
-    m_allTreeItems.clear();
-    iterateAllItems(0);
-    m_refreshAllItemsNeeded = false;
-  }
-
-  return m_allTreeItems;
-}
-
-void AdBlockTreeWidget::filterString(const QString &string) {
-  QList<QTreeWidgetItem*> all_items = allItems();
-  QList<QTreeWidgetItem*> parents;
-  bool string_empty = string.isEmpty();
-
-  foreach (QTreeWidgetItem *item, all_items) {
-    bool contains_string = string_empty || item->text(0).contains(string, Qt::CaseInsensitive);
-
-    if (contains_string) {
-      item->setHidden(false);
-
-      if (item->parent() != NULL) {
-        if (!parents.contains(item->parent())) {
-          parents << item->parent();
-        }
-      }
-    }
-    else {
-      item->setHidden(true);
-
-      if (item->parent() != NULL) {
-        item->parent()->setHidden(true);
-      }
-    }
-  }
-
-  for (int i = 0; i < parents.size(); i++) {
-    QTreeWidgetItem *parentItem = parents.at(i);
-    parentItem->setHidden(false);
-    parentItem->setExpanded(true);
-
-    if (parentItem->parent() != NULL && !parents.contains(parentItem->parent())) {
-      parents << parentItem->parent();
-    }
-  }
-}
diff --git a/src/network-web/adblock/adblocktreewidget.h b/src/network-web/adblock/adblocktreewidget.h
deleted file mode 100755
index 0e9ff6a33..000000000
--- a/src/network-web/adblock/adblocktreewidget.h
+++ /dev/null
@@ -1,75 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2014-2015 by Martin Rotter <rotter.martinos@gmail.com>
-// Copyright (C) 2010-2014 by David Rosca <nowrep@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef ADBLOCKTREEWIDGET_H
-#define ADBLOCKTREEWIDGET_H
-
-#include <QTreeWidget>
-
-
-class AdBlockSubscription;
-class AdBlockRule;
-
-class AdBlockTreeWidget : public QTreeWidget {
-    Q_OBJECT
-
-  public:
-    explicit AdBlockTreeWidget(AdBlockSubscription* subscription, QWidget* parent = 0);
-
-    AdBlockSubscription *subscription() const;
-
-    void showRule(const AdBlockRule *rule);
-    void refresh();
-
-  public slots:
-    void addRule();
-    void removeRule();
-    void filterString(const QString &string);
-    void clear();
-
-  private slots:
-    void contextMenuRequested(const QPoint &pos);
-    void itemChanged(QTreeWidgetItem *item);
-    void copyFilter();
-
-    void subscriptionUpdated();
-    void subscriptionError(const QString &message);
-
-  protected:
-    void keyPressEvent(QKeyEvent *event);
-
-  signals:
-    void refreshStatusChanged(bool started);
-
-  private:
-    void adjustItemFeatures(QTreeWidgetItem *item, const AdBlockRule *rule);
-    void addTopLevelItem(QTreeWidgetItem *item);
-    QList<QTreeWidgetItem*> allItems();
-    void iterateAllItems(QTreeWidgetItem *parent);
-
-    AdBlockSubscription *m_subscription;
-    QTreeWidgetItem *m_topItem;
-
-    QString m_ruleToBeSelected;
-    bool m_itemChangingBlock;
-
-    bool m_refreshAllItemsNeeded;
-    QList<QTreeWidgetItem*> m_allTreeItems;
-};
-
-#endif // ADBLOCKTREEWIDGET_H
diff --git a/src/network-web/adblock/requestinterceptor.cpp b/src/network-web/adblock/requestinterceptor.cpp
deleted file mode 100644
index d9c53d354..000000000
--- a/src/network-web/adblock/requestinterceptor.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/adblock/requestinterceptor.h"
-
-#include "network-web/adblock/adblockmanager.h"
-#include "miscellaneous/application.h"
-
-
-RequestInterceptor::RequestInterceptor(QObject *parent) : QWebEngineUrlRequestInterceptor(parent) {
-}
-
-RequestInterceptor::~RequestInterceptor() {
-}
-
-void RequestInterceptor::interceptRequest(QWebEngineUrlRequestInfo &info) {
-  if (AdBlockManager::instance()->shouldBlock(info.requestUrl(), info.firstPartyUrl().toString(), info.resourceType())) {
-    info.block(true);
-    qWarning("%s just blocked network resource:\n URL: '%s'.", APP_NAME, qPrintable(info.requestUrl().toString()));
-
-    /*
-    qApp->showGuiMessage(tr("Network resource blocked"),
-                         tr("%1 just blocked network resource:\n URL: %2").arg(APP_NAME, info.requestUrl().toString()),
-                         QSystemTrayIcon::Information);
-    */
-  }
-}
diff --git a/src/network-web/adblock/requestinterceptor.h b/src/network-web/adblock/requestinterceptor.h
deleted file mode 100644
index 2b8eafc95..000000000
--- a/src/network-web/adblock/requestinterceptor.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef REQUESTINTERCEPTOR_H
-#define REQUESTINTERCEPTOR_H
-
-#include <QWebEngineUrlRequestInterceptor>
-
-
-
-class RequestInterceptor : public QWebEngineUrlRequestInterceptor {
-  public:
-    explicit RequestInterceptor(QObject *parent = 0);
-    virtual ~RequestInterceptor();
-
-    void interceptRequest(QWebEngineUrlRequestInfo &info);
-};
-
-#endif // REQUESTINTERCEPTOR_H

From 8120ff64673b8bbbb8c2c2b4fde4dbea52b68f63 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 23 Mar 2016 09:35:56 +0100
Subject: [PATCH 07/31] Work on web browsing.

---
 CMakeLists.txt                   |  4 +---
 src/definitions/definitions.h.in |  5 -----
 src/gui/statusbar.cpp            | 18 +++++++++++++-----
 src/gui/statusbar.h              |  1 -
 src/miscellaneous/settings.cpp   | 17 +----------------
 src/miscellaneous/settings.h     | 17 -----------------
 src/network-web/webbrowser.cpp   |  9 ++++-----
 src/network-web/webpage.cpp      |  7 +------
 src/network-web/webpage.h        |  3 ---
 src/network-web/webview.cpp      | 25 +++++++++++++------------
 10 files changed, 33 insertions(+), 73 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e02fb7505..734b2c161 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -330,8 +330,7 @@ file( GLOB APP_FORMS
   "src/services/standard/gui/*.ui"
   "src/services/tt-rss/gui/*.ui"
   "src/services/owncloud/gui/*.ui"
-  "src/network-web/*.ui"
-  "src/network-web/adblock/*.ui")
+  "src/network-web/*.ui")
 
 # APP translations.
 file( GLOB APP_TRANSLATIONS
@@ -383,7 +382,6 @@ include_directories (
   ${CMAKE_SOURCE_DIR}/src/gui/dialogs
   ${CMAKE_SOURCE_DIR}/src/gui/notifications
   ${CMAKE_SOURCE_DIR}/src/network-web
-  ${CMAKE_SOURCE_DIR}/src/network-web/adblock
   ${CMAKE_SOURCE_DIR}/src/dynamic-shortcuts
   ${CMAKE_BINARY_DIR}/src
 )
diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in
index cf5e91a01..648dd8792 100755
--- a/src/definitions/definitions.h.in
+++ b/src/definitions/definitions.h.in
@@ -104,11 +104,6 @@
 #define PLACEHOLDER_UNREAD_COUNTS   "%unread"
 #define PLACEHOLDER_ALL_COUNTS      "%all"
 
-#define ADBLOCK_CUSTOM_LIST_FILENAME    "custom_rules.txt"
-#define ADBLOCK_BASE_DIRECTORY_NAME     "data/adblock"
-#define ADBLOCK_FILTERS_HELP            "https://adblockplus.org/en/filters"
-#define ADBLOCK_EASYLIST_URL            "https://easylist-downloads.adblockplus.org/easylist.txt"
-
 #define BACKUP_NAME_SETTINGS    "config"
 #define BACKUP_SUFFIX_SETTINGS  ".ini.backup"
 #define BACKUP_NAME_DATABASE    "database"
diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp
index 54133e47c..f90cb6ad8 100755
--- a/src/gui/statusbar.cpp
+++ b/src/gui/statusbar.cpp
@@ -156,7 +156,7 @@ void StatusBar::loadChangeableActions(const QStringList &action_names) {
         action_to_add->setProperty("type", SPACER_ACTION_NAME);
         action_to_add->setProperty("name", tr("Toolbar spacer"));
       }
-      else {
+      else if (matching_action != NULL) {
         // Add originally toolbar action.
         PlainToolButton *tool_button = new PlainToolButton(this);
         tool_button->reactOnActionChange(matching_action);
@@ -167,13 +167,21 @@ void StatusBar::loadChangeableActions(const QStringList &action_names) {
         connect(tool_button, SIGNAL(clicked(bool)), matching_action, SLOT(trigger()));
         connect(matching_action, SIGNAL(changed()), tool_button, SLOT(reactOnActionChange()));
       }
+      else {
+        action_to_add = NULL;
+        widget_to_add = NULL;
+      }
 
-      action_to_add->setProperty("should_remove_widget", true);
+      if (action_to_add != NULL) {
+        action_to_add->setProperty("should_remove_widget", true);
+      }
     }
 
-    action_to_add->setProperty("widget", QVariant::fromValue((void*) widget_to_add));
-    addPermanentWidget(widget_to_add);
-    addAction(action_to_add);
+    if (action_to_add != NULL && widget_to_add != NULL) {
+      action_to_add->setProperty("widget", QVariant::fromValue((void*) widget_to_add));
+      addPermanentWidget(widget_to_add);
+      addAction(action_to_add);
+    }
   }
 }
 
diff --git a/src/gui/statusbar.h b/src/gui/statusbar.h
index 39b3c36b8..a61ee3d89 100755
--- a/src/gui/statusbar.h
+++ b/src/gui/statusbar.h
@@ -25,7 +25,6 @@
 class QProgressBar;
 class PlainToolButton;
 class QLabel;
-class AdBlockIcon;
 
 class StatusBar : public QStatusBar, public BaseBar {
     Q_OBJECT
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index ed03109b0..9022f3a78 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -85,7 +85,7 @@ DKEY GUI::FeedsToolbarActions                     = "feeds_toolbar";
 DVALUE(char*) GUI::FeedsToolbarActionsDef         = "m_actionUpdateAllItems,m_actionStopRunningItemsUpdate,m_actionMarkAllItemsRead";
 
 DKEY GUI::StatusbarActions              = "status_bar";
-DVALUE(char*) GUI::StatusbarActionsDef  = "m_lblProgressFeedsAction,m_barProgressFeedsAction,m_actionUpdateAllItems,m_actionUpdateSelectedItems,m_actionStopRunningItemsUpdate,m_adBlockIconAction,m_actionFullscreen,m_actionQuit";
+DVALUE(char*) GUI::StatusbarActionsDef  = "m_lblProgressFeedsAction,m_barProgressFeedsAction,m_actionUpdateAllItems,m_actionUpdateSelectedItems,m_actionStopRunningItemsUpdate,m_actionFullscreen,m_actionQuit";
 
 DKEY GUI::MainWindowInitialSize        = "window_size";
 DKEY GUI::MainWindowInitialPosition    = "window_position";
@@ -241,21 +241,6 @@ DVALUE(char*) Database::ActiveDriverDef   = APP_DB_SQLITE_DRIVER;
 // Keyboard.
 DKEY Keyboard::ID = "keyboard";
 
-// Adblock.
-DKEY AdBlock::ID                                = "adblock";
-
-DKEY AdBlock::Enabled                           = "enabled";
-DVALUE(bool) AdBlock::EnabledDef                = false;
-
-DKEY AdBlock::UseLimitedEasyList                = "use_limited_easylist";
-DVALUE(bool) AdBlock::UseLimitedEasyListDef     = true;
-
-DKEY AdBlock::DisabledRules                     = "disabled_rules";
-DVALUE(QStringList) AdBlock::DisabledRulesDef   = QStringList();
-
-DKEY AdBlock::LastUpdated                       = "last_updated";
-DVALUE(QDateTime) AdBlock::LastUpdatedDef       = QDateTime();
-
 // Web browser.
 DKEY Browser::ID                            = "browser";
 
diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h
index f9683ea00..022a32bf6 100755
--- a/src/miscellaneous/settings.h
+++ b/src/miscellaneous/settings.h
@@ -269,23 +269,6 @@ namespace Keyboard {
   KEY ID;
 }
 
-// Adblock.
-namespace AdBlock {
-  KEY ID;
-
-  KEY Enabled;
-  VALUE(bool) EnabledDef;
-
-  KEY UseLimitedEasyList;
-  VALUE(bool) UseLimitedEasyListDef;
-
-  KEY DisabledRules;
-  VALUE(QStringList) DisabledRulesDef;
-
-  KEY LastUpdated;
-  VALUE(QDateTime) LastUpdatedDef;
-}
-
 // Web browser.
 namespace Browser {
   KEY ID;
diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp
index 89f1695da..3eab9fc4e 100755
--- a/src/network-web/webbrowser.cpp
+++ b/src/network-web/webbrowser.cpp
@@ -163,19 +163,18 @@ void WebBrowser::initializeLayout() {
 void WebBrowser::onLoadingStarted() {
   m_loadingProgress->setValue(0);
   m_loadingWidget->show();
+  m_btnDiscoverFeeds->setEnabled(false);
 }
 
 void WebBrowser::onLoadingProgress(int progress) {
   m_loadingProgress->setValue(progress);
-  // TODO: TODO
-  //m_lblProgress->setText(QString(QSL(" %1 kB / %2 kB")).arg(m_webView->page()-> / 1000).arg(m_webView->page()->totalBytes() / 1000));
 }
 
 void WebBrowser::onLoadingFinished(bool success) {
   if (success) {
-    // Let's check if there are any feeds defined on the web and eventually
-    // display "Add feeds" button.
-    m_btnDiscoverFeeds->setFeedAddresses(NetworkFactory::extractFeedLinksFromHtmlPage(m_webView->url(), m_webView->page()->toHtml()));
+    m_webView->page()->toHtml([this](const QString &html) {
+      this->m_btnDiscoverFeeds->setFeedAddresses(NetworkFactory::extractFeedLinksFromHtmlPage(m_webView->url(), html));
+    });
   }
   else {
     m_btnDiscoverFeeds->clearFeedAddresses();
diff --git a/src/network-web/webpage.cpp b/src/network-web/webpage.cpp
index 81bdb5ded..c462543ec 100755
--- a/src/network-web/webpage.cpp
+++ b/src/network-web/webpage.cpp
@@ -31,6 +31,7 @@ WebPage::~WebPage() {
 }
 
 bool WebPage::isLoading() const {
+  // TODO: nepouzivany?
   return m_loadProgress < 100;
 }
 
@@ -41,9 +42,3 @@ void WebPage::progress(int prog) {
 void WebPage::finished() {
   progress(100);
 }
-
-QString WebPage::toHtml() const {
-  return QString();
-  // TODO: TODO
-  //return mainFrame()->toHtml();
-}
diff --git a/src/network-web/webpage.h b/src/network-web/webpage.h
index 1da11261a..2e76039d4 100755
--- a/src/network-web/webpage.h
+++ b/src/network-web/webpage.h
@@ -22,8 +22,6 @@
 #include <QNetworkAccessManager>
 
 
-class AdBlockRule;
-
 class WebPage : public QWebEnginePage {
     Q_OBJECT
 
@@ -32,7 +30,6 @@ class WebPage : public QWebEnginePage {
     explicit WebPage(QObject *parent = 0);
     virtual ~WebPage();
 
-    QString toHtml() const;
     bool isLoading() const;
 
   private slots:
diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp
index b80afde85..baacca247 100755
--- a/src/network-web/webview.cpp
+++ b/src/network-web/webview.cpp
@@ -125,20 +125,21 @@ void WebView::saveCurrentPageToFile() {
   }*/
 
   if (!selected_file.isEmpty()) {
-    QFile selected_file_handle(selected_file);
+    page()->toHtml([this, selected_file](const QString &html) {
+      QFile selected_file_handle(selected_file);
 
-    if (selected_file_handle.open(QIODevice::WriteOnly | QIODevice::Unbuffered)) {
-      const QString html_text = page()->toHtml();
-      QTextStream str(&selected_file_handle);
+      if (selected_file_handle.open(QIODevice::WriteOnly | QIODevice::Unbuffered)) {
+        QTextStream str(&selected_file_handle);
 
-      str.setCodec("UTF-16");
-      str << html_text;
-      selected_file_handle.close();
-    }
-    else {
-      MessageBox::show(this, QMessageBox::Critical, tr("Cannot save web page"),
-                       tr("Web page cannot be saved because destination file is not writtable."));
-    }
+        str.setCodec("UTF-16");
+        str << html;
+        selected_file_handle.close();
+      }
+      else {
+        MessageBox::show(this, QMessageBox::Critical, tr("Cannot save web page"),
+                         tr("Web page cannot be saved because destination file is not writtable."));
+      }
+    });
   }
 }
 

From 888b55b00d878e910b63b06026534f805c070256 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 23 Mar 2016 10:29:59 +0100
Subject: [PATCH 08/31] More work on context menus etc.

---
 src/network-web/webbrowser.cpp | 18 ++++++---
 src/network-web/webpage.cpp    | 21 +----------
 src/network-web/webpage.h      | 12 ------
 src/network-web/webview.cpp    | 69 +++++-----------------------------
 src/network-web/webview.h      | 12 +-----
 5 files changed, 24 insertions(+), 108 deletions(-)

diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp
index 3eab9fc4e..cff01a927 100755
--- a/src/network-web/webbrowser.cpp
+++ b/src/network-web/webbrowser.cpp
@@ -201,15 +201,14 @@ void WebBrowser::createConnections() {
 
   // Forward title/icon changes.
   connect(m_webView, SIGNAL(titleChanged(QString)), this, SLOT(onTitleChanged(QString)));
-  connect(m_webView, SIGNAL(iconChanged()), this, SLOT(onIconChanged()));
+  connect(m_webView, SIGNAL(iconUrlChanged(QUrl)), this, SLOT(onIconChanged()));
 
   // Misc connections.
   connect(m_webView, SIGNAL(zoomFactorChanged()), this, SLOT(updateZoomGui()));
 }
 
 void WebBrowser::onIconChanged() {
-  // TODO: todo
-  //emit iconChanged(m_index, m_webView->icon());
+  emit iconChanged(m_index, icon());
 }
 
 void WebBrowser::onTitleChanged(const QString &new_title) {
@@ -321,9 +320,16 @@ void WebBrowser::setupIcons() {
 }
 
 QIcon WebBrowser::icon() const {
+  QUrl url = m_webView->iconUrl();
+
+  if (url.isValid()) {
+    QByteArray output;
+    if (NetworkFactory::downloadFile(url.toString(), DOWNLOAD_TIMEOUT, output).first == QNetworkReply::NoError) {
+      QPixmap icon_pixmap;
+      icon_pixmap.loadFromData(output);
+      return QIcon(icon_pixmap);
+    }
+  }
 
   return QIcon();
-
-  // TODO: TODO.
-  //return m_webView->iconUrl();
 }
diff --git a/src/network-web/webpage.cpp b/src/network-web/webpage.cpp
index c462543ec..fc792a383 100755
--- a/src/network-web/webpage.cpp
+++ b/src/network-web/webpage.cpp
@@ -17,28 +17,9 @@
 
 #include "network-web/webpage.h"
 
-#include "network-web/webbrowser.h"
-#include "miscellaneous/application.h"
 
-
-WebPage::WebPage(QObject *parent)
-  : QWebEnginePage(parent), m_loadProgress(-1) {
-  connect(this, SIGNAL(loadProgress(int)), this, SLOT(progress(int)));
-  connect(this, SIGNAL(loadFinished(bool)), this, SLOT(finished()));
+WebPage::WebPage(QObject *parent) : QWebEnginePage(parent) {
 }
 
 WebPage::~WebPage() {
 }
-
-bool WebPage::isLoading() const {
-  // TODO: nepouzivany?
-  return m_loadProgress < 100;
-}
-
-void WebPage::progress(int prog) {
-  m_loadProgress = prog;
-}
-
-void WebPage::finished() {
-  progress(100);
-}
diff --git a/src/network-web/webpage.h b/src/network-web/webpage.h
index 2e76039d4..231c8b3df 100755
--- a/src/network-web/webpage.h
+++ b/src/network-web/webpage.h
@@ -19,7 +19,6 @@
 #define WEBPAGE_H
 
 #include <QWebEnginePage>
-#include <QNetworkAccessManager>
 
 
 class WebPage : public QWebEnginePage {
@@ -29,17 +28,6 @@ class WebPage : public QWebEnginePage {
     // Constructors and destructors.
     explicit WebPage(QObject *parent = 0);
     virtual ~WebPage();
-
-    bool isLoading() const;
-
-  private slots:
-    void progress(int prog);
-    void finished();
-
-  private:
-    int m_loadProgress;
-
-    static QList<WebPage*> s_livingPages;
 };
 
 #endif // WEBPAGE_H
diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp
index baacca247..4da6d6412 100755
--- a/src/network-web/webview.cpp
+++ b/src/network-web/webview.cpp
@@ -43,7 +43,6 @@
 WebView::WebView(QWidget *parent)
   : QWebEngineView(parent), m_page(new WebPage(this)) {
   setPage(m_page);
-  setContextMenuPolicy(Qt::CustomContextMenu);
   initializeActions();
   createConnections();
 }
@@ -52,13 +51,6 @@ WebView::~WebView() {
   qDebug("Destroying WebView.");
 }
 
-void WebView::onLoadFinished(bool ok) {
-  // If page was not loaded, then display custom error page.
-  if (!ok) {
-    displayErrorPage();
-  }
-}
-
 void WebView::copySelectedText() {
   Application::clipboard()->setText(selectedText());
 }
@@ -158,7 +150,6 @@ void WebView::createConnections() {
 
 void WebView::setupIcons() {
   m_actionPrint->setIcon(qApp->icons()->fromTheme(QSL("print-web-page")));
-  m_actionReload->setIcon(qApp->icons()->fromTheme(QSL("go-refresh")));
   m_actionCopySelectedItem->setIcon(qApp->icons()->fromTheme(QSL("edit-copy")));
   m_actionCopyLink->setIcon(qApp->icons()->fromTheme(QSL("edit-copy")));
   m_actionCopyImage->setIcon(qApp->icons()->fromTheme(QSL("edit-copy-image")));
@@ -173,11 +164,7 @@ void WebView::setupIcons() {
   m_actionLookupText->setIcon(qApp->icons()->fromTheme(QSL("item-search-google")));
 }
 
-void WebView::initializeActions() {
-  // Create needed actions.
-  m_actionReload = pageAction(QWebEnginePage::Reload);
-  m_actionReload->setParent(this);
-
+void WebView::initializeActions() {  
   m_actionPrint = new QAction(tr("Print"), this);
   m_actionPrint->setToolTip(tr("Print current web page."));
 
@@ -216,8 +203,6 @@ void WebView::initializeActions() {
 }
 
 void WebView::setActionTexts() {
-  m_actionReload->setText(tr("Reload web page"));
-  m_actionReload->setToolTip(tr("Reload current web page."));
   m_actionCopySelectedItem->setText(tr("Copy selection"));
   m_actionCopySelectedItem->setToolTip(tr("Copies current selection into the clipboard."));
   m_actionSaveHyperlinkAs->setText(tr("Save target as..."));
@@ -241,28 +226,6 @@ void WebView::setActionTexts() {
   m_actionOpenImageNewTab->setToolTip(tr("Open this image in this tab."));
 }
 
-void WebView::displayErrorPage() {
-  /*
-  setHtml(qApp->skins()->currentMarkupLayout().arg(
-            tr("Error page"),
-            qApp->skins()->currentMarkup().arg(tr("Page not found"),
-                                               tr("Check your internet connection or website address"),
-                                               QString(),
-                                               tr("This failure can be caused by:<br><ul>"
-                                                  "<li>non-functional internet connection,</li>"
-                                                  "<li>incorrect website address,</li>"
-                                                  "<li>bad proxy server settings,</li>"
-                                                  "<li>target destination outage,</li>"
-                                                  "<li>many other things.</li>"
-                                                  "</ul>"),
-                                               QDateTime::currentDateTime().toString(Qt::DefaultLocaleShortDate))));
-  */
-}
-
-void WebView::popupContextMenu(const QPoint &pos) {  
-  page()->createStandardContextMenu()->exec(mapToGlobal(pos));
-}
-
 void WebView::printCurrentPage() {
   QScopedPointer<QPrintPreviewDialog> print_preview(new QPrintPreviewDialog(this));
   connect(print_preview.data(), SIGNAL(paintRequested(QPrinter*)), this, SLOT(print(QPrinter*)));
@@ -274,30 +237,12 @@ void WebView::downloadLink(const QNetworkRequest &request) {
 }
 
 void WebView::mousePressEvent(QMouseEvent *event) {
-  // TODO: TODO
-  /*if (event->button() & Qt::LeftButton && event->modifiers() & Qt::ControlModifier) {
-    QWebHitTestResult hit_result = page()->mainFrame()->hitTestContent(event->pos());
-
-    // Check if user clicked with middle mouse button on some
-    // hyperlink.
-    const QUrl link_url = hit_result.linkUrl();
-    const QUrl image_url = hit_result.imageUrl();
-
-    if (link_url.isValid()) {
-      emit linkMiddleClicked(link_url);
-      return;
-    }
-    else if (image_url.isValid()) {
-      emit linkMiddleClicked(image_url);
-      return;
-    }
-  }
-  else */if (event->button() & Qt::MiddleButton) {
+  if (event->button() & Qt::MiddleButton) {
     m_gestureOrigin = event->pos();
-    return;
   }
-
-  QWebEngineView::mousePressEvent(event);
+  else {
+    QWebEngineView::mousePressEvent(event);
+  }
 }
 
 void WebView::mouseReleaseEvent(QMouseEvent *event) {
@@ -330,6 +275,10 @@ void WebView::mouseReleaseEvent(QMouseEvent *event) {
   QWebEngineView::mouseReleaseEvent(event);
 }
 
+void WebView::contextMenuEvent(QContextMenuEvent *event) {
+  QWebEngineView::contextMenuEvent(event);
+}
+
 void WebView::wheelEvent(QWheelEvent *event) {
   if (event->modifiers() & Qt::ControlModifier) {
     if (event->delta() > 0) {
diff --git a/src/network-web/webview.h b/src/network-web/webview.h
index 1630f179b..394528bec 100755
--- a/src/network-web/webview.h
+++ b/src/network-web/webview.h
@@ -57,9 +57,6 @@ class WebView : public QWebEngineView {
     bool decreaseWebPageZoom();
     bool resetWebPageZoom();
 
-    // Executes if loading of any page is done.
-    void onLoadFinished(bool ok);
-
     void copySelectedText();
     void openLinkInNewTab();
     void openLinkExternally();
@@ -68,9 +65,6 @@ class WebView : public QWebEngineView {
     void saveCurrentPageToFile();
     void printCurrentPage();
 
-    // Provides custom context menu.
-    void popupContextMenu(const QPoint &pos);
-
   private slots:
     void downloadLink(const QNetworkRequest &request);
 
@@ -83,9 +77,6 @@ class WebView : public QWebEngineView {
     // Creates necessary connections.
     void createConnections();
 
-    // Displays custom error page.
-    void displayErrorPage();
-
     // Customize mouse wheeling.
     void wheelEvent(QWheelEvent *event);
 
@@ -93,10 +84,11 @@ class WebView : public QWebEngineView {
     void mousePressEvent(QMouseEvent *event);
     void mouseReleaseEvent(QMouseEvent *event);
 
+    void contextMenuEvent(QContextMenuEvent *event);
+
   private:
     WebPage *m_page;
 
-    QAction *m_actionReload;
     QAction *m_actionPrint;
     QAction *m_actionCopySelectedItem;
     QAction *m_actionCopyLink;

From b87efa1cf062f94379bca7aa7a0bc956725e3af1 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 30 Mar 2016 07:08:27 +0200
Subject: [PATCH 09/31] Enforced minimal Qt version.

---
 CMakeLists.txt | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 734b2c161..f095e5730 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -70,7 +70,7 @@ set(APP_URL_ISSUES_NEW_GITHUB "https://github.com/martinrotter/rssguard/issues/n
 set(APP_URL_ISSUES_NEW_BITBUCKET "http://bitbucket.org/skunkos/rssguard/issues/new")
 set(APP_URL_WIKI "https://bitbucket.org/skunkos/rssguard/wiki/Home")
 set(APP_EMAIL "rotter.martinos@gmail.com")
-set(MINIMUM_QT_VERSION 5.6)
+set(MINIMUM_QT_VERSION 5.6.0)
 set(EXE_NAME ${APP_LOW_NAME})
 
 if(APPLE)
@@ -228,6 +228,12 @@ else(UNIX)
   find_package(Qt5 REQUIRED Sql WebEngineCore WebEngineWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
 endif(UNIX)
 
+message(STATUS "[${APP_LOW_NAME}] Found Qt version: '${Qt5_VERSION}'.")
+
+if(Qt5_VERSION VERSION_LESS MINIMUM_QT_VERSION)
+  message(FATAL_ERROR "[${APP_LOW_NAME}] Installed Qt has lower version than needed. You need at least '${MINIMUM_QT_VERSION}'.")
+endif(Qt5_VERSION VERSION_LESS MINIMUM_QT_VERSION)
+
 # Configure QStringBuilder behavior.
 message(STATUS "[${APP_LOW_NAME}] Enabling fast QString concatenation.")
 

From 3682c2061170c86387516d36051735698afcafb1 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Wed, 30 Mar 2016 13:28:06 +0200
Subject: [PATCH 10/31] Work on web engine. It SUXX. I will abandon internal
 web browser completely. User would have to rely on external web browser
 setup.

---
 src/core/messagesproxymodel.cpp     | 5 +----
 src/main.cpp                        | 5 ++++-
 src/miscellaneous/application.h     | 6 +++---
 src/miscellaneous/iofactory.cpp     | 4 ++--
 src/miscellaneous/iofactory.h       | 3 +--
 src/miscellaneous/settings.cpp      | 4 ++--
 src/network-web/downloadmanager.cpp | 5 +++++
 src/network-web/downloadmanager.h   | 2 ++
 src/network-web/webview.cpp         | 8 --------
 src/network-web/webview.h           | 3 ---
 10 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/src/core/messagesproxymodel.cpp b/src/core/messagesproxymodel.cpp
index 26e4dd6a6..4954a75f7 100755
--- a/src/core/messagesproxymodel.cpp
+++ b/src/core/messagesproxymodel.cpp
@@ -70,13 +70,10 @@ QModelIndex MessagesProxyModel::getNextUnreadItemIndex(int default_row, int max_
 }
 
 bool MessagesProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const {
-  // FIXME: V případě hodně položke je to pomalé.
-  // V případě, že do messagelistu budu zobrazovat řekněme
-  // více než 4 000 zpráv, tak tady vracet automaticky false,
-  // neprovádět skutečně porovnávání.
   Q_UNUSED(left)
   Q_UNUSED(right)
 
+  // NOTE: Porovnání se provádí již při dotazu v databázi, netřeba řešit zde.
   return false;
 }
 
diff --git a/src/main.cpp b/src/main.cpp
index 6ce6dadfe..fa8510d30 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,6 +36,7 @@
 #include <QTranslator>
 #include <QDebug>
 #include <QTimer>
+#include <QWebEngineProfile>
 
 
 int main(int argc, char *argv[]) {
@@ -96,7 +97,7 @@ int main(int argc, char *argv[]) {
   main_window.setWindowTitle(APP_LONG_NAME);
 
   // Now is a good time to initialize dynamic keyboard shortcuts.
-  DynamicShortcuts::load(qApp->userActions());  
+  DynamicShortcuts::load(qApp->userActions());
 
   // Display main window.
   if (qApp->settings()->value(GROUP(GUI), SETTING(GUI::MainWindowStartsHidden)).toBool() && SystemTrayIcon::isSystemTrayActivated()) {
@@ -133,6 +134,8 @@ int main(int argc, char *argv[]) {
     QTimer::singleShot(STARTUP_UPDATE_DELAY, application.system(), SLOT(checkForUpdatesOnStartup()));
   }
 
+  QObject::connect(QWebEngineProfile::defaultProfile(), SIGNAL(downloadRequested(QWebEngineDownloadItem*)),
+                   qApp->downloadManager(), SLOT(download(QWebEngineDownloadItem*)));
 
   // Enter global event loop.
   return Application::exec();
diff --git a/src/miscellaneous/application.h b/src/miscellaneous/application.h
index fe03129f9..7e28be5fe 100755
--- a/src/miscellaneous/application.h
+++ b/src/miscellaneous/application.h
@@ -131,15 +131,15 @@ class Application : public QtSingleApplication {
     }
 
     inline QString tempFolderPath() {
-      return IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::TempLocation);
+      return IOFactory::getSystemFolder(QStandardPaths::TempLocation);
     }
 
     inline QString documentsFolderPath() {
-      return IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::DocumentsLocation);
+      return IOFactory::getSystemFolder(QStandardPaths::DocumentsLocation);
     }
 
     inline QString homeFolderPath() {
-      return IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::HomeLocation);
+      return IOFactory::getSystemFolder(QStandardPaths::HomeLocation);
     }
 
     void backupDatabaseSettings(bool backup_database, bool backup_settings,
diff --git a/src/miscellaneous/iofactory.cpp b/src/miscellaneous/iofactory.cpp
index ee623378c..398cc0ce4 100755
--- a/src/miscellaneous/iofactory.cpp
+++ b/src/miscellaneous/iofactory.cpp
@@ -30,8 +30,8 @@
 IOFactory::IOFactory() {
 }
 
-QString IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::StandardLocation location) {
-  return SYSTEM_FOLDER_ENUM::writableLocation(location);
+QString IOFactory::getSystemFolder(QStandardPaths::StandardLocation location) {
+  return QStandardPaths::writableLocation(location);
 }
 
 QString IOFactory::ensureUniqueFilename(const QString &name, const QString &append_format) {
diff --git a/src/miscellaneous/iofactory.h b/src/miscellaneous/iofactory.h
index f99337b61..59b5f1f79 100755
--- a/src/miscellaneous/iofactory.h
+++ b/src/miscellaneous/iofactory.h
@@ -23,7 +23,6 @@
 #include "definitions/definitions.h"
 
 #include <QStandardPaths>
-#define SYSTEM_FOLDER_ENUM QStandardPaths
 
 
 class IOFactory {
@@ -34,7 +33,7 @@ class IOFactory {
 
   public:   
     // Returns system-wide folder according to type.
-    static QString getSystemFolder(SYSTEM_FOLDER_ENUM::StandardLocation location);
+    static QString getSystemFolder(QStandardPaths::StandardLocation location);
 
     // Checks given file if it exists and if it does, then generates non-existing new file
     // according to format.
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index 9022f3a78..4ab375556 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -181,13 +181,13 @@ DKEY Downloads::AlwaysPromptForFilename               = "prompt_for_filename";
 DVALUE(bool) Downloads::AlwaysPromptForFilenameDef    = false;
 
 DKEY Downloads::TargetDirectory                       = "target_directory";
-DVALUE(QString) Downloads::TargetDirectoryDef         = IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::DesktopLocation);
+DVALUE(QString) Downloads::TargetDirectoryDef         = IOFactory::getSystemFolder(QStandardPaths::DesktopLocation);
 
 DKEY Downloads::RemovePolicy             = "remove_policy";
 DVALUE(int) Downloads::RemovePolicyDef   = DownloadManager::Never;
 
 DKEY Downloads::TargetExplicitDirectory                  = "target_explicit_directory";
-DVALUE(QString) Downloads::TargetExplicitDirectoryDef    = IOFactory::getSystemFolder(SYSTEM_FOLDER_ENUM::DesktopLocation);
+DVALUE(QString) Downloads::TargetExplicitDirectoryDef    = IOFactory::getSystemFolder(QStandardPaths::DesktopLocation);
 
 DKEY Downloads::ShowDownloadsWhenNewDownloadStarts = "show_downloads_on_new_download_start";
 DVALUE(bool) Downloads::ShowDownloadsWhenNewDownloadStartsDef = true;
diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp
index 8f35a3047..4d57b606b 100755
--- a/src/network-web/downloadmanager.cpp
+++ b/src/network-web/downloadmanager.cpp
@@ -39,6 +39,7 @@
 #include <QSettings>
 #include <QDebug>
 #include <QWebEngineSettings>
+#include <QWebEngineDownloadItem>
 
 
 DownloadItem::DownloadItem(bool is_direct_download, QNetworkReply *reply, QWidget *parent) : QWidget(parent),
@@ -512,6 +513,10 @@ void DownloadManager::download(const QUrl &url, bool direct_download) {
   download(QNetworkRequest(url), direct_download);
 }
 
+void DownloadManager::download(QWebEngineDownloadItem *down) {
+  download(down->url(), true);
+}
+
 void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool direct_download) {
   if (reply == NULL || reply->url().isEmpty()) {
     return;
diff --git a/src/network-web/downloadmanager.h b/src/network-web/downloadmanager.h
index 737bff142..75a1af274 100755
--- a/src/network-web/downloadmanager.h
+++ b/src/network-web/downloadmanager.h
@@ -32,6 +32,7 @@ class AutoSaver;
 class DownloadModel;
 class QFileIconProvider;
 class QMimeData;
+class QWebEngineDownloadItem;
 
 class DownloadItem : public QWidget {
     Q_OBJECT
@@ -127,6 +128,7 @@ class DownloadManager : public TabContent {
   public slots:
     void download(const QNetworkRequest &request, bool direct_download = false);
     void download(const QUrl &url, bool direct_download = false);
+    void download(QWebEngineDownloadItem *down);
     void handleUnsupportedContent(QNetworkReply *reply, bool direct_download = false);
     void cleanup();
 
diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp
index 4da6d6412..b967c79a3 100755
--- a/src/network-web/webview.cpp
+++ b/src/network-web/webview.cpp
@@ -136,10 +136,6 @@ void WebView::saveCurrentPageToFile() {
 }
 
 void WebView::createConnections() {
-  connect(this, SIGNAL(loadFinished(bool)), this, SLOT(onLoadFinished(bool)));
-  connect(this, SIGNAL(customContextMenuRequested(QPoint)), this, SLOT(popupContextMenu(QPoint)));
-  connect(page(), SIGNAL(downloadRequested(QNetworkRequest)), this, SLOT(downloadLink(QNetworkRequest)));
-
   connect(m_actionSavePageAs, SIGNAL(triggered()), this, SLOT(saveCurrentPageToFile()));
   connect(m_actionPrint, SIGNAL(triggered()), this, SLOT(printCurrentPage()));
   connect(m_actionOpenLinkNewTab, SIGNAL(triggered()), this, SLOT(openLinkInNewTab()));
@@ -232,10 +228,6 @@ void WebView::printCurrentPage() {
   print_preview.data()->exec();
 }
 
-void WebView::downloadLink(const QNetworkRequest &request) {
-  qApp->downloadManager()->download(request);
-}
-
 void WebView::mousePressEvent(QMouseEvent *event) {
   if (event->button() & Qt::MiddleButton) {
     m_gestureOrigin = event->pos();
diff --git a/src/network-web/webview.h b/src/network-web/webview.h
index 394528bec..ae5a06b9f 100755
--- a/src/network-web/webview.h
+++ b/src/network-web/webview.h
@@ -65,9 +65,6 @@ class WebView : public QWebEngineView {
     void saveCurrentPageToFile();
     void printCurrentPage();
 
-  private slots:
-    void downloadLink(const QNetworkRequest &request);
-
   protected:
     // Initializes all actions.
     void initializeActions();

From cd6ec970fa712e7d6b62a9513b8b2616e657c748 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 07:16:21 +0200
Subject: [PATCH 11/31] Removed fancy notifications.

---
 resources/text/CHANGELOG               |   9 +-
 src/gui/dialogs/formsettings.cpp       |  38 +++--
 src/gui/dialogs/formsettings.h         |   1 -
 src/gui/dialogs/formsettings.ui        | 143 +++---------------
 src/gui/notifications/notification.cpp | 192 ++-----------------------
 src/gui/notifications/notification.h   |  33 +----
 src/main.cpp                           |   1 +
 src/miscellaneous/application.cpp      |   2 +-
 src/miscellaneous/settings.cpp         |   6 -
 src/miscellaneous/settings.h           |   6 -
 src/network-web/downloadmanager.cpp    |   2 +-
 11 files changed, 53 insertions(+), 380 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 097321b3f..a7c9dde09 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -1,11 +1,10 @@
 3.1.1
 —————
 
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-PLEASE, FILL THIS SURVEY.
+Main:
 
-http://goo.gl/forms/GcvPYgS2a8
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+▪ Internal web browser and message preview window now use component based on Chromium/Blink (QtWebEngine).
+▪ RSS Guard now uses only Qt 5.6 or higher.
 
 Added:
 
@@ -16,6 +15,7 @@ Added:
 
 Fixed:
 
+▪ Download manager now correctly displays download progress/info.
 ▪ When user selects "Save as..." for some file from internal web browser, file selection dialog is always shown. (bug #174)
 ▪ Better detection of MySQL server status. (bug #169)
 ▪ Ordering of messages is now done on SQL server (stands for both MySQL and SQLite). (bug #172)
@@ -27,6 +27,7 @@ Fixed:
 Changed:
 
 ▪ Better performance when recalculating counts of all/unread messages in categories with many feeds.
+▪ Custom notification popup window is now removed, it was buggy on Windows 10. Windows 10 offers good built-in alternative. On Linux, we rely on D-Bus notifications.
 
 3.1.0
 —————
diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp
index 6fd996193..490dea5d4 100755
--- a/src/gui/dialogs/formsettings.cpp
+++ b/src/gui/dialogs/formsettings.cpp
@@ -119,7 +119,12 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
   connect(m_ui->m_cmbDatabaseDriver, SIGNAL(currentIndexChanged(int)), this, SLOT(selectSqlBackend(int)));
   connect(m_ui->m_btnDownloadsTargetDirectory, SIGNAL(clicked()), this, SLOT(selectDownloadsDirectory()));
   connect(m_ui->m_checkMysqlShowPassword, SIGNAL(toggled(bool)), this, SLOT(switchMysqlPasswordVisiblity(bool)));
-  connect(m_ui->m_btnChangeNotificationColor, SIGNAL(clicked()), this, SLOT(selectNewNotificationColor()));
+
+  connect(m_ui->m_checkEnableNotifications, &QCheckBox::toggled, [=](bool checked) {
+    if (!checked) {
+      m_ui->m_checkEnableDBusNotifications->setChecked(false);
+    }
+  });
 
   // Load all settings.
   loadGeneral();
@@ -152,14 +157,6 @@ void FormSettings::onSkinSelected(QTreeWidgetItem *current, QTreeWidgetItem *pre
   }
 }
 
-void FormSettings::selectNewNotificationColor() {
-  QColorDialog dialog(m_ui->m_lblNotificationColor->color(), this);
-
-  if (dialog.exec() == QDialog::Accepted) {
-    m_ui->m_lblNotificationColor->setColor(dialog.selectedColor());
-  }
-}
-
 void FormSettings::loadDownloads() {
   m_ui->m_checkOpenManagerWhenDownloadStarts->setChecked(m_settings->value(GROUP(Downloads),
                                                                            SETTING(Downloads::ShowDownloadsWhenNewDownloadStarts)).toBool());
@@ -703,14 +700,14 @@ void FormSettings::loadInterface() {
   m_ui->m_checkHideWhenMinimized->setChecked(m_settings->value(GROUP(GUI), SETTING(GUI::HideMainWindowWhenMinimized)).toBool());
 
   // Load fancy notification settings.
-  m_ui->m_grpNotifications->setChecked(m_settings->value(GROUP(GUI), SETTING(GUI::UseFancyNotifications)).toBool());
-  m_ui->m_cmbNotificationPosition->addItem(tr("Bottom-left corner"), Qt::BottomLeftCorner);
-  m_ui->m_cmbNotificationPosition->addItem(tr("Top-left corner"), Qt::TopLeftCorner);
-  m_ui->m_cmbNotificationPosition->addItem(tr("Bottom-right corner"), Qt::BottomRightCorner);
-  m_ui->m_cmbNotificationPosition->addItem(tr("Top-right corner"), Qt::TopRightCorner);
-  m_ui->m_cmbNotificationPosition->setCurrentIndex(m_ui->m_cmbNotificationPosition->findData(static_cast<Qt::Corner>(m_settings->value(GROUP(GUI), SETTING(GUI::FancyNotificationsPosition)).toInt())));
-  m_ui->m_grpBaseNotifications->setChecked(m_settings->value(GROUP(GUI), SETTING(GUI::EnableNotifications)).toBool());
-  m_ui->m_lblNotificationColor->setColor(m_settings->value(GROUP(GUI), SETTING(GUI::NotificationBackgroundColor)).value<QColor>());
+  m_ui->m_checkEnableNotifications->setChecked(m_settings->value(GROUP(GUI), SETTING(GUI::EnableNotifications)).toBool());
+
+#if defined(Q_OS_LINUX)
+  m_ui->m_checkEnableDBusNotifications->setChecked(m_settings->value(GROUP(GUI), SETTING(GUI::UseFancyNotifications)).toBool());
+#else
+  m_ui->m_checkEnableDBusNotifications->setText(m_ui->m_checkEnableDBusNotifications->text() + tr(" (not available)"));
+  m_ui->m_checkEnableDBusNotifications->setEnabled(false);
+#endif
 
   // Load settings of icon theme.
   const QString current_theme = qApp->icons()->currentIconTheme();
@@ -804,10 +801,8 @@ void FormSettings::saveInterface() {
   m_settings->setValue(GROUP(GUI), GUI::HideMainWindowWhenMinimized, m_ui->m_checkHideWhenMinimized->isChecked());
 
   // Save notifications.
-  m_settings->setValue(GROUP(GUI), GUI::UseFancyNotifications, m_ui->m_grpNotifications->isChecked());
-  m_settings->setValue(GROUP(GUI), GUI::EnableNotifications, m_ui->m_grpBaseNotifications->isChecked());
-  m_settings->setValue(GROUP(GUI), GUI::FancyNotificationsPosition, static_cast<Qt::Corner>(m_ui->m_cmbNotificationPosition->itemData(m_ui->m_cmbNotificationPosition->currentIndex()).toInt()));
-  m_settings->setValue(GROUP(GUI), GUI::NotificationBackgroundColor, m_ui->m_lblNotificationColor->color());
+  m_settings->setValue(GROUP(GUI), GUI::UseFancyNotifications, m_ui->m_checkEnableDBusNotifications->isChecked());
+  m_settings->setValue(GROUP(GUI), GUI::EnableNotifications, m_ui->m_checkEnableNotifications->isChecked());
 
   // Save selected icon theme.
   QString selected_icon_theme = m_ui->m_cmbIconTheme->itemData(m_ui->m_cmbIconTheme->currentIndex()).toString();
@@ -841,7 +836,6 @@ void FormSettings::saveInterface() {
 
   qApp->mainForm()->tabWidget()->checkTabBarVisibility();
   qApp->mainForm()->tabWidget()->feedMessageViewer()->refreshVisualProperties();
-  qApp->notification()->loadSettings();
 }
 
 bool FormSettings::eventFilter(QObject *obj, QEvent *e) {
diff --git a/src/gui/dialogs/formsettings.h b/src/gui/dialogs/formsettings.h
index 5cf478f49..9eb10f7f6 100755
--- a/src/gui/dialogs/formsettings.h
+++ b/src/gui/dialogs/formsettings.h
@@ -62,7 +62,6 @@ class FormSettings : public QDialog {
     void loadInterface();
     void saveInterface();
     void onSkinSelected(QTreeWidgetItem *current, QTreeWidgetItem *previous);
-    void selectNewNotificationColor();
 
     void loadDownloads();
     void saveDownloads();
diff --git a/src/gui/dialogs/formsettings.ui b/src/gui/dialogs/formsettings.ui
index a9f7a2916..3251ff0b8 100755
--- a/src/gui/dialogs/formsettings.ui
+++ b/src/gui/dialogs/formsettings.ui
@@ -88,7 +88,7 @@
    <item row="0" column="1">
     <widget class="QStackedWidget" name="m_stackedSettings">
      <property name="currentIndex">
-      <number>0</number>
+      <number>3</number>
      </property>
      <widget class="QWidget" name="m_pageGeneral">
       <layout class="QFormLayout" name="formLayout_5">
@@ -470,7 +470,7 @@ Authors of this application are NOT responsible for lost data.</string>
           <enum>QTabWidget::North</enum>
          </property>
          <property name="currentIndex">
-          <number>0</number>
+          <number>1</number>
          </property>
          <widget class="QWidget" name="m_tabIconSkin">
           <attribute name="title">
@@ -613,7 +613,14 @@ Authors of this application are NOT responsible for lost data.</string>
            <string>Tray area &amp;&amp; notifications</string>
           </attribute>
           <layout class="QFormLayout" name="formLayout_3">
-           <item row="1" column="0" colspan="2">
+           <item row="0" column="0">
+            <widget class="QCheckBox" name="m_checkEnableNotifications">
+             <property name="text">
+              <string>Enable notifications</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="0" colspan="2">
             <widget class="QGroupBox" name="m_grpTray">
              <property name="title">
               <string>Tray icon</string>
@@ -642,79 +649,14 @@ Authors of this application are NOT responsible for lost data.</string>
              </layout>
             </widget>
            </item>
-           <item row="0" column="0" colspan="2">
-            <widget class="QGroupBox" name="m_grpBaseNotifications">
-             <property name="title">
-              <string>Enable notifications</string>
+           <item row="0" column="1">
+            <widget class="QCheckBox" name="m_checkEnableDBusNotifications">
+             <property name="styleSheet">
+              <string notr="true"/>
              </property>
-             <property name="flat">
-              <bool>false</bool>
+             <property name="text">
+              <string>Enable D-Bus notifications</string>
              </property>
-             <property name="checkable">
-              <bool>true</bool>
-             </property>
-             <layout class="QHBoxLayout" name="horizontalLayout_16">
-              <item>
-               <widget class="QGroupBox" name="m_grpNotifications">
-                <property name="title">
-                 <string>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</string>
-                </property>
-                <property name="checkable">
-                 <bool>true</bool>
-                </property>
-                <layout class="QFormLayout" name="formLayout_23">
-                 <item row="0" column="0">
-                  <widget class="QLabel" name="m_lblNotificationPosition">
-                   <property name="text">
-                    <string>Notification position</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="0" column="1">
-                  <widget class="QComboBox" name="m_cmbNotificationPosition"/>
-                 </item>
-                 <item row="1" column="0">
-                  <widget class="QLabel" name="label_13">
-                   <property name="text">
-                    <string>Background color</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item row="1" column="1">
-                  <layout class="QHBoxLayout" name="horizontalLayout_17">
-                   <item>
-                    <widget class="ColorLabel" name="m_lblNotificationColor">
-                     <property name="text">
-                      <string/>
-                     </property>
-                    </widget>
-                   </item>
-                   <item>
-                    <widget class="QPushButton" name="m_btnChangeNotificationColor">
-                     <property name="text">
-                      <string>Change</string>
-                     </property>
-                    </widget>
-                   </item>
-                   <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>
-                  </layout>
-                 </item>
-                </layout>
-               </widget>
-              </item>
-             </layout>
             </widget>
            </item>
           </layout>
@@ -1667,11 +1609,6 @@ Authors of this application are NOT responsible for lost data.</string>
    <header>toolbareditor.h</header>
    <container>1</container>
   </customwidget>
-  <customwidget>
-   <class>ColorLabel</class>
-   <extends>QLabel</extends>
-   <header>colorlabel.h</header>
-  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m_cmbDatabaseDriver</tabstop>
@@ -1811,38 +1748,6 @@ Authors of this application are NOT responsible for lost data.</string>
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>m_grpNotifications</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_lblNotificationPosition</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>625</x>
-     <y>77</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>326</x>
-     <y>84</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>m_grpNotifications</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_cmbNotificationPosition</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>625</x>
-     <y>77</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>696</x>
-     <y>84</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>m_rbDownloadsAskEachFile</sender>
    <signal>toggled(bool)</signal>
@@ -1859,21 +1764,5 @@ Authors of this application are NOT responsible for lost data.</string>
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>m_grpBaseNotifications</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_grpNotifications</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>624</x>
-     <y>82</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>624</x>
-     <y>89</y>
-    </hint>
-   </hints>
-  </connection>
  </connections>
 </ui>
diff --git a/src/gui/notifications/notification.cpp b/src/gui/notifications/notification.cpp
index 63c2094c3..c79752c62 100755
--- a/src/gui/notifications/notification.cpp
+++ b/src/gui/notifications/notification.cpp
@@ -24,23 +24,15 @@
 #include "miscellaneous/textfactory.h"
 
 #include <QApplication>
-#include <QDesktopWidget>
-#include <QGraphicsDropShadowEffect>
-#include <QPainter>
 #include <QTimer>
 
-#if defined(Q_OS_MAC)
-#include <Carbon/Carbon.h>
-#endif
-
 #if defined(Q_OS_LINUX)
 #include <QtDBus>
 #endif
 
 
-Notification::Notification() : QWidget(0), m_title(QString()), m_text(QString()), m_icon(QPixmap()), m_screen(-1),
-  m_width(-1), m_height(-1), m_padding(5), m_widgetMargin(2 * m_padding), m_timerId(0), m_clickTarget(NULL),
-  m_clickSlot(NULL) {
+Notification::Notification(QObject *parent) : QObject(parent), m_title(QString()), m_text(QString()), m_icon(QPixmap()),
+  m_timerId(0), m_clickTarget(NULL), m_clickSlot(NULL) {
 
 #if defined(Q_OS_LINUX)
   m_dBusActiveNotification = 0;
@@ -62,16 +54,13 @@ Notification::Notification() : QWidget(0), m_title(QString()), m_text(QString())
     }
   }
 #endif
-
-  setupWidget();
-  loadSettings();
 }
 
 Notification::~Notification() {
   qDebug("Destroying Notification instance.");
 }
 
-bool Notification::areFancyNotificationsEnabled() {
+bool Notification::areDBusNotificationsEnabled() {
   return qApp->settings()->value(GROUP(GUI), SETTING(GUI::UseFancyNotifications)).toBool();
 }
 
@@ -118,17 +107,7 @@ void Notification::notify(const QString &text, const QString &title, const QIcon
   }
 #endif
 
-  if (m_clickTarget != NULL && m_clickSlot != NULL) {
-    // Connect invokation target.
-    connect(this, SIGNAL(clicked()), m_clickTarget, m_clickSlot, Qt::QueuedConnection);
-  }
-
   // Show it.
-  updateGeometries();
-
-  QTimer::singleShot(20, this, SLOT(show()));
-  QTimer::singleShot(0, this, SLOT(repaint()));
-
   m_timerId = startTimer(TRAY_ICON_BUBBLE_TIMEOUT);
 }
 
@@ -138,13 +117,6 @@ void Notification::notify(const QString &text, const QString &title, QSystemTray
 }
 
 void Notification::cancel() {
-  hide();
-
-  if (m_clickTarget != NULL && m_clickSlot != NULL) {
-    // Disconnect previous bubble click signalling.
-    disconnect(this, SIGNAL(clicked()), m_clickTarget, m_clickSlot);
-  }
-
   m_clickSlot = NULL;
   m_clickTarget = NULL;
 
@@ -153,6 +125,11 @@ void Notification::cancel() {
   }
 }
 
+void Notification::timerEvent(QTimerEvent *event) {
+  QObject::timerEvent(event);
+  cancel();
+}
+
 #if defined(Q_OS_LINUX)
 void Notification::notificationClosed(uint id, uint reason) {
   if (m_clickTarget != NULL && m_clickSlot != NULL && m_dBusActiveNotification == id && reason == 2) {
@@ -160,156 +137,3 @@ void Notification::notificationClosed(uint id, uint reason) {
   }
 }
 #endif
-
-void Notification::updateGeometries() {
-  // Calculate width and height of notification with given icon and text.
-  QFont bold_font = font();
-  bold_font.setBold(true);
-  QFontMetrics bold_metrics(bold_font);
-
-  m_width = m_padding +
-            m_icon.width() + m_padding + /* contents */ qMax(TextFactory::stringWidth(m_title, bold_metrics),
-                                                             TextFactory::stringWidth(m_text, fontMetrics())) +
-            m_padding;
-  m_height = m_padding +
-             /* contents */
-             qMax(m_icon.height(),
-                  TextFactory::stringHeight(m_title, bold_metrics) + m_padding + TextFactory::stringHeight(m_text, fontMetrics())) +
-             m_padding;
-
-  // Calculate real position.
-  int x, y;
-  QRect screen_geometry = QApplication::desktop()->availableGeometry(m_screen);
-
-  switch (m_position) {
-    case Qt::BottomLeftCorner:
-      x = m_widgetMargin;
-      y = screen_geometry.height() - m_widgetMargin - m_height;
-      break;
-
-    case Qt::TopLeftCorner:
-      x = m_widgetMargin;
-      y = m_widgetMargin;
-      break;
-
-    case Qt::TopRightCorner:
-      x = screen_geometry.width() - m_widgetMargin - m_width;
-      y = m_widgetMargin;
-      break;
-
-    case Qt::BottomRightCorner:
-    default:
-      x = screen_geometry.width() - m_widgetMargin - m_width;
-      y = screen_geometry.height() - m_widgetMargin - m_height;
-      break;
-  }
-
-  setGeometry(x, y, m_width, m_height);
-}
-
-void Notification::paintEvent(QPaintEvent *event) {
-  Q_UNUSED(event)
-
-  QPainter painter(this);
-  painter.setFont(font());
-
-  if (!underMouse()) {
-    painter.setOpacity(0.88);
-  }
-  else {
-    painter.setOpacity(0.97);
-  }
-
-  // Draw background.
-  painter.setRenderHints(QPainter::HighQualityAntialiasing | QPainter::Qt4CompatiblePainting);
-  painter.setBrush(m_backgroundColor);
-
-  painter.setPen(Qt::NoPen);
-  painter.drawRoundedRect(0, 0, width(), height(), 5.0, 5.0);
-
-  // Draw icon.
-  painter.drawPixmap(m_padding, m_padding, m_icon);
-
-  // Draw text.
-  painter.setPen(Qt::black);
-
-  // Needed heighs/widths.
-  int title_height = TextFactory::stringHeight(m_title, fontMetrics());
-  int remaining_width = width() - m_padding - m_icon.width() - m_padding /* - here comes contents */ - m_padding;
-  int remaining_height = height() - m_padding - title_height - m_padding /* - here comes contents */ - m_padding;
-
-  painter.drawText(m_padding + m_icon.width() + m_padding, m_padding + title_height + m_padding,
-                   remaining_width, remaining_height,
-                   Qt::AlignLeft, m_text);
-
-  // Draw heading.
-  QFont font = painter.font();
-  font.setBold(true);
-  painter.setFont(font);
-
-  painter.drawText(m_padding + m_icon.width() + m_padding, m_padding,
-                   remaining_width, remaining_height,
-                   Qt::AlignHCenter | Qt::AlignTop, m_title);
-}
-
-void Notification::mousePressEvent(QMouseEvent *event) {
-  QWidget::mousePressEvent(event);
-  emit clicked();
-  cancel();
-}
-
-void Notification::enterEvent(QEvent *event) {
-  QWidget::enterEvent(event);
-  repaint();
-}
-
-void Notification::leaveEvent(QEvent *event) {
-  QWidget::leaveEvent(event);
-  repaint();
-}
-
-void Notification::timerEvent(QTimerEvent *event) {
-  QWidget::timerEvent(event);
-  cancel();
-}
-
-void Notification::loadSettings() {
-  m_position = static_cast<Qt::Corner>(qApp->settings()->value(GROUP(GUI), SETTING(GUI::FancyNotificationsPosition)).toInt());
-  m_backgroundColor = qApp->settings()->value(GROUP(GUI), SETTING(GUI::NotificationBackgroundColor)).value<QColor>();
-}
-
-void Notification::setupWidget() {
-  // Set window flags.
-  Qt::WindowFlags window_flags = Qt::FramelessWindowHint | Qt::WindowSystemMenuHint |
-                                 Qt::WindowStaysOnTopHint | Qt::X11BypassWindowManagerHint;
-
-  window_flags |= Qt::WindowDoesNotAcceptFocus;
-
-#if defined (Q_OS_MAC)
-  window_flags |= Qt::SubWindow;
-#else
-  window_flags |= Qt::Tool;
-#endif
-
-  setWindowFlags(window_flags);
-
-  // Set widget attributes.
-  setAttribute(Qt::WA_TranslucentBackground);
-  setAttribute(Qt::WA_X11DoNotAcceptFocus);
-  setAttribute(Qt::WA_ShowWithoutActivating);
-
-#if defined (Q_OS_MAC)
-  winId();
-
-  int setAttr[] = {kHIWindowBitDoesNotHide, kHIWindowBitDoesNotCycle, kHIWindowBitNoShadow, 0};
-  int clearAttr[] = {0};
-  HIWindowChangeAttributes(qt_mac_window_for(this), setAttr, clearAttr);
-#endif
-
-  // Window will be meant to be on top, but should not steal focus.
-  setFocusPolicy(Qt::NoFocus);
-
-  QFont fon(font());
-  fon.setPointSize(fon.pointSize() + 5);
-  setFont(fon);
-}
diff --git a/src/gui/notifications/notification.h b/src/gui/notifications/notification.h
index 03de73b3f..31ccad05a 100755
--- a/src/gui/notifications/notification.h
+++ b/src/gui/notifications/notification.h
@@ -18,7 +18,7 @@
 #ifndef NOTIFICATION_H
 #define NOTIFICATION_H
 
-#include <QWidget>
+#include <QObject>
 
 #include <QSystemTrayIcon>
 
@@ -27,15 +27,16 @@
 class QDBusInterface;
 #endif
 
-class Notification : public QWidget {
+// Wraps D-Bus notifications.
+class Notification : public QObject {
     Q_OBJECT
 
   public:
     // Constructors.
-    explicit Notification();
+    explicit Notification(QObject *parent = 0);
     virtual ~Notification();
 
-    static bool areFancyNotificationsEnabled();
+    static bool areDBusNotificationsEnabled();
     static bool areNotificationsEnabled();
 
   public slots:
@@ -48,42 +49,18 @@ class Notification : public QWidget {
     // Cancels display of the notification.
     void cancel();
 
-    // Loads settings.
-    void loadSettings();
-
 #if defined(Q_OS_LINUX)
   public slots:
     void notificationClosed(uint id, uint reason);
 #endif
 
   protected:
-    void paintEvent(QPaintEvent *event);
-    void mousePressEvent(QMouseEvent *event);
-    void enterEvent(QEvent *event);
-    void leaveEvent(QEvent *event);
     void timerEvent(QTimerEvent *event);
 
-  signals:
-    void clicked();
-
   private:
-    void setupWidget();
-    void updateGeometries();
-
-    QColor m_backgroundColor;
     QString m_title;
     QString m_text;
     QPixmap m_icon;
-
-    // Defaults to -1, which means "default" (primary) screen.
-    int m_screen;
-    Qt::Corner m_position;
-
-    // Is calculated according to contents.
-    int m_width;
-    int m_height;
-    int m_padding;
-    int m_widgetMargin;
     int m_timerId;
 
     QObject *m_clickTarget;
diff --git a/src/main.cpp b/src/main.cpp
index fa8510d30..7eb6c2317 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -134,6 +134,7 @@ int main(int argc, char *argv[]) {
     QTimer::singleShot(STARTUP_UPDATE_DELAY, application.system(), SLOT(checkForUpdatesOnStartup()));
   }
 
+  // Make sure that all download requests from web views are handled.
   QObject::connect(QWebEngineProfile::defaultProfile(), SIGNAL(downloadRequested(QWebEngineDownloadItem*)),
                    qApp->downloadManager(), SLOT(download(QWebEngineDownloadItem*)));
 
diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp
index 6848fbddb..98dd4c525 100755
--- a/src/miscellaneous/application.cpp
+++ b/src/miscellaneous/application.cpp
@@ -219,7 +219,7 @@ void Application::showGuiMessage(const QString &title, const QString &message,
                                  bool show_at_least_msgbox, const QIcon &custom_icon,
                                  QObject *invokation_target, const char *invokation_slot) {
   if (Notification::areNotificationsEnabled()) {
-    if (Notification::areFancyNotificationsEnabled()) {
+    if (Notification::areDBusNotificationsEnabled()) {
       // Show OSD instead if tray icon bubble, depending on settings.
       if (custom_icon.isNull()) {
         notification()->notify(message, title, message_type, invokation_target, invokation_slot);
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index 4ab375556..ebbdaf032 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -75,9 +75,6 @@ DVALUE(char*) GUI::SplitterFeedsDef               = "";
 DKEY GUI::SplitterMessages                        = "splitter_messages";
 DVALUE(char*) GUI::SplitterMessagesDef            = "";
 
-DKEY GUI::NotificationBackgroundColor               = "notification_background_color";
-DVALUE(QColor) GUI::NotificationBackgroundColorDef  = QColor(220, 220, 220);
-
 DKEY GUI::ToolbarStyle                            = "toolbar_style";
 DVALUE(Qt::ToolButtonStyle) GUI::ToolbarStyleDef  = Qt::ToolButtonIconOnly;
 
@@ -123,9 +120,6 @@ DVALUE(bool) GUI::EnableNotificationsDef        = true;
 DKEY GUI::UseFancyNotifications                         = "use_fancy_notifications";
 DVALUE(bool) GUI::UseFancyNotificationsDef              = true;
 
-DKEY GUI::FancyNotificationsPosition                    = "fancy_notifications_position";
-DVALUE(Qt::Corner) GUI::FancyNotificationsPositionDef   = Qt::BottomRightCorner;
-
 DKEY GUI::TabCloseMiddleClick                  = "tab_close_mid_button";
 DVALUE(bool) GUI::TabCloseMiddleClickDef       = true;
 
diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h
index 022a32bf6..8413c21bf 100755
--- a/src/miscellaneous/settings.h
+++ b/src/miscellaneous/settings.h
@@ -92,9 +92,6 @@ namespace GUI {
   KEY SplitterMessages;
   VALUE(char*) SplitterMessagesDef;
 
-  KEY NotificationBackgroundColor;
-  VALUE(QColor) NotificationBackgroundColorDef;
-
   KEY ToolbarStyle;
   VALUE(Qt::ToolButtonStyle) ToolbarStyleDef;
 
@@ -140,9 +137,6 @@ namespace GUI {
   KEY UseFancyNotifications;
   VALUE(bool) UseFancyNotificationsDef;
 
-  KEY FancyNotificationsPosition;
-  VALUE(Qt::Corner) FancyNotificationsPositionDef;
-
   KEY TabCloseMiddleClick;
   VALUE(bool) TabCloseMiddleClickDef;
 
diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp
index 4d57b606b..d3915c630 100755
--- a/src/network-web/downloadmanager.cpp
+++ b/src/network-web/downloadmanager.cpp
@@ -320,7 +320,7 @@ void DownloadItem::metaDataChanged() {
 void DownloadItem::downloadProgress(qint64 bytes_received, qint64 bytes_total) {
   QTime now = QTime::currentTime();
 
-  if (m_lastProgressTime.msecsTo(now) < 25) {
+  if (m_lastProgressTime.isValid() && m_lastProgressTime.msecsTo(now) < 25) {
     return;
   }
 

From ae27b79dd9cd12d435a814dcaec51008db00c222 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 07:18:44 +0200
Subject: [PATCH 12/31] Fixed nots call.

---
 src/gui/notifications/notification.cpp | 2 ++
 src/gui/notifications/notification.h   | 2 ++
 src/miscellaneous/application.cpp      | 7 +++++++
 3 files changed, 11 insertions(+)

diff --git a/src/gui/notifications/notification.cpp b/src/gui/notifications/notification.cpp
index c79752c62..d1b0209e2 100755
--- a/src/gui/notifications/notification.cpp
+++ b/src/gui/notifications/notification.cpp
@@ -60,9 +60,11 @@ Notification::~Notification() {
   qDebug("Destroying Notification instance.");
 }
 
+#if defined(Q_OS_LINUX)
 bool Notification::areDBusNotificationsEnabled() {
   return qApp->settings()->value(GROUP(GUI), SETTING(GUI::UseFancyNotifications)).toBool();
 }
+#endif
 
 bool Notification::areNotificationsEnabled() {
   return qApp->settings()->value(GROUP(GUI), SETTING(GUI::EnableNotifications)).toBool();
diff --git a/src/gui/notifications/notification.h b/src/gui/notifications/notification.h
index 31ccad05a..7ff71f206 100755
--- a/src/gui/notifications/notification.h
+++ b/src/gui/notifications/notification.h
@@ -36,7 +36,9 @@ class Notification : public QObject {
     explicit Notification(QObject *parent = 0);
     virtual ~Notification();
 
+#if defined(Q_OS_LINUX)
     static bool areDBusNotificationsEnabled();
+#endif
     static bool areNotificationsEnabled();
 
   public slots:
diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp
index 98dd4c525..4345e886d 100755
--- a/src/miscellaneous/application.cpp
+++ b/src/miscellaneous/application.cpp
@@ -219,6 +219,7 @@ void Application::showGuiMessage(const QString &title, const QString &message,
                                  bool show_at_least_msgbox, const QIcon &custom_icon,
                                  QObject *invokation_target, const char *invokation_slot) {
   if (Notification::areNotificationsEnabled()) {
+#if defined(Q_OS_LINUX)
     if (Notification::areDBusNotificationsEnabled()) {
       // Show OSD instead if tray icon bubble, depending on settings.
       if (custom_icon.isNull()) {
@@ -234,6 +235,12 @@ void Application::showGuiMessage(const QString &title, const QString &message,
       trayIcon()->showMessage(title, message, message_type, TRAY_ICON_BUBBLE_TIMEOUT, invokation_target, invokation_slot);
       return;
     }
+#else
+    if (SystemTrayIcon::isSystemTrayActivated()) {
+      trayIcon()->showMessage(title, message, message_type, TRAY_ICON_BUBBLE_TIMEOUT, invokation_target, invokation_slot);
+      return;
+    }
+#endif
   }
 
   if (show_at_least_msgbox) {

From 4952c3da32bfd09dbeda1286107492f8fa9bbd7e Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 07:25:44 +0200
Subject: [PATCH 13/31] Enhanced download manager progress info once more.

---
 src/network-web/downloadmanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp
index d3915c630..51dfb3ab8 100755
--- a/src/network-web/downloadmanager.cpp
+++ b/src/network-web/downloadmanager.cpp
@@ -404,7 +404,7 @@ void DownloadItem::updateDownloadInfoLabel() {
     }
     else {
       info = tr("%1 of %2 - download completed").arg(DownloadManager::dataString(m_bytesReceived),
-                                                     DownloadManager::dataString(bytes_total));
+                                                     DownloadManager::dataString(m_bytesReceived));
     }
   }
 

From e43a7606c8e224a3141fa160305fc0f5194ea1bc Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 07:41:55 +0200
Subject: [PATCH 14/31] Removed some webengine junk.

---
 resources/text/CHANGELOG         |   2 +-
 src/gui/dialogs/formsettings.cpp |   2 -
 src/gui/dialogs/formsettings.ui  |  33 +----
 src/miscellaneous/settings.cpp   |   3 -
 src/miscellaneous/settings.h     |   3 -
 src/network-web/webbrowser.cpp   |   4 -
 src/network-web/webpage.cpp      |  25 ----
 src/network-web/webpage.h        |  33 -----
 src/network-web/webview.cpp      | 243 +------------------------------
 src/network-web/webview.h        |  57 +-------
 10 files changed, 8 insertions(+), 397 deletions(-)
 delete mode 100755 src/network-web/webpage.cpp
 delete mode 100755 src/network-web/webpage.h

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index a7c9dde09..cde7ce5ea 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -3,7 +3,7 @@
 
 Main:
 
-▪ Internal web browser and message preview window now use component based on Chromium/Blink (QtWebEngine).
+▪ Internal web browser and message preview window now use component based on Chromium/Blink (QtWebEngine). Note that new QtWebEngine lacks some features and those were thus removed from RSS Guard, including Adblock, mouse gestures and some other features. Note that I was force to switch to this component because old Qt WebKit component will be removed from Qt.
 ▪ RSS Guard now uses only Qt 5.6 or higher.
 
 Added:
diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp
index 490dea5d4..3c43fad51 100755
--- a/src/gui/dialogs/formsettings.cpp
+++ b/src/gui/dialogs/formsettings.cpp
@@ -382,7 +382,6 @@ void FormSettings::onProxyTypeChanged(int index) {
 
 void FormSettings::loadBrowser() {
   // Load settings of web browser GUI.
-  m_ui->m_checkMouseGestures->setChecked(m_settings->value(GROUP(Browser), SETTING(Browser::GesturesEnabled)).toBool());
   m_ui->m_checkQueueTabs->setChecked(m_settings->value(GROUP(Browser), SETTING(Browser::QueueTabs)).toBool());
   m_ui->m_cmbExternalBrowserPreset->addItem(tr("Opera 12 or older"), QSL("-nosession %1"));
   m_ui->m_txtExternalBrowserExecutable->setText(m_settings->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserExecutable)).toString());
@@ -403,7 +402,6 @@ void FormSettings::loadBrowser() {
 void FormSettings::saveBrowser() {
   // Save settings of GUI of web browser.
   m_settings->setValue(GROUP(Browser), Browser::CustomExternalBrowserEnabled, m_ui->m_grpCustomExternalBrowser->isChecked());
-  m_settings->setValue(GROUP(Browser), Browser::GesturesEnabled, m_ui->m_checkMouseGestures->isChecked());
   m_settings->setValue(GROUP(Browser), Browser::QueueTabs, m_ui->m_checkQueueTabs->isChecked());
   m_settings->setValue(GROUP(Browser), Browser::CustomExternalBrowserExecutable, m_ui->m_txtExternalBrowserExecutable->text());
   m_settings->setValue(GROUP(Browser), Browser::CustomExternalBrowserArguments, m_ui->m_txtExternalBrowserArguments->text());
diff --git a/src/gui/dialogs/formsettings.ui b/src/gui/dialogs/formsettings.ui
index 3251ff0b8..b958a898d 100755
--- a/src/gui/dialogs/formsettings.ui
+++ b/src/gui/dialogs/formsettings.ui
@@ -88,7 +88,7 @@
    <item row="0" column="1">
     <widget class="QStackedWidget" name="m_stackedSettings">
      <property name="currentIndex">
-      <number>3</number>
+      <number>5</number>
      </property>
      <widget class="QWidget" name="m_pageGeneral">
       <layout class="QFormLayout" name="formLayout_5">
@@ -470,7 +470,7 @@ Authors of this application are NOT responsible for lost data.</string>
           <enum>QTabWidget::North</enum>
          </property>
          <property name="currentIndex">
-          <number>1</number>
+          <number>0</number>
          </property>
          <widget class="QWidget" name="m_tabIconSkin">
           <attribute name="title">
@@ -913,7 +913,7 @@ Authors of this application are NOT responsible for lost data.</string>
            <item row="2" column="0">
             <widget class="QCheckBox" name="m_checkEnablePlugins">
              <property name="text">
-              <string>Enable external plugins based on NPAPI</string>
+              <string>Enable external plugins</string>
              </property>
             </widget>
            </item>
@@ -924,32 +924,6 @@ Authors of this application are NOT responsible for lost data.</string>
              </property>
             </widget>
            </item>
-           <item row="4" column="0" colspan="2">
-            <widget class="QCheckBox" name="m_checkMouseGestures">
-             <property name="text">
-              <string>Enable mouse gestures</string>
-             </property>
-            </widget>
-           </item>
-           <item row="5" column="0" colspan="2">
-            <widget class="QLabel" name="m_lblMouseGestures">
-             <property name="font">
-              <font>
-               <italic>true</italic>
-              </font>
-             </property>
-             <property name="text">
-              <string>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</string>
-             </property>
-             <property name="indent">
-              <number>20</number>
-             </property>
-            </widget>
-           </item>
           </layout>
          </widget>
          <widget class="QWidget" name="m_tabExternalBrowser">
@@ -1639,7 +1613,6 @@ Authors of this application are NOT responsible for lost data.</string>
   <tabstop>m_checkEnableJavascript</tabstop>
   <tabstop>m_checkEnablePlugins</tabstop>
   <tabstop>m_checkAutoLoadImages</tabstop>
-  <tabstop>m_checkMouseGestures</tabstop>
   <tabstop>m_grpCustomExternalBrowser</tabstop>
   <tabstop>m_txtExternalBrowserExecutable</tabstop>
   <tabstop>m_btnExternalBrowserExecutable</tabstop>
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index ebbdaf032..ba4009a54 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -238,9 +238,6 @@ DKEY Keyboard::ID = "keyboard";
 // Web browser.
 DKEY Browser::ID                            = "browser";
 
-DKEY Browser::GesturesEnabled               = "gestures_enabled";
-DVALUE(bool) Browser::GesturesEnabledDef    = true;
-
 DKEY Browser::JavascriptEnabled             = "enable_javascript";
 DVALUE(bool) Browser::JavascriptEnabledDef  = true;
 
diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h
index 8413c21bf..ed5113e8f 100755
--- a/src/miscellaneous/settings.h
+++ b/src/miscellaneous/settings.h
@@ -267,9 +267,6 @@ namespace Keyboard {
 namespace Browser {
   KEY ID;
 
-  KEY GesturesEnabled;
-  VALUE(bool) GesturesEnabledDef;
-
   KEY JavascriptEnabled;
   VALUE(bool) JavascriptEnabledDef;
 
diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp
index cff01a927..cc7078e3a 100755
--- a/src/network-web/webbrowser.cpp
+++ b/src/network-web/webbrowser.cpp
@@ -18,7 +18,6 @@
 #include "network-web/webbrowser.h"
 
 #include "definitions/definitions.h"
-#include "network-web/webpage.h"
 #include "network-web/webview.h"
 #include "network-web/networkfactory.h"
 #include "miscellaneous/skinfactory.h"
@@ -191,8 +190,6 @@ void WebBrowser::createConnections() {
 
   // Connect this WebBrowser to global TabWidget.
   TabWidget *tab_widget = qApp->mainForm()->tabWidget();
-  connect(m_webView, SIGNAL(newTabRequested()), tab_widget, SLOT(addEmptyBrowser()));
-  connect(m_webView, SIGNAL(linkMiddleClicked(QUrl)), tab_widget, SLOT(addLinkedBrowser(QUrl)));
 
   // Change location textbox status according to webpage status.
   connect(m_webView, SIGNAL(loadStarted()), this, SLOT(onLoadingStarted()));
@@ -316,7 +313,6 @@ void WebBrowser::setupIcons() {
   m_actionForward->setIcon(qApp->icons()->fromTheme(QSL("go-next")));
   m_actionReload->setIcon(qApp->icons()->fromTheme(QSL("go-refresh")));
   m_actionStop->setIcon(qApp->icons()->fromTheme(QSL("go-stop")));
-  m_webView->setupIcons();
 }
 
 QIcon WebBrowser::icon() const {
diff --git a/src/network-web/webpage.cpp b/src/network-web/webpage.cpp
deleted file mode 100755
index fc792a383..000000000
--- a/src/network-web/webpage.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/webpage.h"
-
-
-WebPage::WebPage(QObject *parent) : QWebEnginePage(parent) {
-}
-
-WebPage::~WebPage() {
-}
diff --git a/src/network-web/webpage.h b/src/network-web/webpage.h
deleted file mode 100755
index 231c8b3df..000000000
--- a/src/network-web/webpage.h
+++ /dev/null
@@ -1,33 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef WEBPAGE_H
-#define WEBPAGE_H
-
-#include <QWebEnginePage>
-
-
-class WebPage : public QWebEnginePage {
-    Q_OBJECT
-
-  public:
-    // Constructors and destructors.
-    explicit WebPage(QObject *parent = 0);
-    virtual ~WebPage();
-};
-
-#endif // WEBPAGE_H
diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp
index b967c79a3..1ca3663f4 100755
--- a/src/network-web/webview.cpp
+++ b/src/network-web/webview.cpp
@@ -18,259 +18,20 @@
 #include "network-web/webview.h"
 
 #include "definitions/definitions.h"
-#include "miscellaneous/settings.h"
-#include "miscellaneous/skinfactory.h"
-#include "miscellaneous/iconfactory.h"
-#include "miscellaneous/textfactory.h"
-#include "network-web/webpage.h"
-#include "network-web/webfactory.h"
-#include "gui/messagebox.h"
-#include "gui/dialogs/formmain.h"
 
-#include <QStyleOptionFrameV3>
-#include <QAction>
-#include <QMenu>
-#include <QDir>
-#include <QFile>
 #include <QWebEnginePage>
-#include <QContextMenuEvent>
-#include <QDateTime>
-#include <QClipboard>
-#include <QFileDialog>
-#include <QtPrintSupport/QPrintPreviewDialog>
+#include <QWheelEvent>
 
 
 WebView::WebView(QWidget *parent)
-  : QWebEngineView(parent), m_page(new WebPage(this)) {
+  : QWebEngineView(parent), m_page(new QWebEnginePage(this)) {
   setPage(m_page);
-  initializeActions();
-  createConnections();
 }
 
 WebView::~WebView() {
   qDebug("Destroying WebView.");
 }
 
-void WebView::copySelectedText() {
-  Application::clipboard()->setText(selectedText());
-}
-
-void WebView::openLinkInNewTab() {
-  emit linkMiddleClicked(m_contextLinkUrl);
-}
-
-void WebView::openLinkExternally() {
-  WebFactory::instance()->openUrlInExternalBrowser(m_contextLinkUrl.toString());
-}
-
-void WebView::openImageInNewTab() {
-  emit linkMiddleClicked(m_contextImageUrl);
-}
-
-void WebView::searchTextViaGoogle() {
-  emit linkMiddleClicked(QString(GOOGLE_SEARCH_URL).arg((selectedText())));
-}
-
-void WebView::saveCurrentPageToFile() {
-  QString selected_file;
-  const QString implicit_file_base_name = tr("source_page");
-
-  // NOTE: It is good to always ask for destination here, since download manager
-  // is not displaying afterwards because this is *not* real download actually.
-  //if (qApp->settings()->value(GROUP(Downloads), SETTING(Downloads::AlwaysPromptForFilename)).toBool()) {
-  const QString filter_html = tr("HTML web pages (*.html)");
-
-  QString filter;
-  QString selected_filter;
-  const QString filename_for_prompt = qApp->settings()->value(GROUP(Downloads), SETTING(Downloads::TargetExplicitDirectory)).toString() +
-                                      QDir::separator() + implicit_file_base_name + QL1S(".html");
-
-  // Add more filters here.
-  filter += filter_html;
-  selected_file = QFileDialog::getSaveFileName(this, tr("Select destination file for web page"),
-                                               filename_for_prompt, filter, &selected_filter);
-
-  if (!selected_file.isEmpty()) {
-    qApp->settings()->setValue(GROUP(Downloads), Downloads::TargetExplicitDirectory,
-                               QDir::toNativeSeparators(QFileInfo(selected_file).absolutePath()));
-  }
-  /*}
-  else {
-    QString base_folder = qApp->settings()->value(GROUP(Downloads), SETTING(Downloads::TargetDirectory)).toString();
-
-    if (!base_folder.endsWith(QDir::separator())) {
-      base_folder += QDir::separator();
-    }
-
-    selected_file = base_folder + implicit_file_base_name + QL1S(".html");
-
-    if (QFile::exists(selected_file)) {
-      int file_suffix = 0;
-      QString subsequent_file_name;
-
-      do {
-        subsequent_file_name = base_folder + QString(implicit_file_base_name + QL1S("-%1.html")).arg(file_suffix++);
-      } while (QFile::exists(subsequent_file_name));
-
-      selected_file = subsequent_file_name;
-    }
-  }*/
-
-  if (!selected_file.isEmpty()) {
-    page()->toHtml([this, selected_file](const QString &html) {
-      QFile selected_file_handle(selected_file);
-
-      if (selected_file_handle.open(QIODevice::WriteOnly | QIODevice::Unbuffered)) {
-        QTextStream str(&selected_file_handle);
-
-        str.setCodec("UTF-16");
-        str << html;
-        selected_file_handle.close();
-      }
-      else {
-        MessageBox::show(this, QMessageBox::Critical, tr("Cannot save web page"),
-                         tr("Web page cannot be saved because destination file is not writtable."));
-      }
-    });
-  }
-}
-
-void WebView::createConnections() {
-  connect(m_actionSavePageAs, SIGNAL(triggered()), this, SLOT(saveCurrentPageToFile()));
-  connect(m_actionPrint, SIGNAL(triggered()), this, SLOT(printCurrentPage()));
-  connect(m_actionOpenLinkNewTab, SIGNAL(triggered()), this, SLOT(openLinkInNewTab()));
-  connect(m_actionOpenImageNewTab, SIGNAL(triggered()), this, SLOT(openImageInNewTab()));
-  connect(m_actionOpenLinkExternally, SIGNAL(triggered()), this, SLOT(openLinkExternally()));
-  connect(m_actionLookupText, SIGNAL(triggered()), this, SLOT(searchTextViaGoogle()));
-}
-
-void WebView::setupIcons() {
-  m_actionPrint->setIcon(qApp->icons()->fromTheme(QSL("print-web-page")));
-  m_actionCopySelectedItem->setIcon(qApp->icons()->fromTheme(QSL("edit-copy")));
-  m_actionCopyLink->setIcon(qApp->icons()->fromTheme(QSL("edit-copy")));
-  m_actionCopyImage->setIcon(qApp->icons()->fromTheme(QSL("edit-copy-image")));
-  m_actionSaveHyperlinkAs->setIcon(qApp->icons()->fromTheme(QSL("document-download")));
-  m_actionSaveImageAs->setIcon(qApp->icons()->fromTheme(QSL("document-download")));
-  m_actionCopyImageUrl->setIcon(qApp->icons()->fromTheme(QSL("edit-copy")));
-  m_actionOpenLinkThisTab->setIcon(qApp->icons()->fromTheme(QSL("item-open-internal")));
-  m_actionOpenLinkNewTab->setIcon(qApp->icons()->fromTheme(QSL("item-open-internal")));
-  m_actionOpenLinkExternally->setIcon(qApp->icons()->fromTheme(QSL("item-open-external")));
-  m_actionOpenImageNewTab->setIcon(qApp->icons()->fromTheme(QSL("edit-copy-image")));
-
-  m_actionLookupText->setIcon(qApp->icons()->fromTheme(QSL("item-search-google")));
-}
-
-void WebView::initializeActions() {  
-  m_actionPrint = new QAction(tr("Print"), this);
-  m_actionPrint->setToolTip(tr("Print current web page."));
-
-  m_actionCopySelectedItem = pageAction(QWebEnginePage::Copy);
-  m_actionCopySelectedItem->setParent(this);
-
-  m_actionSaveHyperlinkAs = pageAction(QWebEnginePage::DownloadLinkToDisk);
-  m_actionSaveHyperlinkAs->setParent(this);
-
-  m_actionCopyLink = pageAction(QWebEnginePage::CopyLinkToClipboard);
-  m_actionCopyLink->setParent(this);
-
-  m_actionCopyImage = pageAction(QWebEnginePage::CopyImageToClipboard);
-  m_actionCopyImage->setParent(this);
-
-  m_actionSaveImageAs = pageAction(QWebEnginePage::DownloadImageToDisk);
-  m_actionSaveImageAs->setParent(this);
-  m_actionSavePageAs = new QAction(qApp->icons()->fromTheme(QSL("document-download")), tr("Save page as..."), this);
-
-  m_actionCopyImageUrl = pageAction(QWebEnginePage::CopyImageUrlToClipboard);
-  m_actionCopyImageUrl->setParent(this);
-
-  m_actionOpenLinkNewTab = pageAction(QWebEnginePage::OpenLinkInNewTab);
-  m_actionOpenLinkNewTab->setParent(this);
-
-  m_actionOpenLinkThisTab = pageAction(QWebEnginePage::OpenLinkInThisWindow);
-  m_actionOpenLinkThisTab->setParent(this);
-
-  m_actionOpenLinkExternally = new QAction(tr("Open link in external browser"), this);
-
-  // TODO: bude fungovat?
-  m_actionOpenImageNewTab = pageAction(QWebEnginePage::OpenLinkInNewTab);
-  m_actionOpenImageNewTab->setParent(this);
-
-  m_actionLookupText = new QAction("", this);
-}
-
-void WebView::setActionTexts() {
-  m_actionCopySelectedItem->setText(tr("Copy selection"));
-  m_actionCopySelectedItem->setToolTip(tr("Copies current selection into the clipboard."));
-  m_actionSaveHyperlinkAs->setText(tr("Save target as..."));
-  m_actionSaveHyperlinkAs->setToolTip(tr("Download content from the hyperlink."));
-  m_actionCopyLink->setText(tr("Copy link url"));
-  m_actionCopyLink->setToolTip(tr("Copy link url to clipboard."));
-  m_actionCopyImage->setText(tr("Copy image"));
-  m_actionCopyImage->setToolTip(tr("Copy image to clipboard."));
-  m_actionSaveImageAs->setText(tr("Save image as..."));
-  m_actionSaveImageAs->setToolTip(tr("Save image to disk."));
-
-  m_actionCopyImageUrl->setText(tr("Copy image url"));
-  m_actionCopyImageUrl->setToolTip(tr("Copy image url to clipboard."));
-
-  m_actionOpenLinkNewTab->setText(tr("Open link in new tab"));
-  m_actionOpenLinkNewTab->setToolTip(tr("Open this hyperlink in new tab."));
-  m_actionOpenLinkThisTab->setText(tr("Follow link"));
-  m_actionOpenLinkThisTab->setToolTip(tr("Open the hyperlink in this tab."));
-  m_actionOpenLinkExternally->setToolTip(tr("Open the hyperlink in external browser."));
-  m_actionOpenImageNewTab->setText(tr("Open image in new tab"));
-  m_actionOpenImageNewTab->setToolTip(tr("Open this image in this tab."));
-}
-
-void WebView::printCurrentPage() {
-  QScopedPointer<QPrintPreviewDialog> print_preview(new QPrintPreviewDialog(this));
-  connect(print_preview.data(), SIGNAL(paintRequested(QPrinter*)), this, SLOT(print(QPrinter*)));
-  print_preview.data()->exec();
-}
-
-void WebView::mousePressEvent(QMouseEvent *event) {
-  if (event->button() & Qt::MiddleButton) {
-    m_gestureOrigin = event->pos();
-  }
-  else {
-    QWebEngineView::mousePressEvent(event);
-  }
-}
-
-void WebView::mouseReleaseEvent(QMouseEvent *event) {
-  if (event->button() & Qt::MiddleButton) {
-    const bool are_gestures_enabled = qApp->settings()->value(GROUP(Browser), SETTING(Browser::GesturesEnabled)).toBool();
-
-    if (are_gestures_enabled) {
-      const QPoint release_point = event->pos();
-      int left_move = m_gestureOrigin.x() - release_point.x();
-      int right_move = -left_move;
-      int top_move = m_gestureOrigin.y() - release_point.y();
-      int bottom_move = -top_move;
-      int total_max = qMax(qMax(qMax(left_move, right_move), qMax(top_move, bottom_move)), 40);
-
-      if (total_max == left_move) {
-        back();
-      }
-      else if (total_max == right_move) {
-        forward();
-      }
-      else if (total_max == top_move) {
-        reload();
-      }
-      else if (total_max == bottom_move) {
-        emit newTabRequested();
-      }
-    }
-  }
-
-  QWebEngineView::mouseReleaseEvent(event);
-}
-
-void WebView::contextMenuEvent(QContextMenuEvent *event) {
-  QWebEngineView::contextMenuEvent(event);
-}
-
 void WebView::wheelEvent(QWheelEvent *event) {
   if (event->modifiers() & Qt::ControlModifier) {
     if (event->delta() > 0) {
diff --git a/src/network-web/webview.h b/src/network-web/webview.h
index ae5a06b9f..a6adbb75e 100755
--- a/src/network-web/webview.h
+++ b/src/network-web/webview.h
@@ -21,10 +21,6 @@
 #include <QWebEngineView>
 
 
-class QAction;
-class QPaintEvent;
-class WebPage;
-
 class WebView : public QWebEngineView {
     Q_OBJECT
 
@@ -34,20 +30,11 @@ class WebView : public QWebEngineView {
     virtual ~WebView();
 
     // Page accessor.
-    inline WebPage *page() const {
+    inline QWebEnginePage *page() const {
       return m_page;
     }
 
-    void setupIcons();
-
   signals:
-    // Is emitted if user wants to open some hyperlink in new
-    // web browser tab.
-    void linkMiddleClicked(const QUrl &link_url);
-
-    // User wants to open new empty web browser tab.
-    void newTabRequested();
-
     // Emitted if user changes zoom factor via CTRL + mouse wheel combo.
     void zoomFactorChanged();
 
@@ -57,52 +44,12 @@ class WebView : public QWebEngineView {
     bool decreaseWebPageZoom();
     bool resetWebPageZoom();
 
-    void copySelectedText();
-    void openLinkInNewTab();
-    void openLinkExternally();
-    void openImageInNewTab();
-    void searchTextViaGoogle();
-    void saveCurrentPageToFile();
-    void printCurrentPage();
-
   protected:
-    // Initializes all actions.
-    void initializeActions();
-
-    void setActionTexts();
-
-    // Creates necessary connections.
-    void createConnections();
-
     // Customize mouse wheeling.
     void wheelEvent(QWheelEvent *event);
 
-    // Provides custom mouse actions.
-    void mousePressEvent(QMouseEvent *event);
-    void mouseReleaseEvent(QMouseEvent *event);
-
-    void contextMenuEvent(QContextMenuEvent *event);
-
   private:
-    WebPage *m_page;
-
-    QAction *m_actionPrint;
-    QAction *m_actionCopySelectedItem;
-    QAction *m_actionCopyLink;
-    QAction *m_actionCopyImage;
-    QAction *m_actionSavePageAs;
-    QAction *m_actionSaveHyperlinkAs;
-    QAction *m_actionSaveImageAs;
-    QAction *m_actionCopyImageUrl;
-    QAction *m_actionOpenLinkThisTab;
-    QAction *m_actionOpenLinkNewTab;
-    QAction *m_actionOpenLinkExternally;
-    QAction *m_actionOpenImageNewTab;
-    QAction *m_actionLookupText;
-
-    QPoint m_gestureOrigin;
-    QUrl m_contextLinkUrl;
-    QUrl m_contextImageUrl;
+    QWebEnginePage *m_page;
 };
 
 #endif // BASEWEBVIEW_H

From 36aadcaa1e73362f7b9f64922715b46f0e8430d8 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 07:58:11 +0200
Subject: [PATCH 15/31] Some shit.

---
 src/network-web/webbrowser.cpp |  3 ---
 src/network-web/webview.cpp    | 17 -----------------
 src/network-web/webview.h      |  8 --------
 3 files changed, 28 deletions(-)

diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp
index cc7078e3a..79e3942c6 100755
--- a/src/network-web/webbrowser.cpp
+++ b/src/network-web/webbrowser.cpp
@@ -199,9 +199,6 @@ void WebBrowser::createConnections() {
   // Forward title/icon changes.
   connect(m_webView, SIGNAL(titleChanged(QString)), this, SLOT(onTitleChanged(QString)));
   connect(m_webView, SIGNAL(iconUrlChanged(QUrl)), this, SLOT(onIconChanged()));
-
-  // Misc connections.
-  connect(m_webView, SIGNAL(zoomFactorChanged()), this, SLOT(updateZoomGui()));
 }
 
 void WebBrowser::onIconChanged() {
diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp
index 1ca3663f4..9e226a548 100755
--- a/src/network-web/webview.cpp
+++ b/src/network-web/webview.cpp
@@ -32,23 +32,6 @@ WebView::~WebView() {
   qDebug("Destroying WebView.");
 }
 
-void WebView::wheelEvent(QWheelEvent *event) {
-  if (event->modifiers() & Qt::ControlModifier) {
-    if (event->delta() > 0) {
-      increaseWebPageZoom();
-      emit zoomFactorChanged();
-      return;
-    }
-    else if (event->delta() < 0) {
-      decreaseWebPageZoom();
-      emit zoomFactorChanged();
-      return;
-    }
-  }
-
-  QWebEngineView::wheelEvent(event);
-}
-
 bool WebView::increaseWebPageZoom() {
   const qreal new_factor = zoomFactor() + 0.1;
 
diff --git a/src/network-web/webview.h b/src/network-web/webview.h
index a6adbb75e..f896d5de6 100755
--- a/src/network-web/webview.h
+++ b/src/network-web/webview.h
@@ -34,20 +34,12 @@ class WebView : public QWebEngineView {
       return m_page;
     }
 
-  signals:
-    // Emitted if user changes zoom factor via CTRL + mouse wheel combo.
-    void zoomFactorChanged();
-
   public slots:
     // Page zoom modifiers.
     bool increaseWebPageZoom();
     bool decreaseWebPageZoom();
     bool resetWebPageZoom();
 
-  protected:
-    // Customize mouse wheeling.
-    void wheelEvent(QWheelEvent *event);
-
   private:
     QWebEnginePage *m_page;
 };

From 322aef972dd8502588c312dae007b840ebc49bef Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 08:44:59 +0200
Subject: [PATCH 16/31] Removed that webengine shit.

---
 CMakeLists.txt                      |   8 +-
 src/gui/dialogs/formmain.cpp        |  59 -----
 src/gui/dialogs/formmain.h          |   3 -
 src/gui/dialogs/formmain.ui         | 100 ---------
 src/gui/dialogs/formsettings.cpp    |  12 -
 src/gui/dialogs/formsettings.ui     |  42 ----
 src/gui/discoverfeedsbutton.cpp     |  92 --------
 src/gui/discoverfeedsbutton.h       |  45 ----
 src/gui/feedmessageviewer.cpp       |  59 +++--
 src/gui/feedmessageviewer.h         |   8 +-
 src/gui/locationlineedit.cpp        |  53 -----
 src/gui/locationlineedit.h          |  44 ----
 src/gui/messagesview.cpp            |  37 +---
 src/gui/messagesview.h              |   2 -
 src/gui/tabcontent.h                |   6 -
 src/gui/tabwidget.cpp               | 118 +---------
 src/gui/tabwidget.h                 |  15 --
 src/main.cpp                        |   5 -
 src/miscellaneous/application.cpp   |   1 -
 src/miscellaneous/settings.cpp      |  21 +-
 src/miscellaneous/settings.h        |  18 --
 src/network-web/downloadmanager.cpp |  10 -
 src/network-web/downloadmanager.h   |   3 -
 src/network-web/googlesuggest.cpp   | 204 -----------------
 src/network-web/googlesuggest.h     |  82 -------
 src/network-web/webbrowser.cpp      | 328 ----------------------------
 src/network-web/webbrowser.h        | 168 --------------
 src/network-web/webfactory.cpp      |  68 ++----
 src/network-web/webfactory.h        |  38 ++--
 src/network-web/webview.cpp         |  69 ------
 src/network-web/webview.h           |  47 ----
 31 files changed, 92 insertions(+), 1673 deletions(-)
 delete mode 100755 src/gui/discoverfeedsbutton.cpp
 delete mode 100755 src/gui/discoverfeedsbutton.h
 delete mode 100755 src/gui/locationlineedit.cpp
 delete mode 100755 src/gui/locationlineedit.h
 delete mode 100755 src/network-web/googlesuggest.cpp
 delete mode 100755 src/network-web/googlesuggest.h
 delete mode 100755 src/network-web/webbrowser.cpp
 delete mode 100755 src/network-web/webbrowser.h
 delete mode 100755 src/network-web/webview.cpp
 delete mode 100755 src/network-web/webview.h

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f095e5730..36620879e 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -223,9 +223,9 @@ endif(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
 # Setup libraries.
 if(UNIX)
   # On Unices, enable D-Bus support.
-  find_package(Qt5 REQUIRED DBus Sql WebEngineCore WebEngineWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
+  find_package(Qt5 REQUIRED DBus Sql Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
 else(UNIX)
-  find_package(Qt5 REQUIRED Sql WebEngineCore WebEngineWidgets Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
+  find_package(Qt5 REQUIRED Sql Widgets Xml XmlPatterns Network LinguistTools PrintSupport)
 endif(UNIX)
 
 message(STATUS "[${APP_LOW_NAME}] Found Qt version: '${Qt5_VERSION}'.")
@@ -413,8 +413,6 @@ if(UNIX)
     Sql
     Network
     Xml
-    WebEngineCore
-    WebEngineWidgets
     PrintSupport
   )
 else(UNIX)
@@ -425,8 +423,6 @@ else(UNIX)
     Sql
     Network
     Xml
-    WebEngineCore
-    WebEngineWidgets
     PrintSupport
   )
 endif(UNIX)
diff --git a/src/gui/dialogs/formmain.cpp b/src/gui/dialogs/formmain.cpp
index 7c9900649..a921cbf02 100755
--- a/src/gui/dialogs/formmain.cpp
+++ b/src/gui/dialogs/formmain.cpp
@@ -25,7 +25,6 @@
 #include "miscellaneous/databasefactory.h"
 #include "miscellaneous/iconfactory.h"
 #include "network-web/webfactory.h"
-#include "network-web/webbrowser.h"
 #include "gui/feedsview.h"
 #include "gui/messagebox.h"
 #include "gui/systemtrayicon.h"
@@ -84,9 +83,6 @@ FormMain::FormMain(QWidget *parent, Qt::WindowFlags f)
   loadSize();
 
   m_statusBar->loadChangeableActions();
-
-  // Initialize the web factory.
-  WebFactory::instance()->loadState();
 }
 
 FormMain::~FormMain() {
@@ -113,14 +109,8 @@ QList<QAction*> FormMain::allActions() const {
   actions << m_ui->m_actionSwitchStatusBar;
   actions << m_ui->m_actionSwitchMessageListOrientation;
 
-  // Add web browser actions.
-  actions << m_ui->m_actionAddBrowser;
-  actions << m_ui->m_actionCloseCurrentTab;
-  actions << m_ui->m_actionCloseAllTabs;
-
   // Add feeds/messages actions.
   actions << m_ui->m_actionOpenSelectedSourceArticlesExternally;
-  actions << m_ui->m_actionOpenSelectedSourceArticlesInternally;
   actions << m_ui->m_actionOpenSelectedMessagesInternally;
   actions << m_ui->m_actionMarkAllItemsRead;
   actions << m_ui->m_actionMarkSelectedItemsAsRead;
@@ -362,16 +352,6 @@ void FormMain::setupIcons() {
   m_ui->m_actionSwitchMessageListOrientation->setIcon(icon_theme_factory->fromTheme(QSL("view-switch-layout-direction")));
   m_ui->m_menuShowHide->setIcon(icon_theme_factory->fromTheme(QSL("view-switch")));
 
-  // Web browser.
-  m_ui->m_actionAddBrowser->setIcon(icon_theme_factory->fromTheme(QSL("list-add")));
-  m_ui->m_actionCloseCurrentTab->setIcon(icon_theme_factory->fromTheme(QSL("list-remove")));
-  m_ui->m_actionCloseAllTabs->setIcon(icon_theme_factory->fromTheme(QSL("list-remove")));
-  m_ui->m_menuCurrentTab->setIcon(icon_theme_factory->fromTheme(QSL("list-current")));
-  m_ui->m_menuWebSettings->setIcon(icon_theme_factory->fromTheme(QSL("application-settings")));
-  m_ui->m_actionWebAutoloadImages->setIcon(icon_theme_factory->fromTheme(QSL("image-generic")));
-  m_ui->m_actionWebEnableExternalPlugins->setIcon(icon_theme_factory->fromTheme(QSL("web-flash")));
-  m_ui->m_actionWebEnableJavascript->setIcon(icon_theme_factory->fromTheme(QSL("web-javascript")));
-
   // Feeds/messages.
   m_ui->m_menuAddItem->setIcon(icon_theme_factory->fromTheme(QSL("item-new")));
   m_ui->m_actionStopRunningItemsUpdate->setIcon(icon_theme_factory->fromTheme(QSL("go-stop")));
@@ -388,7 +368,6 @@ void FormMain::setupIcons() {
   m_ui->m_actionMarkSelectedMessagesAsRead->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-read")));
   m_ui->m_actionMarkSelectedMessagesAsUnread->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-unread")));
   m_ui->m_actionSwitchImportanceOfSelectedMessages->setIcon(icon_theme_factory->fromTheme(QSL("mail-mark-favorite")));
-  m_ui->m_actionOpenSelectedSourceArticlesInternally->setIcon(icon_theme_factory->fromTheme(QSL("item-open-internal")));
   m_ui->m_actionOpenSelectedSourceArticlesExternally->setIcon(icon_theme_factory->fromTheme(QSL("item-open-external")));
   m_ui->m_actionOpenSelectedMessagesInternally->setIcon(icon_theme_factory->fromTheme(QSL("item-open-internal")));
   m_ui->m_actionSendMessageViaEmail->setIcon(icon_theme_factory->fromTheme(QSL("item-send-email")));
@@ -409,11 +388,6 @@ void FormMain::setupIcons() {
   m_ui->m_actionAddFeedIntoSelectedAccount->setIcon(icon_theme_factory->fromTheme(QSL("folder-feed")));
   m_ui->m_actionAddCategoryIntoSelectedAccount->setIcon(icon_theme_factory->fromTheme(QSL("folder-category")));
 
-  // Setup icons for underlying components: opened web browsers...
-  foreach (WebBrowser *browser, WebBrowser::runningWebBrowsers()) {
-    browser->setupIcons();
-  }
-
   // Setup icons on TabWidget too.
   m_ui->m_tabWidget->setupIcons();
 
@@ -508,39 +482,6 @@ void FormMain::createConnections() {
   connect(m_ui->m_actionReportBugBitBucket, SIGNAL(triggered()), this, SLOT(reportABugOnBitBucket()));
   connect(m_ui->m_actionDonate, SIGNAL(triggered()), this, SLOT(donate()));
   connect(m_ui->m_actionDisplayWiki, SIGNAL(triggered()), this, SLOT(showWiki()));
-
-  // Menu "Web browser" connections.
-  connect(m_ui->m_tabWidget, SIGNAL(currentChanged(int)), this, SLOT(loadWebBrowserMenu(int)));
-  connect(m_ui->m_actionCloseCurrentTab, SIGNAL(triggered()), m_ui->m_tabWidget, SLOT(closeCurrentTab()));
-  connect(m_ui->m_actionAddBrowser, SIGNAL(triggered()), m_ui->m_tabWidget, SLOT(addEmptyBrowser()));
-  connect(m_ui->m_actionCloseAllTabs, SIGNAL(triggered()), m_ui->m_tabWidget, SLOT(closeAllTabsExceptCurrent()));
-  connect(m_ui->m_actionWebAutoloadImages, SIGNAL(toggled(bool)), WebFactory::instance(), SLOT(switchImages(bool)));
-  connect(m_ui->m_actionWebEnableExternalPlugins, SIGNAL(toggled(bool)), WebFactory::instance(), SLOT(switchPlugins(bool)));
-  connect(m_ui->m_actionWebEnableJavascript, SIGNAL(toggled(bool)), WebFactory::instance(), SLOT(switchJavascript(bool)));
-
-  connect(WebFactory::instance(), SIGNAL(imagesLoadingSwitched(bool)), m_ui->m_actionWebAutoloadImages, SLOT(setChecked(bool)));
-  connect(WebFactory::instance(), SIGNAL(javascriptSwitched(bool)), m_ui->m_actionWebEnableJavascript, SLOT(setChecked(bool)));
-  connect(WebFactory::instance(), SIGNAL(pluginsSwitched(bool)), m_ui->m_actionWebEnableExternalPlugins, SLOT(setChecked(bool)));
-}
-
-void FormMain::loadWebBrowserMenu(int index) {
-  const WebBrowser *active_browser = m_ui->m_tabWidget->widget(index)->webBrowser();
-
-  m_ui->m_menuCurrentTab->clear();
-
-  if (active_browser != NULL) {
-    m_ui->m_menuCurrentTab->setEnabled(true);
-    m_ui->m_menuCurrentTab->addActions(active_browser->globalMenu());
-
-    if (m_ui->m_menuCurrentTab->actions().size() == 0) {
-      m_ui->m_menuCurrentTab->insertAction(NULL, m_ui->m_actionNoActions);
-    }
-  }
-  else {
-    m_ui->m_menuCurrentTab->setEnabled(false);
-  }
-
-  m_ui->m_actionCloseCurrentTab->setEnabled(m_ui->m_tabWidget->tabBar()->tabType(index) == TabBar::Closable);
 }
 
 void FormMain::backupDatabaseSettings() {
diff --git a/src/gui/dialogs/formmain.h b/src/gui/dialogs/formmain.h
index 2bdfda3fa..06b28244f 100755
--- a/src/gui/dialogs/formmain.h
+++ b/src/gui/dialogs/formmain.h
@@ -78,9 +78,6 @@ class FormMain : public QMainWindow {
     void updateRecycleBinMenu();
     void updateAccountsMenu();
 
-    // Loads web browser menu if user selects to change tabs.
-    void loadWebBrowserMenu(int index);
-
     // Displays various dialogs.
     void backupDatabaseSettings();
     void restoreDatabaseSettings();
diff --git a/src/gui/dialogs/formmain.ui b/src/gui/dialogs/formmain.ui
index 847ec7a70..191c09c09 100755
--- a/src/gui/dialogs/formmain.ui
+++ b/src/gui/dialogs/formmain.ui
@@ -100,30 +100,6 @@
     <addaction name="m_actionCleanupDatabase"/>
     <addaction name="m_actionDownloadManager"/>
    </widget>
-   <widget class="QMenu" name="m_menuWebBrowser">
-    <property name="title">
-     <string>&amp;Web browser</string>
-    </property>
-    <widget class="QMenu" name="m_menuCurrentTab">
-     <property name="title">
-      <string>&amp;Current tab</string>
-     </property>
-    </widget>
-    <widget class="QMenu" name="m_menuWebSettings">
-     <property name="title">
-      <string>Settings</string>
-     </property>
-     <addaction name="m_actionWebEnableJavascript"/>
-     <addaction name="m_actionWebEnableExternalPlugins"/>
-     <addaction name="m_actionWebAutoloadImages"/>
-    </widget>
-    <addaction name="m_actionAddBrowser"/>
-    <addaction name="m_actionCloseCurrentTab"/>
-    <addaction name="m_actionCloseAllTabs"/>
-    <addaction name="separator"/>
-    <addaction name="m_menuWebSettings"/>
-    <addaction name="m_menuCurrentTab"/>
-   </widget>
    <widget class="QMenu" name="m_menuFeeds">
     <property name="title">
      <string>Feeds &amp;&amp; categories</string>
@@ -160,7 +136,6 @@
      <string>&amp;Messages</string>
     </property>
     <addaction name="m_actionOpenSelectedSourceArticlesExternally"/>
-    <addaction name="m_actionOpenSelectedSourceArticlesInternally"/>
     <addaction name="m_actionOpenSelectedMessagesInternally"/>
     <addaction name="m_actionSendMessageViaEmail"/>
     <addaction name="separator"/>
@@ -195,7 +170,6 @@
    <addaction name="m_menuFeeds"/>
    <addaction name="m_menuMessages"/>
    <addaction name="m_menuRecycleBin"/>
-   <addaction name="m_menuWebBrowser"/>
    <addaction name="m_menuTools"/>
    <addaction name="m_menuHelp"/>
   </widget>
@@ -252,39 +226,6 @@
     <string notr="true">F</string>
    </property>
   </action>
-  <action name="m_actionAddBrowser">
-   <property name="text">
-    <string>&amp;Add tab</string>
-   </property>
-   <property name="toolTip">
-    <string>Add new web browser tab.</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true">Ctrl+T</string>
-   </property>
-  </action>
-  <action name="m_actionCloseAllTabs">
-   <property name="text">
-    <string>&amp;Close all tabs except current one</string>
-   </property>
-   <property name="toolTip">
-    <string>Close all tabs except current one.</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true"/>
-   </property>
-  </action>
-  <action name="m_actionCloseCurrentTab">
-   <property name="text">
-    <string>&amp;Close current tab</string>
-   </property>
-   <property name="toolTip">
-    <string>Close current web browser tab.</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true"/>
-   </property>
-  </action>
   <action name="m_actionUpdateAllItems">
    <property name="text">
     <string>Update &amp;all items</string>
@@ -398,14 +339,6 @@
     <string notr="true"/>
    </property>
   </action>
-  <action name="m_actionOpenSelectedSourceArticlesInternally">
-   <property name="text">
-    <string>Open selected source articles in &amp;internal browser</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true"/>
-   </property>
-  </action>
   <action name="m_actionNoActions">
    <property name="enabled">
     <bool>false</bool>
@@ -544,39 +477,6 @@
     <string notr="true">M</string>
    </property>
   </action>
-  <action name="m_actionWebEnableJavascript">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Enable &amp;JavaScript</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true">J</string>
-   </property>
-  </action>
-  <action name="m_actionWebEnableExternalPlugins">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Enable external &amp;plugins</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true">P</string>
-   </property>
-  </action>
-  <action name="m_actionWebAutoloadImages">
-   <property name="checkable">
-    <bool>true</bool>
-   </property>
-   <property name="text">
-    <string>Auto-load &amp;images</string>
-   </property>
-   <property name="shortcut">
-    <string notr="true">I</string>
-   </property>
-  </action>
   <action name="m_actionReportBugGitHub">
    <property name="text">
     <string>Report a &amp;bug (GitHub)...</string>
diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp
index 3c43fad51..df40fbcf1 100755
--- a/src/gui/dialogs/formsettings.cpp
+++ b/src/gui/dialogs/formsettings.cpp
@@ -31,7 +31,6 @@
 #include "miscellaneous/textfactory.h"
 #include "network-web/webfactory.h"
 #include "network-web/silentnetworkaccessmanager.h"
-#include "network-web/webbrowser.h"
 #include "gui/systemtrayicon.h"
 #include "gui/feedmessageviewer.h"
 #include "gui/feedsview.h"
@@ -382,15 +381,10 @@ void FormSettings::onProxyTypeChanged(int index) {
 
 void FormSettings::loadBrowser() {
   // Load settings of web browser GUI.
-  m_ui->m_checkQueueTabs->setChecked(m_settings->value(GROUP(Browser), SETTING(Browser::QueueTabs)).toBool());
   m_ui->m_cmbExternalBrowserPreset->addItem(tr("Opera 12 or older"), QSL("-nosession %1"));
   m_ui->m_txtExternalBrowserExecutable->setText(m_settings->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserExecutable)).toString());
   m_ui->m_txtExternalBrowserArguments->setText(m_settings->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserArguments)).toString());
   m_ui->m_grpCustomExternalBrowser->setChecked(m_settings->value(GROUP(Browser), SETTING(Browser::CustomExternalBrowserEnabled)).toBool());
-  m_ui->m_checkAutoLoadImages->setChecked(WebFactory::instance()->autoloadImages());
-  m_ui->m_checkEnableJavascript->setChecked(WebFactory::instance()->javascriptEnabled());
-  m_ui->m_checkEnablePlugins->setChecked(WebFactory::instance()->pluginsEnabled());
-  m_ui->m_checkRememberOpenedTabs->setChecked(m_settings->value(GROUP(Browser), SETTING(Browser::RememberBrowserTabs)).toBool());
 
   // Load settings of e-mail.
   m_ui->m_cmbExternalEmailPreset->addItem(tr("Mozilla Thunderbird"), QSL("-compose \"subject='%1',body='%2'\""));
@@ -402,19 +396,13 @@ void FormSettings::loadBrowser() {
 void FormSettings::saveBrowser() {
   // Save settings of GUI of web browser.
   m_settings->setValue(GROUP(Browser), Browser::CustomExternalBrowserEnabled, m_ui->m_grpCustomExternalBrowser->isChecked());
-  m_settings->setValue(GROUP(Browser), Browser::QueueTabs, m_ui->m_checkQueueTabs->isChecked());
   m_settings->setValue(GROUP(Browser), Browser::CustomExternalBrowserExecutable, m_ui->m_txtExternalBrowserExecutable->text());
   m_settings->setValue(GROUP(Browser), Browser::CustomExternalBrowserArguments, m_ui->m_txtExternalBrowserArguments->text());
-  m_settings->setValue(GROUP(Browser), Browser::RememberBrowserTabs, m_ui->m_checkRememberOpenedTabs->isChecked());
 
   // Save settings of e-mail.
   m_settings->setValue(GROUP(Browser), Browser::CustomExternalEmailExecutable, m_ui->m_txtExternalEmailExecutable->text());
   m_settings->setValue(GROUP(Browser), Browser::CustomExternalEmailArguments, m_ui->m_txtExternalEmailArguments->text());
   m_settings->setValue(GROUP(Browser), Browser::CustomExternalEmailEnabled, m_ui->m_grpCustomExternalEmail->isChecked());
-
-  WebFactory::instance()->switchImages(m_ui->m_checkAutoLoadImages->isChecked());
-  WebFactory::instance()->switchJavascript(m_ui->m_checkEnableJavascript->isChecked());
-  WebFactory::instance()->switchPlugins(m_ui->m_checkEnablePlugins->isChecked());
 }
 
 void FormSettings::loadProxy() {
diff --git a/src/gui/dialogs/formsettings.ui b/src/gui/dialogs/formsettings.ui
index b958a898d..07eb791f9 100755
--- a/src/gui/dialogs/formsettings.ui
+++ b/src/gui/dialogs/formsettings.ui
@@ -888,44 +888,6 @@ Authors of this application are NOT responsible for lost data.</string>
          <property name="currentIndex">
           <number>0</number>
          </property>
-         <widget class="QWidget" name="m_tabInternalBrowser">
-          <attribute name="title">
-           <string>Internal web browser</string>
-          </attribute>
-          <layout class="QFormLayout" name="formLayout_4">
-           <property name="fieldGrowthPolicy">
-            <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
-           </property>
-           <item row="0" column="0" colspan="2">
-            <widget class="QCheckBox" name="m_checkQueueTabs">
-             <property name="text">
-              <string>Queue new tabs (with hyperlinks) after the active tab</string>
-             </property>
-            </widget>
-           </item>
-           <item row="1" column="0">
-            <widget class="QCheckBox" name="m_checkEnableJavascript">
-             <property name="text">
-              <string>Enable JavaScript</string>
-             </property>
-            </widget>
-           </item>
-           <item row="2" column="0">
-            <widget class="QCheckBox" name="m_checkEnablePlugins">
-             <property name="text">
-              <string>Enable external plugins</string>
-             </property>
-            </widget>
-           </item>
-           <item row="3" column="0">
-            <widget class="QCheckBox" name="m_checkAutoLoadImages">
-             <property name="text">
-              <string>Auto-load images</string>
-             </property>
-            </widget>
-           </item>
-          </layout>
-         </widget>
          <widget class="QWidget" name="m_tabExternalBrowser">
           <attribute name="title">
            <string>External web browser</string>
@@ -1609,10 +1571,6 @@ Authors of this application are NOT responsible for lost data.</string>
   <tabstop>m_cmbSelectToolBar</tabstop>
   <tabstop>m_treeLanguages</tabstop>
   <tabstop>m_tabBrowserProxy</tabstop>
-  <tabstop>m_checkQueueTabs</tabstop>
-  <tabstop>m_checkEnableJavascript</tabstop>
-  <tabstop>m_checkEnablePlugins</tabstop>
-  <tabstop>m_checkAutoLoadImages</tabstop>
   <tabstop>m_grpCustomExternalBrowser</tabstop>
   <tabstop>m_txtExternalBrowserExecutable</tabstop>
   <tabstop>m_btnExternalBrowserExecutable</tabstop>
diff --git a/src/gui/discoverfeedsbutton.cpp b/src/gui/discoverfeedsbutton.cpp
deleted file mode 100755
index f633ba7db..000000000
--- a/src/gui/discoverfeedsbutton.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "gui/discoverfeedsbutton.h"
-
-#include "miscellaneous/application.h"
-#include "miscellaneous/iconfactory.h"
-#include "gui/dialogs/formmain.h"
-#include "gui/tabwidget.h"
-#include "gui/feedmessageviewer.h"
-#include "gui/feedsview.h"
-#include "core/feedsmodel.h"
-#include "services/abstract/serviceroot.h"
-
-#include <QVariant>
-
-
-DiscoverFeedsButton::DiscoverFeedsButton(QWidget *parent) : QToolButton(parent), m_addresses(QStringList()) {
-  setEnabled(false);
-  setIcon(qApp->icons()->fromTheme(QSL("folder-feed")));
-  setPopupMode(QToolButton::InstantPopup);
-}
-
-DiscoverFeedsButton::~DiscoverFeedsButton() {
-}
-
-void DiscoverFeedsButton::clearFeedAddresses() {
-  setFeedAddresses(QStringList());
-}
-
-void DiscoverFeedsButton::setFeedAddresses(const QStringList &addresses) {
-  setEnabled(!addresses.isEmpty());
-  setToolTip(addresses.isEmpty() ?
-               tr("This website does not contain any feeds.") :
-               tr("Click me to add feeds from this website.\nThis website contains %n feed(s).", 0, addresses.size()));
-
-  if (menu() == NULL) {
-    // Initialize the menu.
-    setMenu(new QMenu(this));
-    connect(menu(), SIGNAL(triggered(QAction*)), this, SLOT(linkTriggered(QAction*)));
-    connect(menu(), SIGNAL(aboutToShow()), this, SLOT(fillMenu()));
-  }
-
-  menu()->hide();
-  m_addresses = addresses;
-}
-
-void DiscoverFeedsButton::linkTriggered(QAction *action) {
-  const QString url = action->property("url").toString();
-  ServiceRoot *root = static_cast<ServiceRoot*>(action->property("root").value<void*>());
-
-  if (root->supportsFeedAdding()) {
-    root->addNewFeed(url);
-  }
-  else {
-    qApp->showGuiMessage(tr("Not supported"),
-                         tr("Given account does not support adding feeds."),
-                         QSystemTrayIcon::Warning,
-                         qApp->mainForm(), true);
-  }
-}
-
-void DiscoverFeedsButton::fillMenu() {
-  menu()->clear();
-
-  foreach (const ServiceRoot *root, qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->serviceRoots()) {
-    QMenu *root_menu = menu()->addMenu(root->icon(), root->title());
-
-    foreach (const QString &url, m_addresses) {
-      if (root->supportsFeedAdding()) {
-        QAction *url_action = root_menu->addAction(root->icon(), url);
-
-        url_action->setProperty("url", url);
-        url_action->setProperty("root", QVariant::fromValue((void*) root));
-      }
-    }
-  }
-}
diff --git a/src/gui/discoverfeedsbutton.h b/src/gui/discoverfeedsbutton.h
deleted file mode 100755
index 5b8000737..000000000
--- a/src/gui/discoverfeedsbutton.h
+++ /dev/null
@@ -1,45 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef DISCOVERFEEDSBUTTON_H
-#define DISCOVERFEEDSBUTTON_H
-
-#include <QToolButton>
-
-
-class DiscoverFeedsButton : public QToolButton {
-    Q_OBJECT
-
-  public:
-    // Constructors.
-    explicit DiscoverFeedsButton(QWidget *parent = 0);
-    virtual ~DiscoverFeedsButton();
-
-    // Feed addresses manipulators.
-    void clearFeedAddresses();
-    void setFeedAddresses(const QStringList &addresses);
-
-  private slots:
-    // User chose any of addresses.
-    void linkTriggered(QAction *action);
-    void fillMenu();
-
-  private:
-    QStringList m_addresses;
-};
-
-#endif // DISCOVERFEEDSBUTTON_H
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 90285b22a..e2eb6c532 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -29,7 +29,6 @@
 #include "services/standard/standardserviceroot.h"
 #include "services/standard/standardfeed.h"
 #include "services/standard/standardfeedsimportexportmodel.h"
-#include "network-web/webbrowser.h"
 #include "gui/messagesview.h"
 #include "gui/feedsview.h"
 #include "gui/statusbar.h"
@@ -53,7 +52,6 @@
 #include <QThread>
 #include <QProgressBar>
 #include <QStatusBar>
-#include <QWebEngineSettings>
 #include <QPointer>
 
 
@@ -65,7 +63,7 @@ FeedMessageViewer::FeedMessageViewer(QWidget *parent)
     m_toolBarMessages(new MessagesToolBar(tr("Toolbar for messages"), this)),
     m_messagesView(new MessagesView(this)),
     m_feedsView(new FeedsView(this)),
-    m_messagesBrowser(new WebBrowser(this)) {
+    m_messagesBrowser(new QTextBrowser(this)) {
   initialize();
   initializeViews();
   loadMessageViewerFonts();
@@ -119,10 +117,12 @@ void FeedMessageViewer::loadSize() {
 
 void FeedMessageViewer::loadMessageViewerFonts() {
   const Settings *settings = qApp->settings();
-  QWebEngineSettings *view_settings = m_messagesBrowser->view()->settings();
+
+  // TODO: TODO
+  //QWebEngineSettings *view_settings = m_messagesBrowser->view()->settings();
   
-  view_settings->setFontFamily(QWebEngineSettings::StandardFont, settings->value(GROUP(Messages),
-                                                                           SETTING(Messages::PreviewerFontStandard)).toString());
+  //view_settings->setFontFamily(QWebEngineSettings::StandardFont, settings->value(GROUP(Messages),
+  //                                                                         SETTING(Messages::PreviewerFontStandard)).toString());
 }
 
 void FeedMessageViewer::quit() {
@@ -193,7 +193,6 @@ void FeedMessageViewer::updateMessageButtonsAvailability() {
   form_main->m_ui->m_actionMarkSelectedMessagesAsUnread->setEnabled(atleast_one_message_selected);
   form_main->m_ui->m_actionOpenSelectedMessagesInternally->setEnabled(atleast_one_message_selected);
   form_main->m_ui->m_actionOpenSelectedSourceArticlesExternally->setEnabled(atleast_one_message_selected);
-  form_main->m_ui->m_actionOpenSelectedSourceArticlesInternally->setEnabled(atleast_one_message_selected);
   form_main->m_ui->m_actionSendMessageViaEmail->setEnabled(one_message_selected);
   form_main->m_ui->m_actionSwitchImportanceOfSelectedMessages->setEnabled(atleast_one_message_selected);
 }
@@ -240,7 +239,7 @@ void FeedMessageViewer::createConnections() {
   
   // Message changers.
   connect(m_messagesView, SIGNAL(currentMessagesRemoved()), m_messagesBrowser, SLOT(clear()));
-  connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)), m_messagesBrowser, SLOT(navigateToMessages(QList<Message>)));
+  connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)), this, SLOT(navigateToMessages(QList<Message>)));
   connect(m_messagesView, SIGNAL(currentMessagesRemoved()), this, SLOT(updateMessageButtonsAvailability()));
   connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)), this, SLOT(updateMessageButtonsAvailability()));
   
@@ -283,8 +282,6 @@ void FeedMessageViewer::createConnections() {
           SIGNAL(triggered()), m_messagesView, SLOT(markSelectedMessagesUnread()));
   connect(form_main->m_ui->m_actionOpenSelectedSourceArticlesExternally,
           SIGNAL(triggered()), m_messagesView, SLOT(openSelectedSourceMessagesExternally()));
-  connect(form_main->m_ui->m_actionOpenSelectedSourceArticlesInternally,
-          SIGNAL(triggered()), m_messagesView, SLOT(openSelectedSourceMessagesInternally()));
   connect(form_main->m_ui->m_actionOpenSelectedMessagesInternally,
           SIGNAL(triggered()), m_messagesView, SLOT(openSelectedMessagesInternally()));
   connect(form_main->m_ui->m_actionSendMessageViaEmail,
@@ -352,10 +349,7 @@ void FeedMessageViewer::initialize() {
   m_toolBarMessages->setMovable(false);
   m_toolBarMessages->setAllowedAreas(Qt::TopToolBarArea);
   m_toolBarMessages->loadChangeableActions();
-  
-  // Finish web/message browser setup.
-  m_messagesBrowser->setNavigationBarVisible(false);
-  
+   
   // Now refresh visual setup.
   refreshVisualProperties();
 }
@@ -444,6 +438,43 @@ void FeedMessageViewer::refreshVisualProperties() {
   m_toolBarMessages->setToolButtonStyle(button_style);
 }
 
+void FeedMessageViewer::navigateToMessages(const QList<Message> &messages) {
+  Skin skin = qApp->skins()->currentSkin();
+  QString messages_layout;
+  QString single_message_layout = skin.m_layoutMarkup;
+
+  foreach (const Message &message, messages) {
+    QString enclosures;
+
+    foreach (const Enclosure &enclosure, message.m_enclosures) {
+      enclosures += skin.m_enclosureMarkup.arg(enclosure.m_url);
+
+      if (!enclosure.m_mimeType.isEmpty()) {
+        enclosures += QL1S(" [") + enclosure.m_mimeType + QL1S("]");
+      }
+
+      enclosures += QL1S("<br>");
+    }
+
+    if (!enclosures.isEmpty()) {
+      enclosures = enclosures.prepend(QSL("<br>"));
+    }
+
+    messages_layout.append(single_message_layout.arg(message.m_title,
+                                                     tr("Written by ") + (message.m_author.isEmpty() ?
+                                                                            tr("unknown author") :
+                                                                            message.m_author),
+                                                     message.m_url,
+                                                     message.m_contents,
+                                                     message.m_created.toString(Qt::DefaultLocaleShortDate),
+                                                     enclosures));
+  }
+
+  QString layout_wrapper = skin.m_layoutMarkupWrapper.arg(messages.size() == 1 ? messages.at(0).m_title : tr("Newspaper view"), messages_layout);
+
+  m_messagesBrowser->setHtml(layout_wrapper);
+}
+
 void FeedMessageViewer::onFeedsUpdateFinished() {
   m_messagesView->reloadSelections(true);
 }
diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h
index a5288997c..90213b851 100755
--- a/src/gui/feedmessageviewer.h
+++ b/src/gui/feedmessageviewer.h
@@ -23,6 +23,8 @@
 #include "core/messagesmodel.h"
 #include "core/feeddownloader.h"
 
+#include <QTextBrowser>
+
 
 class WebBrowser;
 class MessagesView;
@@ -44,7 +46,7 @@ class FeedMessageViewer : public TabContent {
 
     // WebBrowser getter from TabContent interface.
     inline WebBrowser *webBrowser() const {
-      return m_messagesBrowser;
+      return NULL;
     }
 
     // FeedsView getter.
@@ -93,6 +95,8 @@ class FeedMessageViewer : public TabContent {
     // Reloads some changeable visual settings.
     void refreshVisualProperties();
 
+    void navigateToMessages(const QList<Message> &messages);
+
   private slots:
     // Called when feed update finishes.
     void onFeedsUpdateFinished();
@@ -131,7 +135,7 @@ class FeedMessageViewer : public TabContent {
     FeedsView *m_feedsView;
     QWidget *m_feedsWidget;
     QWidget *m_messagesWidget;
-    WebBrowser *m_messagesBrowser;
+    QTextBrowser *m_messagesBrowser;
 };
 
 #endif // FEEDMESSAGEVIEWER_H
diff --git a/src/gui/locationlineedit.cpp b/src/gui/locationlineedit.cpp
deleted file mode 100755
index 134c78379..000000000
--- a/src/gui/locationlineedit.cpp
+++ /dev/null
@@ -1,53 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "gui/locationlineedit.h"
-
-#include "network-web/googlesuggest.h"
-
-#include <QMouseEvent>
-
-
-LocationLineEdit::LocationLineEdit(QWidget *parent)
-  : BaseLineEdit(parent), m_mouseSelectsAllText(true), m_googleSuggest(new GoogleSuggest(this)) {
-  setPlaceholderText(tr("Website address goes here"));
-  connect(this, SIGNAL(submitted(QString)), m_googleSuggest, SLOT(preventSuggest()));
-}
-
-LocationLineEdit::~LocationLineEdit() {
-}
-
-void LocationLineEdit::focusOutEvent(QFocusEvent *event) {
-  BaseLineEdit::focusOutEvent(event);
-
-  // User now left text box, when he enters it again and clicks,
-  // then all text should be selected.
-  m_mouseSelectsAllText = true;
-}
-
-void LocationLineEdit::mousePressEvent(QMouseEvent *event) {
-  if (m_mouseSelectsAllText) {
-    event->ignore();
-    selectAll();
-
-    // User clicked and all text was selected.
-    m_mouseSelectsAllText = false;
-  }
-  else {
-    BaseLineEdit::mousePressEvent(event);
-  }
-}
diff --git a/src/gui/locationlineedit.h b/src/gui/locationlineedit.h
deleted file mode 100755
index 7fbe4ae8f..000000000
--- a/src/gui/locationlineedit.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef LOCATIONLINEEDIT_H
-#define LOCATIONLINEEDIT_H
-
-#include "gui/baselineedit.h"
-
-
-class WebBrowser;
-class GoogleSuggest;
-
-class LocationLineEdit : public BaseLineEdit {
-    Q_OBJECT
-
-  public:
-    // Constructors and destructors.
-    explicit LocationLineEdit(QWidget *parent = 0);
-    virtual ~LocationLineEdit();
-
-  protected:
-    void focusOutEvent(QFocusEvent *event);
-    void mousePressEvent(QMouseEvent *event);
-
-  private:
-    bool m_mouseSelectsAllText;
-    GoogleSuggest *m_googleSuggest;
-};
-
-#endif // LOCATIONLINEEDIT_H
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 8ff574b03..bd98d093e 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -51,7 +51,7 @@ MessagesView::~MessagesView() {
 }
 
 void MessagesView::createConnections() {
-  connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(openSelectedSourceMessagesInternallyNoNewTab()));
+  connect(this, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(openSelectedSourceMessagesExternally()));
 
   // Adjust columns when layout gets changed.
   connect(header(), SIGNAL(geometriesChanged()), this, SLOT(adjustColumns()));
@@ -149,7 +149,6 @@ void MessagesView::initializeContextMenu() {
   m_contextMenu->addActions(QList<QAction*>() <<
                             qApp->mainForm()->m_ui->m_actionSendMessageViaEmail <<
                             qApp->mainForm()->m_ui->m_actionOpenSelectedSourceArticlesExternally <<
-                            qApp->mainForm()->m_ui->m_actionOpenSelectedSourceArticlesInternally <<
                             qApp->mainForm()->m_ui->m_actionOpenSelectedMessagesInternally <<
                             qApp->mainForm()->m_ui->m_actionMarkSelectedMessagesAsRead <<
                             qApp->mainForm()->m_ui->m_actionMarkSelectedMessagesAsUnread <<
@@ -181,12 +180,6 @@ void MessagesView::mousePressEvent(QMouseEvent *event) {
       break;
     }
 
-    case Qt::MiddleButton: {
-      // Open selected messages in new tab on mouse middle button click.
-      openSelectedSourceMessagesInternally();
-      break;
-    }
-
     default:
       break;
   }
@@ -256,34 +249,6 @@ void MessagesView::openSelectedSourceMessagesExternally() {
   }
 }
 
-void MessagesView::openSelectedSourceMessagesInternally() {
-  foreach (const QModelIndex &index, selectionModel()->selectedRows()) {
-    const Message message = m_sourceModel->messageAt(m_proxyModel->mapToSource(index).row());
-
-    if (message.m_url.isEmpty()) {
-      MessageBox::show(this,
-                       QMessageBox::Warning,
-                       tr("Meesage without URL"),
-                       tr("Message '%s' does not contain URL.").arg(message.m_title));
-    }
-    else {
-      emit openLinkNewTab(message.m_url);
-    }
-  }
-
-  // Finally, mark opened messages as read.
-  if (!selectionModel()->selectedRows().isEmpty()) {
-    QTimer::singleShot(0, this, SLOT(markSelectedMessagesRead()));
-  }
-}
-
-void MessagesView::openSelectedSourceMessagesInternallyNoNewTab() {
-  if (selectionModel()->selectedRows().size() == 1) {
-    emit openLinkMiniBrowser(
-          m_sourceModel->messageAt(m_proxyModel->mapToSource(selectionModel()->selectedRows().at(0)).row()).m_url);
-  }
-}
-
 void MessagesView::openSelectedMessagesInternally() {
   QList<Message> messages;
 
diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h
index 4e3eb9f4d..d40efa6f1 100755
--- a/src/gui/messagesview.h
+++ b/src/gui/messagesview.h
@@ -59,8 +59,6 @@ class MessagesView : public QTreeView {
 
     // Message manipulators.
     void openSelectedSourceMessagesExternally();
-    void openSelectedSourceMessagesInternally();
-    void openSelectedSourceMessagesInternallyNoNewTab();
     void openSelectedMessagesInternally();
     void sendSelectedMessageViaEmail();
 
diff --git a/src/gui/tabcontent.h b/src/gui/tabcontent.h
index 06a3af685..ec27c5d46 100755
--- a/src/gui/tabcontent.h
+++ b/src/gui/tabcontent.h
@@ -21,8 +21,6 @@
 #include <QWidget>
 
 
-class WebBrowser;
-
 // Base class for all widgets which are placed inside tabs of TabWidget
 class TabContent : public QWidget {
     Q_OBJECT
@@ -43,10 +41,6 @@ class TabContent : public QWidget {
       m_index = index;
     }
 
-    // Obtains instance contained in this TabContent or nullptr.
-    // This can be used for obtaining the menu from the instance and so on.
-    virtual WebBrowser *webBrowser() const = 0;
-
   protected:
     int m_index;
 };
diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp
index 576b40158..babb07e59 100755
--- a/src/gui/tabwidget.cpp
+++ b/src/gui/tabwidget.cpp
@@ -22,7 +22,6 @@
 #include "miscellaneous/settings.h"
 #include "miscellaneous/textfactory.h"
 #include "miscellaneous/iconfactory.h"
-#include "network-web/webbrowser.h"
 #include "gui/tabbar.h"
 #include "gui/feedmessageviewer.h"
 #include "gui/plaintoolbutton.h"
@@ -34,7 +33,6 @@
 
 TabWidget::TabWidget(QWidget *parent) : QTabWidget(parent), m_menuMain(NULL) {
   setTabBar(new TabBar(this));
-  setupCornerButton();
   setupMainMenuButton();
   createConnections();
 }
@@ -43,16 +41,6 @@ TabWidget::~TabWidget() {
   qDebug("Destroying TabWidget instance.");
 }
 
-void TabWidget::setupCornerButton() {
-  m_btnAddTab = new PlainToolButton(this);
-  m_btnAddTab->setAutoRaise(true);
-  m_btnAddTab->setPadding(3);
-  m_btnAddTab->setToolTip(tr("Open new web browser tab."));
-  m_btnAddTab->setIcon(qApp->icons()->fromTheme(QSL("list-add")));
-
-  connect(m_btnAddTab, SIGNAL(clicked()), this, SLOT(addEmptyBrowser()));
-}
-
 void TabWidget::setupMainMenuButton() {
   m_btnMainMenu = new PlainToolButton(this);
   m_btnMainMenu->setAutoRaise(true);
@@ -71,7 +59,6 @@ void TabWidget::openMainMenu() {
     m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuView);
     m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuFeeds);
     m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuMessages);
-    m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuWebBrowser);
     m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuTools);
     m_menuMain->addMenu(qApp->mainForm()->m_ui->m_menuHelp);
   }
@@ -104,17 +91,12 @@ void TabWidget::checkTabBarVisibility() {
 
   if (should_be_visible) {
     setCornerWidget(m_btnMainMenu, Qt::TopLeftCorner);
-    setCornerWidget(m_btnAddTab, Qt::TopRightCorner);
-
     m_btnMainMenu->setVisible(true);
-    m_btnAddTab->setVisible(true);
   }
   else {
     setCornerWidget(0, Qt::TopLeftCorner);
     setCornerWidget(0, Qt::TopRightCorner);
-
     m_btnMainMenu->setVisible(false);
-    m_btnAddTab->setVisible(false);
   }
 
   tabBar()->setVisible(should_be_visible);
@@ -158,13 +140,6 @@ void TabWidget::initializeTabs() {
                                       tr("Feeds"),
                                       TabBar::FeedReader);
   setTabToolTip(index_of_browser, tr("Browse your feeds and messages"));
-
-  if (qApp->settings()->value(GROUP(Browser), SETTING(Browser::RememberBrowserTabs)).toBool()) {
-    foreach (const QString &url, qApp->settings()->value(GROUP(Browser), SETTING(Browser::OpenedBrowserTabs)).toString().split(QL1S("##"),
-                                                                                                                               QString::SkipEmptyParts)) {
-      addBrowser(true, false, QUrl::fromUserInput(url));
-    }
-  }
 }
 
 void TabWidget::setupIcons() {
@@ -175,38 +150,6 @@ void TabWidget::setupIcons() {
     if (tabBar()->tabType(index) == TabBar::FeedReader) {
       setTabIcon(index, qApp->icons()->fromTheme(QSL("folder-feed")));
     }
-    // Other indexes probably contain WebBrowsers.
-    else {
-      const WebBrowser *active_browser = widget(index)->webBrowser();
-
-      if (active_browser != NULL && active_browser->icon().isNull()) {
-        // We found WebBrowser instance of this tab page, which
-        // has no suitable icon, load a new one from the icon theme.
-        setTabIcon(index, qApp->icons()->fromTheme(QSL("text-html")));
-      }
-    }
-  }
-
-  // Setup corner button icon.
-  m_btnAddTab->setIcon(qApp->icons()->fromTheme(QSL("list-add")));
-}
-
-void TabWidget::quit() {
-  if (qApp->settings()->value(GROUP(Browser), SETTING(Browser::RememberBrowserTabs)).toBool()) {
-    QStringList store_urls;
-
-    for (int i = 0; i < count(); i++) {
-      if (tabBar()->tabType(i) == TabBar::Closable) {
-        // We have tab with web browser.
-        QUrl url = widget(i)->webBrowser()->view()->url();
-
-        if (url.isValid() && !url.isEmpty()) {
-          store_urls.append(url.toString());
-        }
-      }
-    }
-
-    qApp->settings()->setValue(GROUP(Browser), Browser::OpenedBrowserTabs, store_urls.join(QSL("##")));
   }
 }
 
@@ -297,66 +240,9 @@ int TabWidget::insertTab(int index, QWidget *widget, const QString &label, const
 }
 
 int TabWidget::addBrowserWithMessages(const QList<Message> &messages) {
-  const int new_index = addBrowser(false, true);
-  WebBrowser *browser = static_cast<WebBrowser*>(widget(new_index));
+  // TODO: TODO - volano kdyz se maji zobrazit zpravy v novinovem nahledu
 
-  browser->setNavigationBarVisible(false);
-  browser->navigateToMessages(messages);
-
-  return new_index;
-}
-
-int TabWidget::addEmptyBrowser() {
-  return addBrowser(false, true);
-}
-
-int TabWidget::addLinkedBrowser(const QString &initial_url) {
-  return addLinkedBrowser(QUrl(initial_url));
-}
-
-int TabWidget::addLinkedBrowser(const QUrl &initial_url) {
-  return addBrowser(qApp->settings()->value(GROUP(Browser), SETTING(Browser::QueueTabs)).toBool(), false, initial_url);
-}
-
-int TabWidget::addBrowser(bool move_after_current, bool make_active, const QUrl &initial_url) {
-  // Create new WebBrowser.
-  WebBrowser *browser = new WebBrowser(this);
-  browser->setupIcons();
-
-  int final_index;
-
-  if (move_after_current) {
-    // Insert web browser after current tab.
-    final_index = insertTab(currentIndex() + 1, browser, qApp->icons()->fromTheme(QSL("text-html")),
-                            tr("Web browser"), TabBar::Closable);
-  }
-  else {
-    // Add new browser as the last tab.
-    final_index = addTab(browser, qApp->icons()->fromTheme(QSL("text-html")),
-                         //: Web browser default tab title.
-                         tr("Web browser"),
-                         TabBar::Closable);
-  }
-
-  // Make connections.
-  connect(browser, SIGNAL(titleChanged(int,QString)), this, SLOT(changeTitle(int,QString)));
-  connect(browser, SIGNAL(iconChanged(int,QIcon)), this, SLOT(changeIcon(int,QIcon)));
-
-  // Setup the tab index.
-  browser->setIndex(final_index);
-
-  // Load initial web page if desired.
-  if (initial_url.isValid()) {
-    browser->navigateToUrl(initial_url);
-  }
-
-  // Make new web browser active if desired.
-  if (make_active) {
-    setCurrentIndex(final_index);
-    browser->setFocus(Qt::OtherFocusReason);
-  }
-
-  return final_index;
+  return 0; /* new index */
 }
 
 void TabWidget::changeIcon(int index, const QIcon &new_icon) {
diff --git a/src/gui/tabwidget.h b/src/gui/tabwidget.h
index 717175c38..cb09a1e1d 100755
--- a/src/gui/tabwidget.h
+++ b/src/gui/tabwidget.h
@@ -75,14 +75,11 @@ class TabWidget : public QTabWidget {
       return m_feedMessageViewer;
     }
 
-    void quit();
-
   protected:
     // Creates necesary connections.
     void createConnections();
 
     // Sets up properties of custom corner button.
-    void setupCornerButton();
     void setupMainMenuButton();
 
     // Handlers of insertin/removing of tabs.
@@ -116,19 +113,7 @@ class TabWidget : public QTabWidget {
     // Open single or multiple (newspaper mode) messages in new tab.
     int addBrowserWithMessages(const QList<Message> &messages);
 
-    // Adds new WebBrowser tab to global TabWidget.
-    int addEmptyBrowser();
-
-    // Adds new WebBrowser with link. This is used when user
-    // selects to "Open link in new tab.".
-    int addLinkedBrowser(const QUrl &initial_url = QUrl());
-    int addLinkedBrowser(const QString &initial_url);
-
-    // General method for adding WebBrowsers.
-    int addBrowser(bool move_after_current, bool make_active, const QUrl &initial_url = QUrl());
-
   private:
-    PlainToolButton *m_btnAddTab;
     PlainToolButton *m_btnMainMenu;
     QMenu *m_menuMain;
     FeedMessageViewer *m_feedMessageViewer;
diff --git a/src/main.cpp b/src/main.cpp
index 7eb6c2317..b74bf92c0 100755
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -36,7 +36,6 @@
 #include <QTranslator>
 #include <QDebug>
 #include <QTimer>
-#include <QWebEngineProfile>
 
 
 int main(int argc, char *argv[]) {
@@ -134,10 +133,6 @@ int main(int argc, char *argv[]) {
     QTimer::singleShot(STARTUP_UPDATE_DELAY, application.system(), SLOT(checkForUpdatesOnStartup()));
   }
 
-  // Make sure that all download requests from web views are handled.
-  QObject::connect(QWebEngineProfile::defaultProfile(), SIGNAL(downloadRequested(QWebEngineDownloadItem*)),
-                   qApp->downloadManager(), SLOT(download(QWebEngineDownloadItem*)));
-
   // Enter global event loop.
   return Application::exec();
 }
diff --git a/src/miscellaneous/application.cpp b/src/miscellaneous/application.cpp
index 4345e886d..0b58466ca 100755
--- a/src/miscellaneous/application.cpp
+++ b/src/miscellaneous/application.cpp
@@ -281,7 +281,6 @@ void Application::onAboutToQuit() {
   system()->removeTrolltechJunkRegistryKeys();
 #endif
 
-  mainForm()->tabWidget()->quit();
   mainForm()->tabWidget()->feedMessageViewer()->quit();
   database()->saveDatabase();
   mainForm()->saveSize();
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index ba4009a54..b8c8a16cd 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -22,9 +22,7 @@
 #include <QDebug>
 #include <QDir>
 #include <QPointer>
-#include <QWebEngineSettings>
 #include <QLocale>
-#include <QWebEngineProfile>
 
 
 // Feeds.
@@ -238,21 +236,6 @@ DKEY Keyboard::ID = "keyboard";
 // Web browser.
 DKEY Browser::ID                            = "browser";
 
-DKEY Browser::JavascriptEnabled             = "enable_javascript";
-DVALUE(bool) Browser::JavascriptEnabledDef  = true;
-
-DKEY Browser::ImagesEnabled                 = "enable_images";
-DVALUE(bool) Browser::ImagesEnabledDef      = true;
-
-DKEY Browser::PluginsEnabled                = "enable_plugins";
-DVALUE(bool) Browser::PluginsEnabledDef     = false;
-
-DKEY Browser::RememberBrowserTabs                 = "remember_browser_tabs";
-DVALUE(bool)Browser::RememberBrowserTabsDef       = false;
-
-DKEY Browser::OpenedBrowserTabs                 = "opened_browser_tabs";
-DVALUE(QString)Browser::OpenedBrowserTabsDef    = QString();
-
 DKEY Browser::CustomExternalBrowserEnabled                = "custom_external_browser";
 DVALUE(bool) Browser::CustomExternalBrowserEnabledDef     = false;
 
@@ -271,8 +254,6 @@ DVALUE(QString) Browser::CustomExternalEmailExecutableDef   = QString();
 DKEY Browser::CustomExternalEmailArguments                = "external_email_arguments";
 DVALUE(char*) Browser::CustomExternalEmailArgumentsDef    = "";
 
-DKEY Browser::QueueTabs             = "queue_tabs";
-DVALUE(bool) Browser::QueueTabsDef  = true;
 
 // Categories.
 DKEY CategoriesExpandStates::ID                         = "categories_expand_states";
@@ -280,7 +261,7 @@ DKEY CategoriesExpandStates::ID                         = "categories_expand_sta
 Settings::Settings(const QString &file_name, Format format, const SettingsProperties::SettingsType &status, QObject *parent)
   : QSettings(file_name, format, parent), m_initializationStatus(status) {
   // Perform last-minute initializations.
-  Messages::PreviewerFontStandardDef = QWebEngineSettings::globalSettings()->fontFamily(QWebEngineSettings::StandardFont);
+  Messages::PreviewerFontStandardDef = qApp->font().family();
 }
 
 Settings::~Settings() {  
diff --git a/src/miscellaneous/settings.h b/src/miscellaneous/settings.h
index ed5113e8f..68e7d3cdc 100755
--- a/src/miscellaneous/settings.h
+++ b/src/miscellaneous/settings.h
@@ -267,21 +267,6 @@ namespace Keyboard {
 namespace Browser {
   KEY ID;
 
-  KEY JavascriptEnabled;
-  VALUE(bool) JavascriptEnabledDef;
-
-  KEY ImagesEnabled;
-  VALUE(bool) ImagesEnabledDef;
-
-  KEY PluginsEnabled;
-  VALUE(bool) PluginsEnabledDef;
-
-  KEY RememberBrowserTabs;
-  VALUE(bool)RememberBrowserTabsDef;
-
-  KEY OpenedBrowserTabs;
-  VALUE(QString)OpenedBrowserTabsDef;
-
   KEY CustomExternalBrowserEnabled;
   VALUE(bool) CustomExternalBrowserEnabledDef;
 
@@ -299,9 +284,6 @@ namespace Browser {
 
   KEY CustomExternalEmailArguments;
   VALUE(char*) CustomExternalEmailArgumentsDef;
-
-  KEY QueueTabs;
-  VALUE(bool) QueueTabsDef;
 }
 
 // Categories.
diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp
index 51dfb3ab8..6bb4d3c36 100755
--- a/src/network-web/downloadmanager.cpp
+++ b/src/network-web/downloadmanager.cpp
@@ -38,8 +38,6 @@
 #include <QProcess>
 #include <QSettings>
 #include <QDebug>
-#include <QWebEngineSettings>
-#include <QWebEngineDownloadItem>
 
 
 DownloadItem::DownloadItem(bool is_direct_download, QNetworkReply *reply, QWidget *parent) : QWidget(parent),
@@ -513,10 +511,6 @@ void DownloadManager::download(const QUrl &url, bool direct_download) {
   download(QNetworkRequest(url), direct_download);
 }
 
-void DownloadManager::download(QWebEngineDownloadItem *down) {
-  download(down->url(), true);
-}
-
 void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool direct_download) {
   if (reply == NULL || reply->url().isEmpty()) {
     return;
@@ -832,7 +826,3 @@ QMimeData *DownloadModel::mimeData(const QModelIndexList &indexes) const {
   mimeData->setUrls(urls);
   return mimeData;
 }
-
-WebBrowser *DownloadManager::webBrowser() const {
-  return NULL;
-}
diff --git a/src/network-web/downloadmanager.h b/src/network-web/downloadmanager.h
index 75a1af274..395f8fa05 100755
--- a/src/network-web/downloadmanager.h
+++ b/src/network-web/downloadmanager.h
@@ -32,7 +32,6 @@ class AutoSaver;
 class DownloadModel;
 class QFileIconProvider;
 class QMimeData;
-class QWebEngineDownloadItem;
 
 class DownloadItem : public QWidget {
     Q_OBJECT
@@ -109,7 +108,6 @@ class DownloadManager : public TabContent {
     explicit DownloadManager(QWidget *parent = 0);
     virtual ~DownloadManager();
 
-    WebBrowser *webBrowser() const;
     QNetworkAccessManager *networkManager() const;
 
     int totalDownloads() const;
@@ -128,7 +126,6 @@ class DownloadManager : public TabContent {
   public slots:
     void download(const QNetworkRequest &request, bool direct_download = false);
     void download(const QUrl &url, bool direct_download = false);
-    void download(QWebEngineDownloadItem *down);
     void handleUnsupportedContent(QNetworkReply *reply, bool direct_download = false);
     void cleanup();
 
diff --git a/src/network-web/googlesuggest.cpp b/src/network-web/googlesuggest.cpp
deleted file mode 100755
index 4a914f9ac..000000000
--- a/src/network-web/googlesuggest.cpp
+++ /dev/null
@@ -1,204 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-// 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 Digia Plc and its Subsidiary(-ies) 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."
-
-#include "network-web/googlesuggest.h"
-
-#include "definitions/definitions.h"
-#include "network-web/silentnetworkaccessmanager.h"
-#include "gui/locationlineedit.h"
-
-#include <QListWidget>
-#include <QXmlStreamReader>
-#include <QTimer>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QKeyEvent>
-#include <QDomDocument>
-#include <QTextCodec>
-
-
-GoogleSuggest::GoogleSuggest(LocationLineEdit *editor, QObject *parent)
-  : QObject(parent), editor(editor), popup(new QListWidget()), m_enteredText(QString()) {
-  popup->setWindowFlags(Qt::Popup);
-  popup->setFocusPolicy(Qt::NoFocus);
-  popup->setFocusProxy(editor);
-  popup->setMouseTracking(true);
-  popup->setSelectionBehavior(QAbstractItemView::SelectRows);
-  popup->setFrameStyle(QFrame::Box | QFrame::Plain);
-  popup->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  popup->installEventFilter(this);
-
-  timer = new QTimer(this);
-  timer->setSingleShot(true);
-  timer->setInterval(500);
-
-  connect(popup.data(), SIGNAL(itemClicked(QListWidgetItem*)), SLOT(doneCompletion()));
-  connect(timer, SIGNAL(timeout()), SLOT(autoSuggest()));
-  connect(editor, SIGNAL(textEdited(QString)), timer, SLOT(start()));
-}
-
-GoogleSuggest::~GoogleSuggest() {
-}
-
-bool GoogleSuggest::eventFilter(QObject *object, QEvent *event) {
-  if (object != popup.data()) {
-    return false;
-  }
-
-  if (event->type() == QEvent::MouseButtonPress) {
-    popup->hide();
-    editor->setFocus();
-    return true;
-  }
-
-  if (event->type() == QEvent::KeyPress) {
-    bool consumed = false;
-    const int key = static_cast<QKeyEvent*>(event)->key();
-
-    switch (key) {
-      case Qt::Key_Enter:
-      case Qt::Key_Return:
-        doneCompletion();
-        consumed = true;
-
-      case Qt::Key_Escape:
-        editor->setFocus();
-        popup->hide();
-        consumed = true;
-
-      case Qt::Key_Up:
-      case Qt::Key_Down:
-      case Qt::Key_Home:
-      case Qt::Key_End:
-      case Qt::Key_PageUp:
-      case Qt::Key_PageDown:
-        break;
-
-      default:
-        editor->setFocus();
-        editor->event(event);
-        popup->hide();
-        break;
-    }
-
-    return consumed;
-  }
-
-  return false;
-}
-
-void GoogleSuggest::showCompletion(const QStringList &choices) {
-  if (choices.isEmpty()) {
-    return;
-  }
-
-  popup->setUpdatesEnabled(false);
-  popup->clear();
-
-  foreach (const QString &choice, choices) {
-    new QListWidgetItem(choice, popup.data());
-  }
-
-  popup->setCurrentItem(popup->item(0));
-  popup->adjustSize();
-  popup->setUpdatesEnabled(true);
-  popup->resize(editor->width(), popup->sizeHintForRow(0) * qMin(7, choices.count()) + 3);
-  popup->move(editor->mapToGlobal(QPoint(0, editor->height())));
-  popup->setFocus();
-  popup->show();
-}
-
-void GoogleSuggest::doneCompletion() {
-  timer->stop();
-  popup->hide();
-  editor->setFocus();
-
-  QListWidgetItem *item = popup->currentItem();
-
-  if (item != NULL) {
-    editor->submit(QString(GOOGLE_SEARCH_URL).arg(item->text()));
-  }
-}
-
-void GoogleSuggest::preventSuggest() {
-  timer->stop();
-}
-
-void GoogleSuggest::autoSuggest() {
-  m_enteredText = QUrl::toPercentEncoding(editor->text());
-  QString url = QString(GOOGLE_SUGGEST_URL).arg(m_enteredText);
-
-  connect(SilentNetworkAccessManager::instance()->get(QNetworkRequest(QString(url))), SIGNAL(finished()),
-          this, SLOT(handleNetworkData()));
-}
-
-void GoogleSuggest::handleNetworkData() {
-  QScopedPointer<QNetworkReply> reply(static_cast<QNetworkReply*>(sender()));
-
-  if (!reply->error()) {
-    QStringList choices;
-    QDomDocument xml;
-    QByteArray response = reply->readAll();
-
-    const QTextCodec *c = QTextCodec::codecForUtfText(response);
-    xml.setContent(c->toUnicode(response));
-
-    QDomNodeList suggestions = xml.elementsByTagName(QSL("suggestion"));
-
-    for (int i = 0; i < suggestions.size(); i++) {
-      const QDomElement element = suggestions.at(i).toElement();
-
-      if (element.attributes().contains(QSL("data"))) {
-        choices.append(element.attribute(QSL("data")));
-      }
-    }
-
-    if (choices.isEmpty()) {
-      choices.append(m_enteredText);
-    }
-
-    showCompletion(choices);
-  }
-}
diff --git a/src/network-web/googlesuggest.h b/src/network-web/googlesuggest.h
deleted file mode 100755
index 5c07a794b..000000000
--- a/src/network-web/googlesuggest.h
+++ /dev/null
@@ -1,82 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-// 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 Digia Plc and its Subsidiary(-ies) 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."
-
-#ifndef GOOGLESUGGEST_H
-#define GOOGLESUGGEST_H
-
-#include <QObject>
-
-
-class LocationLineEdit;
-class QNetworkReply;
-class QTimer;
-class QListWidget;
-class QNetworkAccessManager;
-
-class GoogleSuggest : public QObject {
-    Q_OBJECT
-
-  public:
-    // Constructors.
-    explicit GoogleSuggest(LocationLineEdit *editor, QObject *parent = 0);
-    virtual ~GoogleSuggest();
-
-    bool eventFilter(QObject *object, QEvent *event);
-    void showCompletion(const QStringList &choices);
-
-  public slots:
-    void doneCompletion();
-    void preventSuggest();
-    void autoSuggest();
-    void handleNetworkData();
-
-  private:
-    LocationLineEdit *editor;
-    QScopedPointer<QListWidget> popup;
-    QTimer *timer;
-    QString m_enteredText;
-};
-
-#endif // GOOGLESUGGEST_H
diff --git a/src/network-web/webbrowser.cpp b/src/network-web/webbrowser.cpp
deleted file mode 100755
index 79e3942c6..000000000
--- a/src/network-web/webbrowser.cpp
+++ /dev/null
@@ -1,328 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/webbrowser.h"
-
-#include "definitions/definitions.h"
-#include "network-web/webview.h"
-#include "network-web/networkfactory.h"
-#include "miscellaneous/skinfactory.h"
-#include "gui/dialogs/formmain.h"
-#include "gui/tabwidget.h"
-#include "gui/feedmessageviewer.h"
-#include "gui/feedsview.h"
-#include "services/standard/standardserviceroot.h"
-
-#include <QVBoxLayout>
-#include <QHBoxLayout>
-#include <QToolBar>
-#include <QAction>
-#include <QWebEnginePage>
-#include <QWidgetAction>
-#include <QSlider>
-#include <QLabel>
-#include <QProgressBar>
-#include <QToolButton>
-#include <QClipboard>
-
-
-QList<WebBrowser*> WebBrowser::m_runningWebBrowsers;
-
-WebBrowser::WebBrowser(QWidget *parent)
-  : TabContent(parent),
-    m_layout(new QVBoxLayout(this)),
-    m_toolBar(new QToolBar(tr("Navigation panel"), this)),
-    m_webView(new WebView(this)),
-    m_txtLocation(new LocationLineEdit(this)),
-    m_actionBack(m_webView->pageAction(QWebEnginePage::Back)),
-    m_actionForward(m_webView->pageAction(QWebEnginePage::Forward)),
-    m_actionReload(m_webView->pageAction(QWebEnginePage::Reload)),
-    m_actionStop(m_webView->pageAction(QWebEnginePage::Stop)) {
-  // Add this new instance to the global list of web browsers.
-  // NOTE: This is used primarily for dynamic icon theme switching.
-  m_runningWebBrowsers.append(this);
-
-  // Initialize the components and layout.
-  initializeLayout();
-
-  setTabOrder(m_txtLocation, m_toolBar);
-  setTabOrder(m_toolBar, m_webView);
-
-  createConnections();
-  initializeZoomWidget();
-}
-
-void WebBrowser::initializeZoomWidget() {
-  // Initializations.
-  m_zoomButtons = new QWidget(this);
-  QLabel *zoom_label = new QLabel(tr("Zoom  "), m_zoomButtons);
-  QHBoxLayout *layout = new QHBoxLayout(m_zoomButtons);
-  QToolButton *button_decrease = new QToolButton(m_zoomButtons);
-  m_btnResetZoom = new QToolButton(m_zoomButtons);
-  QToolButton *button_increase = new QToolButton(m_zoomButtons);
-
-  // Set texts.
-  button_decrease->setText(QSL("-"));
-  button_decrease->setToolTip(tr("Decrease zoom."));
-  m_btnResetZoom->setText(QSL("100%"));
-  m_btnResetZoom->setToolTip(tr("Reset zoom to default."));
-  button_increase->setText(QSL("+"));
-  button_increase->setToolTip(tr("Increase zoom."));
-
-  // Setup layout.
-  layout->addWidget(zoom_label);
-  layout->addWidget(button_decrease);
-  layout->addWidget(m_btnResetZoom);
-  layout->addWidget(button_increase);
-  layout->setSpacing(2);
-  layout->setMargin(3);
-  m_zoomButtons->setLayout(layout);
-
-  // Make connections.
-  connect(button_increase, SIGNAL(clicked()), this, SLOT(increaseZoom()));
-  connect(button_decrease, SIGNAL(clicked()), this, SLOT(decreaseZoom()));
-  connect(m_btnResetZoom, SIGNAL(clicked()), this, SLOT(resetZoom()));
-
-  m_actionZoom = new QWidgetAction(this);
-  m_actionZoom->setDefaultWidget(m_zoomButtons);
-}
-
-void WebBrowser::initializeLayout() {
-  m_toolBar->setFloatable(false);
-  m_toolBar->setMovable(false);
-  m_toolBar->setAllowedAreas(Qt::TopToolBarArea);
-
-  // Modify action texts.
-  m_actionBack->setText(tr("Back"));
-  m_actionBack->setToolTip(tr("Go back."));
-  m_actionForward->setText(tr("Forward"));
-  m_actionForward->setToolTip(tr("Go forward."));
-  m_actionReload->setText(tr("Reload"));
-  m_actionReload->setToolTip(tr("Reload current web page."));
-  m_actionStop->setText(tr("Stop"));
-  m_actionStop->setToolTip(tr("Stop web page loading."));
-
-  m_btnDiscoverFeeds = new DiscoverFeedsButton(this);
-
-  QWidgetAction *act_discover = new QWidgetAction(this);
-
-  act_discover->setDefaultWidget(m_btnDiscoverFeeds);
-
-  // Add needed actions into toolbar.
-  m_toolBar->addAction(m_actionBack);
-  m_toolBar->addAction(m_actionForward);
-  m_toolBar->addAction(m_actionReload);
-  m_toolBar->addAction(m_actionStop);
-  m_toolBar->addAction(act_discover);
-  m_toolBar->addWidget(m_txtLocation);
-
-  m_loadingWidget = new QWidget(this);
-  m_loadingWidget->setFixedHeight(15);
-
-  // Initialize dynamic progress bar which will be displayed
-  // at the bottom of web browser.
-  m_lblProgress = new QLabel(this);
-  m_loadingProgress = new QProgressBar(this);
-  m_loadingProgress->setFixedHeight(15);
-  m_loadingProgress->setMinimum(0);
-  m_loadingProgress->setTextVisible(false);
-  m_loadingProgress->setMaximum(100);
-  m_loadingProgress->setAttribute(Qt::WA_TranslucentBackground);
-
-  m_loadingLayout = new QHBoxLayout();
-  m_loadingLayout->setMargin(0);
-  m_loadingLayout->addWidget(m_lblProgress, 0, Qt::AlignVCenter);
-  m_loadingLayout->addWidget(m_loadingProgress, 1, Qt::AlignVCenter);
-  m_loadingWidget->setLayout(m_loadingLayout);
-
-  // Setup layout.
-  m_layout->addWidget(m_toolBar);
-  m_layout->addWidget(m_webView);
-  m_layout->addWidget(m_loadingWidget);
-  m_layout->setMargin(0);
-  m_layout->setSpacing(0);
-
-  m_loadingWidget->hide();
-}
-
-void WebBrowser::onLoadingStarted() {
-  m_loadingProgress->setValue(0);
-  m_loadingWidget->show();
-  m_btnDiscoverFeeds->setEnabled(false);
-}
-
-void WebBrowser::onLoadingProgress(int progress) {
-  m_loadingProgress->setValue(progress);
-}
-
-void WebBrowser::onLoadingFinished(bool success) {
-  if (success) {
-    m_webView->page()->toHtml([this](const QString &html) {
-      this->m_btnDiscoverFeeds->setFeedAddresses(NetworkFactory::extractFeedLinksFromHtmlPage(m_webView->url(), html));
-    });
-  }
-  else {
-    m_btnDiscoverFeeds->clearFeedAddresses();
-  }
-
-  m_loadingWidget->hide();
-}
-
-void WebBrowser::createConnections() {
-  // When user confirms new url, then redirect to it.
-  connect(m_txtLocation,SIGNAL(submitted(QString)), this, SLOT(navigateToUrl(QString)));
-  // If new page loads, then update current url.
-  connect(m_webView, SIGNAL(urlChanged(QUrl)), this, SLOT(updateUrl(QUrl)));
-
-  // Connect this WebBrowser to global TabWidget.
-  TabWidget *tab_widget = qApp->mainForm()->tabWidget();
-
-  // Change location textbox status according to webpage status.
-  connect(m_webView, SIGNAL(loadStarted()), this, SLOT(onLoadingStarted()));
-  connect(m_webView, SIGNAL(loadProgress(int)), this, SLOT(onLoadingProgress(int)));
-  connect(m_webView, SIGNAL(loadFinished(bool)), this, SLOT(onLoadingFinished(bool)));
-
-  // Forward title/icon changes.
-  connect(m_webView, SIGNAL(titleChanged(QString)), this, SLOT(onTitleChanged(QString)));
-  connect(m_webView, SIGNAL(iconUrlChanged(QUrl)), this, SLOT(onIconChanged()));
-}
-
-void WebBrowser::onIconChanged() {
-  emit iconChanged(m_index, icon());
-}
-
-void WebBrowser::onTitleChanged(const QString &new_title) {
-  if (new_title.isEmpty()) {
-    //: Webbrowser tab title when no title is available.
-    emit titleChanged(m_index, tr("No title"));
-  }
-  else {
-    emit titleChanged(m_index, new_title);
-  }
-}
-
-void WebBrowser::updateUrl(const QUrl &url) {
-  QString url_string = url.toString();
-
-  m_txtLocation->setText(url_string);
-  setNavigationBarVisible(url_string != INTERNAL_URL_EMPTY && url_string != INTERNAL_URL_NEWSPAPER);
-}
-
-void WebBrowser::navigateToUrl(const QUrl &url) {
-  if (url.isValid()) {
-    m_webView->load(url);
-  }
-}
-
-void WebBrowser::navigateToMessages(const QList<Message> &messages) {
-  Skin skin = qApp->skins()->currentSkin();
-  QString messages_layout;
-  QString single_message_layout = skin.m_layoutMarkup;
-
-  foreach (const Message &message, messages) {
-    QString enclosures;
-
-    foreach (const Enclosure &enclosure, message.m_enclosures) {
-      enclosures += skin.m_enclosureMarkup.arg(enclosure.m_url);
-
-      if (!enclosure.m_mimeType.isEmpty()) {
-        enclosures += QL1S(" [") + enclosure.m_mimeType + QL1S("]");
-      }
-
-      enclosures += QL1S("<br>");
-    }
-
-    if (!enclosures.isEmpty()) {
-      enclosures = enclosures.prepend(QSL("<br>"));
-    }
-
-    messages_layout.append(single_message_layout.arg(message.m_title,
-                                                     tr("Written by ") + (message.m_author.isEmpty() ?
-                                                                            tr("unknown author") :
-                                                                            message.m_author),
-                                                     message.m_url,
-                                                     message.m_contents,
-                                                     message.m_created.toString(Qt::DefaultLocaleShortDate),
-                                                     enclosures));
-  }
-
-  QString layout_wrapper = skin.m_layoutMarkupWrapper.arg(messages.size() == 1 ? messages.at(0).m_title : tr("Newspaper view"), messages_layout);
-
-  m_webView->setHtml(layout_wrapper, QUrl(INTERNAL_URL_NEWSPAPER));
-  emit iconChanged(m_index, qApp->icons()->fromTheme(QSL("item-newspaper")));
-}
-
-void WebBrowser::updateZoomGui() {
-  m_btnResetZoom->setText(QString(QSL("%1%")).arg(QString::number(m_webView->zoomFactor() * 100, 'f', 0)));
-}
-
-void WebBrowser::increaseZoom() {
-  m_webView->increaseWebPageZoom();
-  updateZoomGui();
-}
-
-void WebBrowser::decreaseZoom() {
-  m_webView->decreaseWebPageZoom();
-  updateZoomGui();
-}
-
-void WebBrowser::resetZoom() {
-  m_webView->resetWebPageZoom();
-  updateZoomGui();
-}
-
-void WebBrowser::navigateToUrl(const QString &textual_url) {
-  // Prepare input url.
-  QString better_url = textual_url;
-  better_url = better_url.replace(QL1C('\\'), QL1C('/'));
-
-  navigateToUrl(QUrl::fromUserInput(better_url));
-}
-
-WebBrowser::~WebBrowser() {
-  qDebug("Destroying WebBrowser instance.");
-
-  // Remove this instance from the global list of web browsers.
-  m_runningWebBrowsers.removeAll(this);
-
-  // Delete members. Do not use scoped pointers here.
-  delete m_layout;
-  delete m_zoomButtons;
-  delete m_actionZoom;
-}
-
-void WebBrowser::setupIcons() {
-  m_actionBack->setIcon(qApp->icons()->fromTheme(QSL("go-previous")));
-  m_actionForward->setIcon(qApp->icons()->fromTheme(QSL("go-next")));
-  m_actionReload->setIcon(qApp->icons()->fromTheme(QSL("go-refresh")));
-  m_actionStop->setIcon(qApp->icons()->fromTheme(QSL("go-stop")));
-}
-
-QIcon WebBrowser::icon() const {
-  QUrl url = m_webView->iconUrl();
-
-  if (url.isValid()) {
-    QByteArray output;
-    if (NetworkFactory::downloadFile(url.toString(), DOWNLOAD_TIMEOUT, output).first == QNetworkReply::NoError) {
-      QPixmap icon_pixmap;
-      icon_pixmap.loadFromData(output);
-      return QIcon(icon_pixmap);
-    }
-  }
-
-  return QIcon();
-}
diff --git a/src/network-web/webbrowser.h b/src/network-web/webbrowser.h
deleted file mode 100755
index 603b80c2a..000000000
--- a/src/network-web/webbrowser.h
+++ /dev/null
@@ -1,168 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef WEBBROWSER_H
-#define WEBBROWSER_H
-
-#include "gui/tabcontent.h"
-
-#include "core/messagesmodel.h"
-#include "network-web/webview.h"
-#include "gui/locationlineedit.h"
-#include "gui/discoverfeedsbutton.h"
-
-#include <QWidget>
-#include <QWidgetAction>
-#include <QUrl>
-#include <QToolBar>
-
-
-class QToolButton;
-class QVBoxLayout;
-class QHBoxLayout;
-class QProgressBar;
-class QMenu;
-class QLabel;
-class TabWidget;
-
-class WebBrowser : public TabContent {
-    Q_OBJECT
-
-  public:
-    // Constructors and destructors.
-    explicit WebBrowser(QWidget *parent = 0);
-    virtual ~WebBrowser();
-
-    // Reloads icons for all buttons.
-    void setupIcons();
-
-    // Returns icon associated with currently loaded website.
-    QIcon icon() const;
-
-    inline WebView *view() const {
-      return m_webView;
-    }
-
-    // Sets this WebBrowser instance as focused.
-    inline void setFocus(Qt::FocusReason reason) {
-      m_txtLocation->setFocus(reason);
-    }
-
-    // Returns this instance.
-    // NOTE: This is needed due to TabContent interface.
-    inline WebBrowser *webBrowser() const {
-      return const_cast<WebBrowser*>(this);
-    }
-
-    // Returns global menu for this web browser.
-    inline virtual QList<QAction*> globalMenu() const {
-      QList<QAction*> browser_menu;
-
-      // Add needed actions into the menu.
-      browser_menu.append(m_actionZoom);
-
-      return browser_menu;
-    }
-
-    // Returns list of all running web browsers.
-    static inline QList<WebBrowser*> runningWebBrowsers() {
-      return m_runningWebBrowsers;
-    }
-
-  public slots:
-    // Switches visibility of navigation bar.
-    inline void setNavigationBarVisible(bool visible) {
-      m_toolBar->setVisible(visible);
-    }
-
-    // Loads new url into the web browser.
-    void navigateToUrl(const QString &url);
-    void navigateToUrl(const QUrl &url);
-
-    // Navigates to messages, used also as "newspaper" view.
-    void navigateToMessages(const QList<Message> &messages);
-
-    // Clears contents.
-    inline void clear() {
-      if (m_webView->url() != QUrl()) {
-        m_webView->setHtml("<html><body></body></html>", QUrl(INTERNAL_URL_EMPTY));
-      }
-    }
-
-    // Zoom manipulators.
-    void increaseZoom();
-    void decreaseZoom();
-    void resetZoom();
-
-  protected:
-    // Creates necessary connections.
-    void createConnections();
-
-    // Initializes all buttons and widgets, which are needed for "Zoom" menu item.
-    void initializeZoomWidget();
-
-    // Initializes layout.
-    void initializeLayout();
-
-  protected slots:
-    void onLoadingStarted();
-    void onLoadingProgress(int progress);
-    void onLoadingFinished(bool success);
-
-    // Updates zoom-related gui.
-    void updateZoomGui();
-
-    // Updates url (for example on location text box).
-    void updateUrl(const QUrl &url);
-
-    // Title/icon is changed.
-    void onTitleChanged(const QString &new_title);
-    void onIconChanged();
-
-  signals:
-    // User requests opening of new tab or clicks the link
-    // with middle mouse button
-    void newTabRequested();
-    void linkMiddleClicked(const QUrl &link_url);
-
-    // Title/icon is changed.
-    void iconChanged(int index, const QIcon &icon);
-    void titleChanged(int index, const QString &title);
-
-  private:
-    QVBoxLayout *m_layout;
-    QToolBar *m_toolBar;
-    WebView *m_webView;
-    LocationLineEdit *m_txtLocation;
-    QWidget *m_zoomButtons;
-    QToolButton *m_btnResetZoom;
-    QWidget *m_loadingWidget;
-    QHBoxLayout *m_loadingLayout;
-    QProgressBar *m_loadingProgress;
-    QLabel *m_lblProgress;
-    DiscoverFeedsButton *m_btnDiscoverFeeds;
-
-    QWidgetAction *m_actionZoom;
-    QAction *m_actionBack;
-    QAction *m_actionForward;
-    QAction *m_actionReload;
-    QAction *m_actionStop;
-
-    static QList<WebBrowser*> m_runningWebBrowsers;
-};
-
-#endif // WEBBROWSER_H
diff --git a/src/network-web/webfactory.cpp b/src/network-web/webfactory.cpp
index 968481cfe..b68e1501d 100755
--- a/src/network-web/webfactory.cpp
+++ b/src/network-web/webfactory.cpp
@@ -1,9 +1,25 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
 #include "network-web/webfactory.h"
 
 #include "miscellaneous/application.h"
 
 #include <QRegExp>
-#include <QWebEngineSettings>
 #include <QProcess>
 #include <QUrl>
 #include <QDesktopServices>
@@ -13,21 +29,12 @@ QPointer<WebFactory> WebFactory::s_instance;
 
 WebFactory::WebFactory(QObject *parent)
   : QObject(parent), m_escapes(QMap<QString, QString>()),
-    m_deEscapes(QMap<QString, QString>()),
-    m_globalSettings(QWebEngineSettings::globalSettings()) {
+    m_deEscapes(QMap<QString, QString>()) {
 }
 
 WebFactory::~WebFactory() {
 }
 
-void WebFactory::loadState() {
-  const Settings *settings = qApp->settings();
-
-  switchJavascript(settings->value(GROUP(Browser), SETTING(Browser::JavascriptEnabled)).toBool(), false);
-  switchImages(settings->value(GROUP(Browser), SETTING(Browser::ImagesEnabled)).toBool(), false);
-  switchPlugins(settings->value(GROUP(Browser), SETTING(Browser::PluginsEnabled)).toBool(), false);
-}
-
 bool WebFactory::sendMessageViaEmail(const Message &message) {
   if (qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalEmailEnabled)).toBool()) {
     const QString browser = qApp->settings()->value(GROUP(Browser), SETTING(Browser::CustomExternalEmailExecutable)).toString();
@@ -66,33 +73,6 @@ bool WebFactory::openUrlInExternalBrowser(const QString &url) {
   }
 }
 
-void WebFactory::switchJavascript(bool enable, bool save_settings) {
-  if (save_settings) {
-    qApp->settings()->setValue(GROUP(Browser), Browser::JavascriptEnabled, enable);
-  }
-
-  m_globalSettings->setAttribute(QWebEngineSettings::JavascriptEnabled, enable);
-  emit javascriptSwitched(enable);
-}
-
-void WebFactory::switchPlugins(bool enable, bool save_settings) {
-  if (save_settings) {
-    qApp->settings()->setValue(GROUP(Browser), Browser::PluginsEnabled, enable);
-  }
-
-  m_globalSettings->setAttribute(QWebEngineSettings::PluginsEnabled, enable);
-  emit pluginsSwitched(enable);
-}
-
-void WebFactory::switchImages(bool enable, bool save_settings) {
-  if (save_settings) {
-    qApp->settings()->setValue(GROUP(Browser), Browser::ImagesEnabled, enable);
-  }
-
-  m_globalSettings->setAttribute(QWebEngineSettings::AutoLoadImages, enable);
-  emit imagesLoadingSwitched(enable);
-}
-
 WebFactory *WebFactory::instance() {
   if (s_instance.isNull()) {
     s_instance = new WebFactory(qApp);
@@ -101,18 +81,6 @@ WebFactory *WebFactory::instance() {
   return s_instance;
 }
 
-bool WebFactory::javascriptEnabled() const {
-  return m_globalSettings->testAttribute(QWebEngineSettings::JavascriptEnabled);
-}
-
-bool WebFactory::pluginsEnabled() const {
-  return m_globalSettings->testAttribute(QWebEngineSettings::PluginsEnabled);
-}
-
-bool WebFactory::autoloadImages() const {
-  return m_globalSettings->testAttribute(QWebEngineSettings::AutoLoadImages);
-}
-
 QString WebFactory::stripTags(QString text) {
   return text.remove(QRegExp(QSL("<[^>]*>")));
 }
diff --git a/src/network-web/webfactory.h b/src/network-web/webfactory.h
index 922eb6ddc..8a16ad230 100755
--- a/src/network-web/webfactory.h
+++ b/src/network-web/webfactory.h
@@ -1,3 +1,20 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
 #ifndef WEBFACTORY_H
 #define WEBFACTORY_H
 
@@ -18,11 +35,6 @@ class WebFactory : public QObject {
     // Destructor.
     virtual ~WebFactory();
 
-    // Loads the web settings directly from
-    // application settings and notifies the rest of
-    // the world about current situation.
-    void loadState();
-
     // Strips "<....>" (HTML, XML) tags from given text.
     QString stripTags(QString text);
 
@@ -34,11 +46,6 @@ class WebFactory : public QObject {
     // count .co.uk (and others) as second-level domain
     QString toSecondLevelDomain(const QUrl &url);
 
-    // Switchers.
-    bool javascriptEnabled() const;
-    bool pluginsEnabled() const;
-    bool autoloadImages() const;
-
     // Singleton getter.
     static WebFactory *instance();
 
@@ -47,16 +54,6 @@ class WebFactory : public QObject {
     bool openUrlInExternalBrowser(const QString &url);
     bool sendMessageViaEmail(const Message &message);
 
-    // Switchers.
-    void switchJavascript(bool enable, bool save_settings = true);
-    void switchPlugins(bool enable, bool save_settings = true);
-    void switchImages(bool enable, bool save_settings = true);
-
-  signals:
-    void javascriptSwitched(bool enabled);
-    void pluginsSwitched(bool enabled);
-    void imagesLoadingSwitched(bool enabled);
-
   private:
     // Constructor.
     explicit WebFactory(QObject *parent = 0);
@@ -67,7 +64,6 @@ class WebFactory : public QObject {
 
     QMap<QString, QString> m_escapes;
     QMap<QString, QString> m_deEscapes;
-    QWebEngineSettings *m_globalSettings;
 
     // Singleton.
     static QPointer<WebFactory> s_instance;
diff --git a/src/network-web/webview.cpp b/src/network-web/webview.cpp
deleted file mode 100755
index 9e226a548..000000000
--- a/src/network-web/webview.cpp
+++ /dev/null
@@ -1,69 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#include "network-web/webview.h"
-
-#include "definitions/definitions.h"
-
-#include <QWebEnginePage>
-#include <QWheelEvent>
-
-
-WebView::WebView(QWidget *parent)
-  : QWebEngineView(parent), m_page(new QWebEnginePage(this)) {
-  setPage(m_page);
-}
-
-WebView::~WebView() {
-  qDebug("Destroying WebView.");
-}
-
-bool WebView::increaseWebPageZoom() {
-  const qreal new_factor = zoomFactor() + 0.1;
-
-  if (new_factor >= 0.0 && new_factor <= MAX_ZOOM_FACTOR) {
-    setZoomFactor(new_factor);
-    return true;
-  }
-  else {
-    return false;
-  }
-}
-
-bool WebView::decreaseWebPageZoom() {
-  const qreal new_factor = zoomFactor() - 0.1;
-
-  if (new_factor >= 0.0 && new_factor <= MAX_ZOOM_FACTOR) {
-    setZoomFactor(new_factor);
-    return true;
-  }
-  else {
-    return false;
-  }
-}
-
-bool WebView::resetWebPageZoom() {
-  const qreal new_factor = 1.0;
-
-  if (new_factor != zoomFactor()) {
-    setZoomFactor(new_factor);
-    return true;
-  }
-  else {
-    return false;
-  }
-}
diff --git a/src/network-web/webview.h b/src/network-web/webview.h
deleted file mode 100755
index f896d5de6..000000000
--- a/src/network-web/webview.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// This file is part of RSS Guard.
-//
-// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
-//
-// RSS Guard 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 3 of the License, or
-// (at your option) any later version.
-//
-// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
-
-#ifndef BASEWEBVIEW_H
-#define BASEWEBVIEW_H
-
-#include <QWebEngineView>
-
-
-class WebView : public QWebEngineView {
-    Q_OBJECT
-
-  public:
-    // Constructors and destructors.
-    explicit WebView(QWidget *parent = 0);
-    virtual ~WebView();
-
-    // Page accessor.
-    inline QWebEnginePage *page() const {
-      return m_page;
-    }
-
-  public slots:
-    // Page zoom modifiers.
-    bool increaseWebPageZoom();
-    bool decreaseWebPageZoom();
-    bool resetWebPageZoom();
-
-  private:
-    QWebEnginePage *m_page;
-};
-
-#endif // BASEWEBVIEW_H

From 328f29cc5d7d1fa1dad92ad87970462cec2f94ab Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 10:18:35 +0200
Subject: [PATCH 17/31] Cleanups, added previewer.

---
 src/gui/feedmessageviewer.cpp       | 48 ++--------------
 src/gui/feedmessageviewer.h         |  5 +-
 src/gui/messagepreviewer.cpp        | 89 +++++++++++++++++++++++++++++
 src/gui/messagepreviewer.h          | 49 ++++++++++++++++
 src/gui/messagepreviewer.ui         | 61 ++++++++++++++++++++
 src/gui/messagesview.cpp            | 16 +++---
 src/gui/messagesview.h              |  4 +-
 src/gui/tabwidget.cpp               |  1 -
 src/network-web/downloadmanager.cpp | 20 +++----
 src/network-web/downloadmanager.h   |  8 +--
 10 files changed, 230 insertions(+), 71 deletions(-)
 create mode 100644 src/gui/messagepreviewer.cpp
 create mode 100644 src/gui/messagepreviewer.h
 create mode 100644 src/gui/messagepreviewer.ui

diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index e2eb6c532..f6c6f0ea7 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -36,6 +36,7 @@
 #include "gui/messagebox.h"
 #include "gui/messagestoolbar.h"
 #include "gui/feedstoolbar.h"
+#include "gui/messagepreviewer.h"
 #include "gui/dialogs/formdatabasecleanup.h"
 #include "gui/dialogs/formmain.h"
 #include "exceptions/applicationexception.h"
@@ -63,7 +64,7 @@ FeedMessageViewer::FeedMessageViewer(QWidget *parent)
     m_toolBarMessages(new MessagesToolBar(tr("Toolbar for messages"), this)),
     m_messagesView(new MessagesView(this)),
     m_feedsView(new FeedsView(this)),
-    m_messagesBrowser(new QTextBrowser(this)) {
+    m_messagesBrowser(new MessagePreviewer(this)) {
   initialize();
   initializeViews();
   loadMessageViewerFonts();
@@ -238,10 +239,10 @@ void FeedMessageViewer::createConnections() {
   connect(m_toolBarMessages, SIGNAL(messageFilterChanged(MessagesModel::MessageHighlighter)), m_messagesView, SLOT(filterMessages(MessagesModel::MessageHighlighter)));
   
   // Message changers.
-  connect(m_messagesView, SIGNAL(currentMessagesRemoved()), m_messagesBrowser, SLOT(clear()));
-  connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)), this, SLOT(navigateToMessages(QList<Message>)));
-  connect(m_messagesView, SIGNAL(currentMessagesRemoved()), this, SLOT(updateMessageButtonsAvailability()));
-  connect(m_messagesView, SIGNAL(currentMessagesChanged(QList<Message>)), this, SLOT(updateMessageButtonsAvailability()));
+  connect(m_messagesView, SIGNAL(currentMessageRemoved()), m_messagesBrowser, SLOT(clear()));
+  connect(m_messagesView, SIGNAL(currentMessageChanged(Message)), m_messagesBrowser, SLOT(loadMessage(Message)));
+  connect(m_messagesView, SIGNAL(currentMessageRemoved()), this, SLOT(updateMessageButtonsAvailability()));
+  connect(m_messagesView, SIGNAL(currentMessageChanged(Message)), this, SLOT(updateMessageButtonsAvailability()));
   
   connect(m_feedsView, SIGNAL(itemSelected(RootItem*)), this, SLOT(updateFeedButtonsAvailability()));
   connect(qApp->feedUpdateLock(), SIGNAL(locked()), this, SLOT(updateFeedButtonsAvailability()));
@@ -438,43 +439,6 @@ void FeedMessageViewer::refreshVisualProperties() {
   m_toolBarMessages->setToolButtonStyle(button_style);
 }
 
-void FeedMessageViewer::navigateToMessages(const QList<Message> &messages) {
-  Skin skin = qApp->skins()->currentSkin();
-  QString messages_layout;
-  QString single_message_layout = skin.m_layoutMarkup;
-
-  foreach (const Message &message, messages) {
-    QString enclosures;
-
-    foreach (const Enclosure &enclosure, message.m_enclosures) {
-      enclosures += skin.m_enclosureMarkup.arg(enclosure.m_url);
-
-      if (!enclosure.m_mimeType.isEmpty()) {
-        enclosures += QL1S(" [") + enclosure.m_mimeType + QL1S("]");
-      }
-
-      enclosures += QL1S("<br>");
-    }
-
-    if (!enclosures.isEmpty()) {
-      enclosures = enclosures.prepend(QSL("<br>"));
-    }
-
-    messages_layout.append(single_message_layout.arg(message.m_title,
-                                                     tr("Written by ") + (message.m_author.isEmpty() ?
-                                                                            tr("unknown author") :
-                                                                            message.m_author),
-                                                     message.m_url,
-                                                     message.m_contents,
-                                                     message.m_created.toString(Qt::DefaultLocaleShortDate),
-                                                     enclosures));
-  }
-
-  QString layout_wrapper = skin.m_layoutMarkupWrapper.arg(messages.size() == 1 ? messages.at(0).m_title : tr("Newspaper view"), messages_layout);
-
-  m_messagesBrowser->setHtml(layout_wrapper);
-}
-
 void FeedMessageViewer::onFeedsUpdateFinished() {
   m_messagesView->reloadSelections(true);
 }
diff --git a/src/gui/feedmessageviewer.h b/src/gui/feedmessageviewer.h
index 90213b851..518448a98 100755
--- a/src/gui/feedmessageviewer.h
+++ b/src/gui/feedmessageviewer.h
@@ -30,6 +30,7 @@ class WebBrowser;
 class MessagesView;
 class MessagesToolBar;
 class FeedsToolBar;
+class MessagePreviewer;
 class FeedsView;
 class StandardFeed;
 class QToolBar;
@@ -95,8 +96,6 @@ class FeedMessageViewer : public TabContent {
     // Reloads some changeable visual settings.
     void refreshVisualProperties();
 
-    void navigateToMessages(const QList<Message> &messages);
-
   private slots:
     // Called when feed update finishes.
     void onFeedsUpdateFinished();
@@ -135,7 +134,7 @@ class FeedMessageViewer : public TabContent {
     FeedsView *m_feedsView;
     QWidget *m_feedsWidget;
     QWidget *m_messagesWidget;
-    QTextBrowser *m_messagesBrowser;
+    MessagePreviewer *m_messagesBrowser;
 };
 
 #endif // FEEDMESSAGEVIEWER_H
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
new file mode 100644
index 000000000..ef0ef8d25
--- /dev/null
+++ b/src/gui/messagepreviewer.cpp
@@ -0,0 +1,89 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
+#include "gui/messagepreviewer.h"
+
+#include "miscellaneous/application.h"
+#include "network-web/webfactory.h"
+#include "gui/messagebox.h"
+#include "gui/dialogs/formmain.h"
+
+#include <QScrollBar>
+
+
+MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
+  m_ui(new Ui::MessagePreviewer) {
+  m_ui->setupUi(this);
+  m_ui->m_txtMessage->viewport()->setAutoFillBackground(true);
+
+  connect(m_ui->m_txtMessage, &QTextBrowser::anchorClicked, [=](const QUrl &url) {
+    // User clicked some URL. Open it in external browser or download?
+    MessageBox box(qApp->mainForm());
+
+    box.setText(tr("You clicked link \"%1\". You can download the link contents or open it in external web browser.").arg(url.toString()));
+    box.setInformativeText(tr("What action do you want to take?"));
+    QAbstractButton *btn_open = box.addButton(tr("Open in external browser"), QMessageBox::AcceptRole);
+    QAbstractButton *btn_download = box.addButton(tr("Download"), QMessageBox::RejectRole);
+
+    box.exec();
+
+    if (box.clickedButton() == btn_open) {
+      WebFactory::instance()->openUrlInExternalBrowser(url.toString());
+    }
+    else if (box.clickedButton() == btn_download) {
+      qApp->downloadManager()->download(url);
+    }
+  });
+
+  clear();
+}
+
+
+MessagePreviewer::~MessagePreviewer() {
+  delete m_ui;
+}
+
+void MessagePreviewer::clear() {
+  m_ui->m_lblTitle->clear();
+  m_ui->m_txtMessage->clear();
+
+  hide();
+}
+
+void MessagePreviewer::loadMessage(const Message &message) {
+  m_ui->m_lblTitle->setText(message.m_title);
+  m_ui->m_txtMessage->setHtml(prepareHtmlForMessage(message));
+  show();
+
+  m_ui->m_txtMessage->verticalScrollBar()->triggerAction(QScrollBar::SliderToMinimum);
+}
+
+QString MessagePreviewer::prepareHtmlForMessage(const Message &message) {
+  QString html = QString("<p><a href=\"%1\">%1</a><p/>").arg(message.m_url);
+
+  foreach (const Enclosure &enc, message.m_enclosures) {
+    html += QString("<p>[%2] <a href=\"%1\">%1</a><p/>").arg(enc.m_url, enc.m_mimeType);
+  }
+
+  if (!message.m_enclosures.isEmpty()) {
+    html += "<hr/>";
+  }
+
+  html += message.m_contents;
+
+  return html;
+}
diff --git a/src/gui/messagepreviewer.h b/src/gui/messagepreviewer.h
new file mode 100644
index 000000000..eb9dee1d4
--- /dev/null
+++ b/src/gui/messagepreviewer.h
@@ -0,0 +1,49 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef MESSAGEPREVIEWER_H
+#define MESSAGEPREVIEWER_H
+
+#include <QWidget>
+
+#include "ui_messagepreviewer.h"
+
+#include "core/message.h"
+
+
+namespace Ui {
+  class MessagePreviewer;
+}
+
+class MessagePreviewer : public QWidget {
+    Q_OBJECT
+
+  public:
+    explicit MessagePreviewer(QWidget *parent = 0);
+    virtual ~MessagePreviewer();
+
+  public slots:
+    void clear();
+    void loadMessage(const Message &message);
+
+  private:
+    QString prepareHtmlForMessage(const Message &message);
+
+    Ui::MessagePreviewer *m_ui;
+};
+
+#endif // MESSAGEPREVIEWER_H
diff --git a/src/gui/messagepreviewer.ui b/src/gui/messagepreviewer.ui
new file mode 100644
index 000000000..87a091655
--- /dev/null
+++ b/src/gui/messagepreviewer.ui
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MessagePreviewer</class>
+ <widget class="QWidget" name="MessagePreviewer">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>502</width>
+    <height>396</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <property name="autoFillBackground">
+   <bool>true</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QLabel" name="m_lblTitle">
+     <property name="font">
+      <font>
+       <pointsize>18</pointsize>
+      </font>
+     </property>
+     <property name="autoFillBackground">
+      <bool>true</bool>
+     </property>
+     <property name="text">
+      <string>avas</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+     <property name="wordWrap">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QTextBrowser" name="m_txtMessage">
+     <property name="autoFillBackground">
+      <bool>true</bool>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::StyledPanel</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Plain</enum>
+     </property>
+     <property name="openLinks">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index bd98d093e..aa742e39c 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -96,7 +96,7 @@ void MessagesView::reloadSelections(bool mark_current_index_read) {
   else {
     // Messages were probably removed from the model, nothing can
     // be selected and no message can be displayed.
-    emit currentMessagesRemoved();
+    emit currentMessageRemoved();
   }
 }
 
@@ -203,10 +203,10 @@ void MessagesView::selectionChanged(const QItemSelection &selected, const QItemS
       m_sourceModel->setMessageRead(mapped_current_index.row(), RootItem::Read);
     }
 
-    emit currentMessagesChanged(QList<Message>() << message);
+    emit currentMessageChanged(message);
   }
   else {
-    emit currentMessagesRemoved();
+    emit currentMessageRemoved();
   }
 
   if (qApp->settings()->value(GROUP(Messages), SETTING(Messages::KeepCursorInCenter)).toBool()) {
@@ -228,7 +228,7 @@ void MessagesView::loadItem(RootItem *item) {
   // active message is not shown in browser.
   // BUG: Qt 5 is probably bugged here. Selections
   // should be cleared automatically when SQL model is reset.
-  emit currentMessagesRemoved();
+  emit currentMessageRemoved();
 }
 
 void MessagesView::openSelectedSourceMessagesExternally() {
@@ -337,7 +337,7 @@ void MessagesView::deleteSelectedMessages() {
     reselectIndexes(QModelIndexList() << last_item);
   }
   else {
-    emit currentMessagesRemoved();
+    emit currentMessageRemoved();
   }
 }
 
@@ -365,7 +365,7 @@ void MessagesView::restoreSelectedMessages() {
     reselectIndexes(QModelIndexList() << last_item);
   }
   else {
-    emit currentMessagesRemoved();
+    emit currentMessageRemoved();
   }
 }
 
@@ -453,7 +453,7 @@ void MessagesView::searchMessages(const QString &pattern) {
   m_proxyModel->setFilterRegExp(pattern);
 
   if (selectionModel()->selectedRows().size() == 0) {
-    emit currentMessagesRemoved();
+    emit currentMessageRemoved();
   }
   else {
     // Scroll to selected message, it could become scrolled out due to filter change.
@@ -506,5 +506,5 @@ void MessagesView::onSortIndicatorChanged(int column, Qt::SortOrder order) {
 
   // Repopulate the shit.
   m_sourceModel->sort(column, order);
-  emit currentMessagesRemoved();
+  emit currentMessageRemoved();
 }
diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h
index d40efa6f1..2cc069e2a 100755
--- a/src/gui/messagesview.h
+++ b/src/gui/messagesview.h
@@ -95,8 +95,8 @@ class MessagesView : public QTreeView {
     void openMessagesInNewspaperView(const QList<Message> &messages);
 
     // Notify others about message selections.
-    void currentMessagesChanged(const QList<Message> &messages);
-    void currentMessagesRemoved();
+    void currentMessageChanged(const Message &message);
+    void currentMessageRemoved();
 
   private:
     // Creates needed connections.
diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp
index babb07e59..abdca760e 100755
--- a/src/gui/tabwidget.cpp
+++ b/src/gui/tabwidget.cpp
@@ -241,7 +241,6 @@ int TabWidget::insertTab(int index, QWidget *widget, const QString &label, const
 
 int TabWidget::addBrowserWithMessages(const QList<Message> &messages) {
   // TODO: TODO - volano kdyz se maji zobrazit zpravy v novinovem nahledu
-
   return 0; /* new index */
 }
 
diff --git a/src/network-web/downloadmanager.cpp b/src/network-web/downloadmanager.cpp
index 6bb4d3c36..8ec689cde 100755
--- a/src/network-web/downloadmanager.cpp
+++ b/src/network-web/downloadmanager.cpp
@@ -40,16 +40,14 @@
 #include <QDebug>
 
 
-DownloadItem::DownloadItem(bool is_direct_download, QNetworkReply *reply, QWidget *parent) : QWidget(parent),
+DownloadItem::DownloadItem(QNetworkReply *reply, QWidget *parent) : QWidget(parent),
   m_ui(new Ui::DownloadItem), m_reply(reply),
   m_bytesReceived(0), m_requestFileName(false), m_startedSaving(false), m_finishedDownloading(false),
   m_gettingFileName(false), m_canceledFileSelect(false) {
   m_ui->setupUi(this);
   m_ui->m_btnTryAgain->hide();
 
-  m_requestFileName = is_direct_download ?
-                        qApp->settings()->value(GROUP(Downloads), SETTING(Downloads::AlwaysPromptForFilename)).toBool() :
-                        true;
+  m_requestFileName = qApp->settings()->value(GROUP(Downloads), SETTING(Downloads::AlwaysPromptForFilename)).toBool();
 
   connect(m_ui->m_btnStopDownload, SIGNAL(clicked()), this, SLOT(stop()));
   connect(m_ui->m_btnOpenFile, SIGNAL(clicked()), this, SLOT(openFile()));
@@ -501,17 +499,17 @@ int DownloadManager::downloadProgress() const {
   }
 }
 
-void DownloadManager::download(const QNetworkRequest &request, bool direct_download) {
+void DownloadManager::download(const QNetworkRequest &request) {
   if (!request.url().isEmpty()) {
-    handleUnsupportedContent(m_networkManager->get(request), direct_download);
+    handleUnsupportedContent(m_networkManager->get(request));
   }
 }
 
-void DownloadManager::download(const QUrl &url, bool direct_download) {
-  download(QNetworkRequest(url), direct_download);
+void DownloadManager::download(const QUrl &url) {
+  download(QNetworkRequest(url));
 }
 
-void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool direct_download) {
+void DownloadManager::handleUnsupportedContent(QNetworkReply *reply) {
   if (reply == NULL || reply->url().isEmpty()) {
     return;
   }
@@ -524,7 +522,7 @@ void DownloadManager::handleUnsupportedContent(QNetworkReply *reply, bool direct
     return;
   }
 
-  DownloadItem *item = new DownloadItem(direct_download, reply, this);
+  DownloadItem *item = new DownloadItem(reply, this);
   addItem(item);
 
   if (!item->m_canceledFileSelect && qApp->settings()->value(GROUP(Downloads),
@@ -670,7 +668,7 @@ void DownloadManager::load() {
     bool done = settings->value(GROUP(Downloads), QString(Downloads::ItemDone).arg(i), true).toBool();
 
     if (!url.isEmpty() && !file_name.isEmpty()) {
-      DownloadItem *item = new DownloadItem(false, 0, this);
+      DownloadItem *item = new DownloadItem(0, this);
       item->m_output.setFileName(file_name);
       item->m_url = url;
 
diff --git a/src/network-web/downloadmanager.h b/src/network-web/downloadmanager.h
index 395f8fa05..7493bba83 100755
--- a/src/network-web/downloadmanager.h
+++ b/src/network-web/downloadmanager.h
@@ -42,7 +42,7 @@ class DownloadItem : public QWidget {
 
   public:
     // Constructors.
-    explicit DownloadItem(bool is_direct_download, QNetworkReply *reply = 0, QWidget *parent = 0);
+    explicit DownloadItem(QNetworkReply *reply = 0, QWidget *parent = 0);
     virtual ~DownloadItem();
 
     bool downloading() const;
@@ -124,9 +124,9 @@ class DownloadManager : public TabContent {
     static QString dataString(qint64 size);
 
   public slots:
-    void download(const QNetworkRequest &request, bool direct_download = false);
-    void download(const QUrl &url, bool direct_download = false);
-    void handleUnsupportedContent(QNetworkReply *reply, bool direct_download = false);
+    void download(const QNetworkRequest &request);
+    void download(const QUrl &url);
+    void handleUnsupportedContent(QNetworkReply *reply);
     void cleanup();
 
   private slots:

From 8f62904a343e2c246c624247eafe21b1f6734a12 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 11:53:32 +0200
Subject: [PATCH 18/31] Work on msg viewing.

---
 resources/binaries                   |  2 +-
 resources/skins/base/blau-green.xml  |  3 --
 resources/skins/base/blau-yellow.xml |  3 --
 resources/skins/base/blau.xml        |  3 --
 resources/skins/base/greeen.xml      |  3 --
 resources/skins/base/solarized.xml   |  3 --
 resources/skins/base/vergilius.xml   |  3 --
 resources/text/CHANGELOG             |  6 +--
 src/gui/feedmessageviewer.cpp        | 10 ++---
 src/gui/messagepreviewer.cpp         | 57 +++++++++++++++++++++++-----
 src/gui/messagepreviewer.h           | 21 +++++++++-
 src/gui/messagepreviewer.ui          | 26 +++++++++++--
 src/gui/messagesview.cpp             |  2 +-
 src/gui/messagesview.h               |  2 +-
 src/miscellaneous/skinfactory.cpp    | 16 +-------
 src/miscellaneous/skinfactory.h      |  3 --
 16 files changed, 99 insertions(+), 64 deletions(-)

diff --git a/resources/binaries b/resources/binaries
index 176715f7b..9ac6aeaba 160000
--- a/resources/binaries
+++ b/resources/binaries
@@ -1 +1 @@
-Subproject commit 176715f7b3229289e2fb0dffb000c436664a26ff
+Subproject commit 9ac6aeabaae34afe02602f51dae7fc181aff49dd
diff --git a/resources/skins/base/blau-green.xml b/resources/skins/base/blau-green.xml
index 1fc6393c6..15dff03cb 100644
--- a/resources/skins/base/blau-green.xml
+++ b/resources/skins/base/blau-green.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style>fusion,plastique</style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXIgew0KICAgICAgICB3aWR0aDogMjBweDsNCiAgICAgICAgaGVpZ2h0OiAyMHB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICA6Oi13ZWJraXQtc2Nyb2xsYmFyLXRodW1iIHsNCiAgICAgICAgaGVpZ2h0OiAxNHB4Ow0KICAgICAgICBib3JkZXI6IDRweCBzb2xpZCByZ2JhKDAsIDAsIDAsIDApOw0KICAgICAgICBiYWNrZ3JvdW5kLWNsaXA6IHBhZGRpbmctYm94Ow0KICAgICAgICAtd2Via2l0LWJvcmRlci1yYWRpdXM6IDFweDsNCiAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogIzhiYmYwYTsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiBpbnNldCAtMXB4IC0xcHggMHB4IHJnYmEoMCwgMCwgMCwgMC4wNSksIGluc2V0IDFweCAxcHggMHB4IHJnYmEoMCwgMCwgMCwgMC4wNSk7DQogICAgICB9DQogICAgICANCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXItYnV0dG9uIHsNCiAgICAgICAgd2lkdGg6IDA7DQogICAgICAgIGhlaWdodDogMDsNCiAgICAgICAgZGlzcGxheTogbm9uZTsNCiAgICAgIH0NCiAgICAgIA0KICAgICAgOjotd2Via2l0LXNjcm9sbGJhci1jb3JuZXIgew0KICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsNCiAgICAgIH0NCiAgICANCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgYmFja2dyb3VuZDogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBsZWZ0IGJvdHRvbSwgY29sb3Itc3RvcCgwJSwgIzhiYmYwYSksIGNvbG9yLXN0b3AoMTAwJSwgIzk4ZDEwYikpOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIG1hcmdpbjogMHB4IGF1dG87DQogICAgICAgIGNvbG9yOiBibGFjazsNCiAgICAgICAgYm9yZGVyOiAwLjVweCBzb2xpZCBibGFjazsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciBhIHsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgfQ0KDQogICAgICAuY29udGVudCB7DQogICAgICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCBncmF5Ow0KICAgICAgICBmb250LXNpemU6IDE2cHg7DQogICAgICAgIGNvbG9yOiAjZWVlZWVlOw0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAycHg7DQogICAgICAgIG1hcmdpbjogMTBweDsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiAycHggMnB4IDE2cHggMHB4IHJnYmEoNTAsIDUwLCA1MCwgMC42Mik7DQogICAgICB9DQogICAgPC9zdHlsZT4NCiAgICA8dGl0bGU+DQogICAgICAlMQ0KICAgIDwvdGl0bGU+DQogIDwvaGVhZD4NCiAgPGJvZHk+DQogICAgJTINCiAgPC9ib2R5Pg0KPC9odG1sPg==</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>/* QWidget */
QWidget {
  color: #cccccc;
  background-color: #323232;
}

QWidget::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  color: #000000;
}

QWidget:disabled {
  color: #777777;
  background-color: #323232;
}

/* QToolButton */
  QToolButton , QToolButton:disabled {
  border: none;
  padding: 0px;
  background: transparent;
}

QToolButton:hover, QToolButton:pressed {
  border-radius: 2px;
  border: 1px solid gray;
}

QToolButton[popupMode="1"] {
  padding-right: 16px;
}

QToolButton::menu-button {
  border: 1px solid gray;
  border-top-right-radius: 2px;
  border-bottom-right-radius: 2px;
  width: 14px;
}

QToolButton::menu-arrow {
  image: url(##/images/down_arrow.png);
}

QToolButton::menu-arrow:open {
  top: 1px; left: 1px;
}

/* QStatusBar */
QStatusBar QToolButton {
  margin-left: 5px;
  margin-right: 5px;
}

QStatusBar::item {
  border: transparent;
}

/* QToolBar */
QToolBar::separator {
  width: 1px;
  background-color: #595959;

  margin-left: 5px;
  margin-right: 5px;
}

QToolBar {
  padding-left: 5px;
  padding-right: 5px;
}

/* QToolTip */
QToolTip {
  border: 1px solid black;
  background-color: #98d10b;
  color: black;
  border-radius: 1px;
  opacity: 220;
}

/* QMenuBar */
QMenuBar::item {
  background: transparent
}

QMenuBar::item:selected {
  background: transparent;
  border: 1px solid #8bbf0a;
}

QMenuBar::item:pressed {
  background: #444;
  color: black;
  border: 1px solid #000;
  background-color: QLinearGradient( x1:0, y1:0, x2:0, y2:1, stop:1 #98d10b, stop:0.4 #8bbf0a );
  margin-bottom: -1px;
  padding-bottom: 1px;
}

/* QMenu */
QMenu {
  border: 1px solid #000;
}

QMenu::item {
  padding: 2px 10px 2px 23px;
}

QMenu::icon {
  padding-left: 4px;
}

QMenu::item:selected {
  color: black;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
}

QMenu::separator {
  height: 1px;
  background-color: #595959;
  color: white;
  margin-top: 3px;
  margin-bottom: 3px;
  margin-left: 5px;
  margin-right: 5px;
}

/* QPushButton */
QPushButton {
  color: #b1b1b1;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 3px;
  font-size: 12px;
  padding-left: 6px;
  padding-right: 6px;
  min-width: 30px;
}

QPushButton:pressed {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525)
}

QPushButton#m_btnInsertSeparator, QPushButton#m_btnInsertSpacer {
  min-width: 130px;
}

/* QComboBox */
QComboBox {
  selection-background-color: #8bbf0a;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 2px;
  padding-top: 1px;
  padding-bottom: 1px;
  padding-left: 4px;
}

QComboBox:hover, QPushButton:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  color: black;
}

QComboBox:on {
  padding: 1px;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525);
}

QComboBox QAbstractItemView {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  selection-background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
}

QComboBox::drop-down {
  subcontrol-origin: padding;
  subcontrol-position: top right;
  width: 15px;
  border-left-width: 0px;
  border-left-color: darkgray;
  border-left-style: solid;
  border-top-right-radius: 1px;
  border-bottom-right-radius: 1px;
}

QComboBox::down-arrow {
  image: url(##/images/down_arrow.png)
}

/* QScrollBar */
QScrollBar:horizontal {
  border: 1px solid #222222;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  height: 13px;
  margin: 0px 16px 0 16px;
}

QScrollBar::handle:horizontal {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #98d10b, stop: 0.5 #8bbf0a, stop: 1 #98d10b);
  min-height: 20px;
  border-radius: 1px;
}

QScrollBar::add-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #98d10b, stop: 1 #8bbf0a);
  width: 13px;
  subcontrol-position: right;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #98d10b, stop: 1 #8bbf0a);
  width: 13px;
  subcontrol-position: left;
  subcontrol-origin: margin;
}

QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
  background: none
}

QScrollBar:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  width: 13px;
  margin: 16px 0 16px 0;
  border: 1px solid #222222;
}

QScrollBar::handle:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 0.5 #8bbf0a, stop: 1 #98d10b);
  min-height: 20px;
  border-radius: 1px;
}
QScrollBar::add-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  height: 13px;
  subcontrol-position: bottom;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  height: 13px;
  subcontrol-position: top;
  subcontrol-origin: margin;
}

QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
  background: none;
}

/* QSplitter */
QSplitter::handle {
  background-color: #4e4e4e;
}

/* QHeaderView */
QHeaderView {
  background-color: transparent;
  color: #cccccc;
}

QHeaderView::section {
  min-height: 20px;
  border: 0.5 px solid #595959;
  border-right: 0.5 solid #707070;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
}

QHeaderView::section:first {
  padding-left: 4px;
  padding-right: 2px;
}

QHeaderView::section:!first {
  padding-left: 2px;
  padding-right: 2px;
}

QHeaderView::section:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #505050, stop: 0.5 #4e4e4e, stop: 0.9 #404040, stop: 1 #404040);
}

/* QTreeView */
QTreeView::branch:has-siblings:!adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-siblings:adjoins-item {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-closed.png);
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-open.png);
}

QTreeView::item {
  padding: 1px;
} 

QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
  border-image: none;
  image: none;
}

QTreeView::item:selected, QTreeView::branch:selected, QTreeView::item:selected:active, QTreeView::item:selected:!active, QTreeView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  color: #000000;
}

/* QListView */
QListView  {
  show-decoration-selected: 1;
}
 
QListView::item:selected, QListView::item:selected:!active, QListView::item:selected:active, QListView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  color: #000000;
}

/* QTextEdit, QPlainTextEdit */
QTextEdit:focus, QPlainTextEdit:focus, QLineEdit:focus {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a)
}

QTextEdit, QPlainTextEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d)
}

/* QLineEdit */
QLineEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d);
  padding: 1px;
  border-style: solid;
  border: 1px solid #595959;
  border-radius: 0px;
}

/* QProgressBar */
QProgressBar {
  border: transparent;
  border-radius: 1px;
  text-align: center;
}
QProgressBar::chunk {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #98d10b, stop: 1 #8bbf0a);
  width: 3px;
  margin: 0.5px;
}

/* QCheckBox */
QCheckBox::indicator {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
  width: 9px;
  height: 9px;
}

QCheckBox::indicator:checked {
  image: url(##/images/checkbox.png)
}

QCheckBox::indicator:disabled {
  border: 1px solid #444
}

/* QRadioButton */
QRadioButton::indicator:disabled {
  border: 1px solid #444
}

QRadioButton::indicator {
  border-radius: 6px
}

QRadioButton::indicator:checked, QRadioButton::indicator:unchecked {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
}

QRadioButton::indicator:checked {
  background-color: qradialgradient( cx: 0.5, cy: 0.5, fx: 0.5, fy: 0.5, radius: 1.0, stop: 0.25 #98d10b, stop: 0.3 #323232 )
}

QRadioButton::indicator:hover, QCheckBox::indicator:hover {
  border: 1px solid #98d10b;
}</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/blau-yellow.xml b/resources/skins/base/blau-yellow.xml
index 3adc64177..086fb94a3 100644
--- a/resources/skins/base/blau-yellow.xml
+++ b/resources/skins/base/blau-yellow.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style>fusion,plastique</style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXIgew0KICAgICAgICB3aWR0aDogMjBweDsNCiAgICAgICAgaGVpZ2h0OiAyMHB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICA6Oi13ZWJraXQtc2Nyb2xsYmFyLXRodW1iIHsNCiAgICAgICAgaGVpZ2h0OiAxNHB4Ow0KICAgICAgICBib3JkZXI6IDRweCBzb2xpZCByZ2JhKDAsIDAsIDAsIDApOw0KICAgICAgICBiYWNrZ3JvdW5kLWNsaXA6IHBhZGRpbmctYm94Ow0KICAgICAgICAtd2Via2l0LWJvcmRlci1yYWRpdXM6IDFweDsNCiAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogI0Y1RjEwNTsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiBpbnNldCAtMXB4IC0xcHggMHB4IHJnYmEoMCwgMCwgMCwgMC4wNSksIGluc2V0IDFweCAxcHggMHB4IHJnYmEoMCwgMCwgMCwgMC4wNSk7DQogICAgICB9DQogICAgICANCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXItYnV0dG9uIHsNCiAgICAgICAgd2lkdGg6IDA7DQogICAgICAgIGhlaWdodDogMDsNCiAgICAgICAgZGlzcGxheTogbm9uZTsNCiAgICAgIH0NCiAgICAgIA0KICAgICAgOjotd2Via2l0LXNjcm9sbGJhci1jb3JuZXIgew0KICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiB0cmFuc3BhcmVudDsNCiAgICAgIH0NCiAgICANCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgYmFja2dyb3VuZDogdHJhbnNwYXJlbnQ7DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgICAgbWFyZ2luOiAwcHggYXV0bzsNCiAgICAgICAgY29sb3I6ICNGNUYxMDU7DQogICAgICAgIGJvcmRlcjogMC41cHggc29saWQgI0Y1RjEwNTsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciBhIHsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgfQ0KDQogICAgICAuY29udGVudCB7DQogICAgICAgIGJhY2tncm91bmQ6IC13ZWJraXQtZ3JhZGllbnQobGluZWFyLCBsZWZ0IHRvcCwgbGVmdCBib3R0b20sIGNvbG9yLXN0b3AoMCUsICNGNUYxMDUpLCBjb2xvci1zdG9wKDEwMCUsICNGMkVBMDUpKTsNCiAgICAgICAgYm9yZGVyLXRvcDogMXB4IHNvbGlkIGdyYXk7DQogICAgICAgIGZvbnQtc2l6ZTogMTZweDsNCiAgICAgICAgY29sb3I6IGJsYWNrOw0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgYmxhY2s7DQogICAgICAgIC13ZWJraXQtYm9yZGVyLXJhZGl1czogMnB4Ow0KICAgICAgICBtYXJnaW46IDEwcHg7DQogICAgICAgIC13ZWJraXQtYm94LXNoYWRvdzogMnB4IDJweCAxNnB4IDBweCByZ2JhKDUwLCA1MCwgNTAsIDAuNjIpOw0KICAgICAgfQ0KICAgIDwvc3R5bGU+DQogICAgPHRpdGxlPg0KICAgICAgJTENCiAgICA8L3RpdGxlPg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KICAgICUyDQogIDwvYm9keT4NCjwvaHRtbD4=</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>/* QWidget */
QWidget {
  color: #cccccc;
  background-color: #323232;
}

QWidget::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  color: #000000;
}

QWidget:disabled {
  color: #777777;
  background-color: #323232;
}

/* QToolButton */
QToolButton , QToolButton:disabled {
  border: none;
  padding: 0px;
  background: transparent;
}

QToolButton:hover, QToolButton:pressed {
  border-radius: 2px;
  border: 1px solid gray;
}

QToolButton[popupMode="1"] {
  padding-right: 16px;
}

QToolButton::menu-button {
  border: 1px solid gray;
  border-top-right-radius: 2px;
  border-bottom-right-radius: 2px;
  width: 14px;
}

QToolButton::menu-arrow {
  image: url(##/images/down_arrow.png);
}

QToolButton::menu-arrow:open {
  top: 1px; left: 1px;
}

/* QStatusBar */
QStatusBar QToolButton {
  margin-left: 5px;
  margin-right: 5px;
}

QStatusBar::item {
  border: transparent;
}

/* QToolBar */
QToolBar::separator {
  width: 1px;
  background-color: #F2EA05;

  margin-left: 5px;
  margin-right: 5px;
}

QToolBar {
  padding-left: 5px;
  padding-right: 5px;
}

/* QToolTip */
QToolTip {
  border: 1px solid black;
  background-color: #F5F105;
  color: black;
  border-radius: 1px;
  opacity: 220;
}

/* QMenuBar */
QMenuBar::item {
  background: transparent
}

QMenuBar::item:selected {
  background: transparent;
  border: 1px solid #F2EA05;
}

QMenuBar::item:pressed {
  background: #444;
  color: black;
  border: 1px solid #000;
  background-color: QLinearGradient( x1:0, y1:0, x2:0, y2:1, stop:1 #F5F105, stop:0.4 #F2EA05 );
  margin-bottom: -1px;
  padding-bottom: 1px;
}

/* QMenu */
QMenu {
  border: 1px solid #000;
}

QMenu::item {
  padding: 2px 10px 2px 23px;
}

QMenu::icon {
  padding-left: 4px;
}

QMenu::item:selected {
  color: black;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
}

QMenu::separator {
  height: 1px;
  background-color: #595959;
  color: #F2EA05;
  margin-top: 3px;
  margin-bottom: 3px;
  margin-left: 5px;
  margin-right: 5px;
}

/* QPushButton */
QPushButton {
  color: #b1b1b1;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 3px;
  font-size: 12px;
  padding-left: 6px;
  padding-right: 6px;
  min-width: 30px;
}

QPushButton:pressed {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525)
}

QPushButton#m_btnInsertSeparator, QPushButton#m_btnInsertSpacer {
  min-width: 130px;
}

/* QComboBox */
QComboBox {
  selection-background-color: #F2EA05;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 2px;
  padding-top: 1px;
  padding-bottom: 1px;
  padding-left: 4px;
}

QComboBox:hover, QPushButton:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  color: black;
}

QComboBox:on {
  padding: 1px;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525);
}

QComboBox QAbstractItemView {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  selection-background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
}

QComboBox::drop-down {
  subcontrol-origin: padding;
  subcontrol-position: top right;
  width: 15px;
  border-left-width: 0px;
  border-left-color: darkgray;
  border-left-style: solid;
  border-top-right-radius: 1px;
  border-bottom-right-radius: 1px;
}

QComboBox::down-arrow {
  image: url(##/images/down_arrow.png)
}

/* QScrollBar */
QScrollBar:horizontal {
  border: 1px solid #222222;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  height: 13px;
  margin: 0px 16px 0 16px;
}

QScrollBar::handle:horizontal {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #F5F105, stop: 0.5 #F2EA05, stop: 1 #F5F105);
  min-height: 20px;
  border-radius: 1px;
}

QScrollBar::add-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #F5F105, stop: 1 #F2EA05);
  width: 13px;
  subcontrol-position: right;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #F5F105, stop: 1 #F2EA05);
  width: 13px;
  subcontrol-position: left;
  subcontrol-origin: margin;
}

QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
  background: none
}

QScrollBar:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  width: 13px;
  margin: 16px 0 16px 0;
  border: 1px solid #222222;
}

QScrollBar::handle:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 0.5 #F2EA05, stop: 1 #F5F105);
  min-height: 20px;
  border-radius: 1px;
}
QScrollBar::add-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  height: 13px;
  subcontrol-position: bottom;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  height: 13px;
  subcontrol-position: top;
  subcontrol-origin: margin;
}

QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
  background: none;
}

/* QSplitter */
QSplitter::handle {
  background-color: #4e4e4e;
}

/* QHeaderView */
QHeaderView {
  background-color: transparent;
  color: #cccccc;
}

QHeaderView::section {
  min-height: 20px;
  border: 0.5 px solid #595959;
  border-right: 0.5 solid #707070;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
}

QHeaderView::section:first {
  padding-left: 4px;
  padding-right: 2px;
}

QHeaderView::section:!first {
  padding-left: 2px;
  padding-right: 2px;
}

QHeaderView::section:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #505050, stop: 0.5 #4e4e4e, stop: 0.9 #404040, stop: 1 #404040);
}

/* QTreeView */
QTreeView::branch:has-siblings:!adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-siblings:adjoins-item {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-closed.png);
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-open.png);
}

QTreeView::item {
  padding: 1px;
} 

QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
  border-image: none;
  image: none;
}

QTreeView::item:selected, QTreeView::branch:selected, QTreeView::item:selected:active, QTreeView::item:selected:!active, QTreeView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  color: #000000;
}

/* QListView */
QListView  {
  show-decoration-selected: 1;
}
 
QListView::item:selected, QListView::item:selected:!active, QListView::item:selected:active, QListView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  color: #000000;
}

/* QTextEdit, QPlainTextEdit */
QTextEdit:focus, QPlainTextEdit:focus, QLineEdit:focus {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05)
}

QTextEdit, QPlainTextEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d)
}

/* QLineEdit */
QLineEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d);
  padding: 1px;
  border-style: solid;
  border: 1px solid #595959;
  border-radius: 0px;
}

/* QProgressBar */
QProgressBar {
  border: transparent;
  border-radius: 1px;
  text-align: center;
}
QProgressBar::chunk {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #F5F105, stop: 1 #F2EA05);
  width: 3px;
  margin: 0.5px;
}

/* QCheckBox */
QCheckBox::indicator {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
  width: 9px;
  height: 9px;
}

QCheckBox::indicator:checked {
  image: url(##/images/checkbox.png)
}

QCheckBox::indicator:disabled {
  border: 1px solid #444
}

/* QRadioButton */
QRadioButton::indicator:disabled {
  border: 1px solid #444
}

QRadioButton::indicator {
  border-radius: 6px
}

QRadioButton::indicator:checked, QRadioButton::indicator:unchecked {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
}

QRadioButton::indicator:checked {
  background-color: qradialgradient( cx: 0.5, cy: 0.5, fx: 0.5, fy: 0.5, radius: 1.0, stop: 0.25 #F5F105, stop: 0.3 #323232 )
}

QRadioButton::indicator:hover, QCheckBox::indicator:hover {
  border: 1px solid #F5F105;
}</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/blau.xml b/resources/skins/base/blau.xml
index 7c87c6c3a..6c0d24560 100644
--- a/resources/skins/base/blau.xml
+++ b/resources/skins/base/blau.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style>fusion,plastique</style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXIgew0KICAgICAgICB3aWR0aDogMjBweDsNCiAgICAgICAgaGVpZ2h0OiAyMHB4Ow0KICAgICAgfQ0KICAgICAgOjotd2Via2l0LXNjcm9sbGJhci10aHVtYiB7DQogICAgICAgIGhlaWdodDogMTRweDsNCiAgICAgICAgYm9yZGVyOiA0cHggc29saWQgcmdiYSgwLCAwLCAwLCAwKTsNCiAgICAgICAgYmFja2dyb3VuZC1jbGlwOiBwYWRkaW5nLWJveDsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAxcHg7DQogICAgICAgIGJhY2tncm91bmQtY29sb3I6ICM1NjlkZTU7DQogICAgICAgIC13ZWJraXQtYm94LXNoYWRvdzogaW5zZXQgLTFweCAtMXB4IDBweCByZ2JhKDAsIDAsIDAsIDAuMDUpLCBpbnNldCAxcHggMXB4IDBweCByZ2JhKDAsIDAsIDAsIDAuMDUpOw0KICAgICAgfQ0KICAgICAgDQogICAgICA6Oi13ZWJraXQtc2Nyb2xsYmFyLWJ1dHRvbiB7DQogICAgICAgIHdpZHRoOiAwOw0KICAgICAgICBoZWlnaHQ6IDA7DQogICAgICAgIGRpc3BsYXk6IG5vbmU7DQogICAgICB9DQogICAgICANCiAgICAgIDo6LXdlYmtpdC1zY3JvbGxiYXItY29ybmVyIHsNCiAgICAgICAgYmFja2dyb3VuZC1jb2xvcjogdHJhbnNwYXJlbnQ7DQogICAgICB9DQogICAgDQogICAgICBib2R5IHsNCiAgICAgICAgbWFyZ2luOiAwcHg7DQogICAgICAgIHBhZGRpbmc6IDBweDsNCiAgICAgIH0NCiAgICANCiAgICAgIHByZSB7DQogICAgICAgIHdoaXRlLXNwYWNlOiBwcmUtd3JhcDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlcnRleHQgew0KICAgICAgICBmb250LXNpemU6IDIwcHg7DQogICAgICAgIG1hcmdpbi1ib3R0b206IDEwcHg7DQogICAgICB9DQoNCiAgICAgIC5oZWFkZXIgew0KICAgICAgICBmb250LXNpemU6IDE3cHg7DQogICAgICAgIGJhY2tncm91bmQ6IC13ZWJraXQtZ3JhZGllbnQobGluZWFyLCBsZWZ0IHRvcCwgbGVmdCBib3R0b20sIGNvbG9yLXN0b3AoMCUscmdiYSg5OSwxMzUsMjI5LDEpKSwgY29sb3Itc3RvcCgxMDAlLHJnYmEoNjQsMTA5LDIzNiwxKSkpOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIG1hcmdpbjogMHB4IGF1dG87DQogICAgICAgIGNvbG9yOiB3aGl0ZTsNCiAgICAgICAgYm9yZGVyOiAwLjVweCBzb2xpZCBibGFjazsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciBhIHsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgfQ0KDQogICAgICAuY29udGVudCB7DQogICAgICAgIGJvcmRlci10b3A6IDFweCBzb2xpZCBncmF5Ow0KICAgICAgICBmb250LXNpemU6IDE2cHg7DQogICAgICAgIGNvbG9yOiAjZWVlZWVlOw0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAycHg7DQogICAgICAgIG1hcmdpbjogMTBweDsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiAycHggMnB4IDE2cHggMHB4IHJnYmEoNTAsIDUwLCA1MCwgMC42Mik7DQogICAgICB9DQogICAgPC9zdHlsZT4NCiAgICA8dGl0bGU+DQogICAgICAlMQ0KICAgIDwvdGl0bGU+DQogIDwvaGVhZD4NCiAgPGJvZHk+DQogICAgJTINCiAgPC9ib2R5Pg0KPC9odG1sPg==</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>/* QWidget */
QWidget {
  color: #cccccc;
  background-color: #323232;
}

QWidget::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  color: #000000;
}

QWidget:disabled {
  color: #777777;
  background-color: #323232;
}

/* QToolButton */
QToolButton , QToolButton:disabled {
  border: none;
  padding: 0px;
  background: transparent;
}

QToolButton:hover, QToolButton:pressed {
  border-radius: 2px;
  border: 1px solid gray;
}

QToolButton[popupMode="1"] {
  padding-right: 16px;
}

QToolButton::menu-button {
  border: 1px solid gray;
  border-top-right-radius: 2px;
  border-bottom-right-radius: 2px;
  width: 14px;
}

QToolButton::menu-arrow {
  image: url(##/images/down_arrow.png);
}

QToolButton::menu-arrow:open {
  top: 1px; left: 1px;
}

/* QStatusBar */
QStatusBar QToolButton {
  margin-left: 5px;
  margin-right: 5px;
}

QStatusBar::item {
  border: transparent;
}

/* QToolBar */
QToolBar::separator {
  width: 1px;
  background-color: #595959;

  margin-left: 5px;
  margin-right: 5px;
}

QToolBar {
  padding-left: 5px;
  padding-right: 5px;
}

/* QToolTip */
QToolTip {
  border: 1px solid black;
  background-color: #569de5;
  color: black;
  border-radius: 1px;
  opacity: 220;
}

/* QMenuBar */
QMenuBar::item {
  background: transparent
}

QMenuBar::item:selected {
  background: transparent;
  border: 1px solid #569de5;
}

QMenuBar::item:pressed {
  background: #444;
  border: 1px solid #000;
  background-color: QLinearGradient( x1:0, y1:0, x2:0, y2:1, stop:1 #212121, stop:0.4 #343434 );
  margin-bottom: -1px;
  padding-bottom: 1px;
}

/* QMenu */
QMenu {
  border: 1px solid #000;
}

QMenu::item {
  padding: 2px 10px 2px 23px;
}

QMenu::icon {
  padding-left: 4px;
}

QMenu::item:selected {
  color: #000000;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
}

QMenu::separator {
  height: 1px;
  background-color: #595959;
  color: white;
  margin-top: 3px;
  margin-bottom: 3px;
  margin-left: 5px;
  margin-right: 5px;
}

/* QPushButton */
QPushButton {
  color: #b1b1b1;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 3px;
  font-size: 12px;
  padding-left: 6px;
  padding-right: 6px;
  min-width: 30px;
}

QPushButton:pressed {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525)
}

QPushButton#m_btnInsertSeparator, QPushButton#m_btnInsertSpacer {
  min-width: 130px;
}

/* QComboBox */
QComboBox {
  selection-background-color: #569de5;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
  border: 1px solid #1e1e1e;
  border-radius: 1px;
  padding: 2px;
  padding-top: 1px;
  padding-bottom: 1px;
  padding-left: 4px;
}

QComboBox:hover, QPushButton:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  color: black;
}

QComboBox:on {
  padding: 1px;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #2d2d2d, stop: 0.1 #2b2b2b, stop: 0.5 #292929, stop: 0.9 #282828, stop: 1 #252525);
}

QComboBox QAbstractItemView {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  selection-background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
}

QComboBox::drop-down {
  subcontrol-origin: padding;
  subcontrol-position: top right;
  width: 15px;
  border-left-width: 0px;
  border-left-color: darkgray;
  border-left-style: solid;
  border-top-right-radius: 1px;
  border-bottom-right-radius: 1px;
}

QComboBox::down-arrow {
  image: url(##/images/down_arrow.png)
}

/* QScrollBar */
QScrollBar:horizontal {
  border: 1px solid #222222;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  height: 13px;
  margin: 0px 16px 0 16px;
}

QScrollBar::handle:horizontal {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #569de5, stop: 0.5 #447cb5, stop: 1 #569de5);
  min-height: 20px;
  border-radius: 1px;
}

QScrollBar::add-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #569de5, stop: 1 #447cb5);
  width: 13px;
  subcontrol-position: right;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:horizontal {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0 #569de5, stop: 1 #447cb5);
  width: 13px;
  subcontrol-position: left;
  subcontrol-origin: margin;
}

QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
  background: none
}

QScrollBar:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 1, y2: 0, stop: 0.0 #121212, stop: 0.2 #282828, stop: 1 #484848);
  width: 13px;
  margin: 16px 0 16px 0;
  border: 1px solid #222222;
}

QScrollBar::handle:vertical {
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 0.5 #447cb5, stop: 1 #569de5);
  min-height: 20px;
  border-radius: 1px;
}
QScrollBar::add-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  height: 13px;
  subcontrol-position: bottom;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:vertical {
  border: 1px solid #1b1b19;
  border-radius: 1px;
  background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5);
  height: 13px;
  subcontrol-position: top;
  subcontrol-origin: margin;
}

QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical {
  border: 1px solid black;
  width: 1px;
  height: 1px;
  background: white;
}

QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical {
  background: none;
}

/* QSplitter */
QSplitter::handle {
  background-color: #4e4e4e;
}

/* QHeaderView */
QHeaderView {
  background-color: transparent;
  color: #cccccc;
}

QHeaderView::section {
  min-height: 20px;
  border: 0.5 px solid #595959;
  border-right: 0.5 solid #707070;
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #525252, stop: 0.5 #4e4e4e, stop: 0.9 #4a4a4a, stop: 1 #464646);
}

QHeaderView::section:first {
  padding-left: 4px;
  padding-right: 2px;
}

QHeaderView::section:!first {
  padding-left: 2px;
  padding-right: 2px;
}

QHeaderView::section:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #565656, stop: 0.1 #505050, stop: 0.5 #4e4e4e, stop: 0.9 #404040, stop: 1 #404040);
}

/* QTreeView */
QTreeView::branch:has-siblings:!adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-siblings:adjoins-item {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-closed.png);
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-open.png);
}

QTreeView::item {
  padding: 1px;
} 

QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
  border-image: none;
  image: none;
}

QTreeView::item:selected, QTreeView::branch:selected, QTreeView::item:selected:active, QTreeView::item:selected:!active, QTreeView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  color: #000000;
}

/* QListView */
QListView  {
  show-decoration-selected: 1;
}
 
QListView::item:selected, QListView::item:selected:!active, QListView::item:selected:active, QListView::item:hover {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  color: #000000;
}

/* QTextEdit, QPlainTextEdit */
QTextEdit:focus, QPlainTextEdit:focus, QLineEdit:focus {
  border: 1px solid QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #447cb5)
}

QTextEdit, QPlainTextEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d)
}

/* QLineEdit */
QLineEdit {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #4d4d4d, stop: 0 #646464, stop: 1 #5d5d5d);
  padding: 1px;
  border-style: solid;
  border: 1px solid #595959;
  border-radius: 0px;
}

/* QProgressBar */
QProgressBar {
  border: transparent;
  border-radius: 1px;
  text-align: center;
}
QProgressBar::chunk {
  background-color: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0 #569de5, stop: 1 #4b8ac9);
  width: 3px;
  margin: 0.5px;
}

/* QCheckBox */
QCheckBox::indicator {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
  width: 9px;
  height: 9px;
}

QCheckBox::indicator:checked {
  image: url(##/images/checkbox.png)
}

QCheckBox::indicator:disabled {
  border: 1px solid #444
}

/* QRadioButton */
QRadioButton::indicator:disabled {
  border: 1px solid #444
}

QRadioButton::indicator {
  border-radius: 6px
}

QRadioButton::indicator:checked, QRadioButton::indicator:unchecked {
  color: #b1b1b1;
  background-color: #323232;
  border: 1px solid #b1b1b1;
}

QRadioButton::indicator:checked {
  background-color: qradialgradient( cx: 0.5, cy: 0.5, fx: 0.5, fy: 0.5, radius: 1.0, stop: 0.25 #569de5, stop: 0.3 #323232 )
}

QRadioButton::indicator:hover, QCheckBox::indicator:hover {
  border: 1px solid #569de5
}</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/greeen.xml b/resources/skins/base/greeen.xml
index 0f7371563..9973ac7f3 100644
--- a/resources/skins/base/greeen.xml
+++ b/resources/skins/base/greeen.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style></style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4gICANCiAgICAgIGJvZHkgeyAgICAgDQogICAgICAgIG1hcmdpbjogMHB4Ow0KICAgICAgICBwYWRkaW5nOiAwcHg7DQogICAgICB9DQogICAgDQogICAgICBwcmUgew0KICAgICAgICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7DQogICAgICB9DQoNCiAgICAgIC5oZWFkZXJ0ZXh0IHsNCiAgICAgICAgZm9udC1zaXplOiAyMHB4Ow0KICAgICAgICBtYXJnaW4tYm90dG9tOiAxMHB4Ow0KICAgICAgfQ0KDQogICAgICAuaGVhZGVyIHsNCiAgICAgICAgZm9udC1zaXplOiAxN3B4Ow0KICAgICAgICBiYWNrZ3JvdW5kOiAtd2Via2l0LWdyYWRpZW50KGxpbmVhciwgbGVmdCB0b3AsIGxlZnQgYm90dG9tLCBjb2xvci1zdG9wKDAlLHJnYmEoODQsIDEzMiwgNTMsIDEpKSwgY29sb3Itc3RvcCgxMDAlLHJnYmEoODQsIDE0MCwgNTMsIDEpKSk7DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgICAgbWFyZ2luOiAwcHggYXV0bzsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgICBib3JkZXI6IDAuNXB4IHNvbGlkIGJsYWNrOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVyIGEgew0KICAgICAgICBjb2xvcjogd2hpdGU7DQogICAgICB9DQogICAgICANCiAgICAgIC5oZWFkZXIgLmVuY2xvc3VyZSB7DQogICAgICAgIGNvbG9yOiBibGFjazsNCiAgICAgIH0NCg0KICAgICAgLmNvbnRlbnQgew0KICAgICAgICBib3JkZXItdG9wOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgZm9udC1zaXplOiAxNnB4Ow0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAycHg7DQogICAgICAgIG1hcmdpbjogMTBweDsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiAycHggMnB4IDhweCAwcHggcmdiYSg1MCwgNTAsIDUwLCAwLjYyKTsNCiAgICAgIH0NCiAgICA8L3N0eWxlPg0KICAgIDx0aXRsZT4NCiAgICAgICUxDQogICAgPC90aXRsZT4NCiAgPC9oZWFkPg0KICA8Ym9keT4NCiAgICAlMg0KICA8L2JvZHk+DQo8L2h0bWw+</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>LyoNCiAqIEluc3BpcmVkIGJ5IFF1aXRlUlNTICJncmVlbiIgc2tpbi4NCiAqIENvcHlyaWdodCAoQykgPD0gMjAxMyBieSBRdWl0ZVJTUyB0ZWFtDQogKiBDb3B5cmlnaHQgKEMpIDIwMTQgYnkgTWFydGluIFJvdHRlciA8cm90dGVyLm1hcnRpbm9zQGdtYWlsLmNvbT4NCiAqLw0KICANClFUcmVlVmlldzo6YnJhbmNoOmhhcy1zaWJsaW5nczohYWRqb2lucy1pdGVtICB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOmhhcy1zaWJsaW5nczphZGpvaW5zLWl0ZW0gew0KICBib3JkZXItaW1hZ2U6IHVybChxc3MvZHVtbXkucG5nKSAwOw0KfQ0KDQpRVHJlZVZpZXc6OmJyYW5jaDohaGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3M6YWRqb2lucy1pdGVtICB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOmhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzOmNsb3NlZCwNClFUcmVlVmlldzo6YnJhbmNoOmNsb3NlZDpoYXMtY2hpbGRyZW46aGFzLXNpYmxpbmdzICB7DQogIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgaW1hZ2U6IHVybChxc3MvYnJhbmNoLWNsb3NlZC5wbmcpOw0KfQ0KDQpRVHJlZVZpZXc6OmJyYW5jaDpvcGVuOmhhcy1jaGlsZHJlbjohaGFzLXNpYmxpbmdzLA0KUVRyZWVWaWV3OjpicmFuY2g6b3BlbjpoYXMtY2hpbGRyZW46aGFzLXNpYmxpbmdzICB7DQogIGJvcmRlci1pbWFnZTogbm9uZTsNCiAgaW1hZ2U6IHVybChxc3MvYnJhbmNoLW9wZW4ucG5nKTsNCn0NCg0KUVRyZWVWaWV3OjppdGVtIHsNCiAgcGFkZGluZzogMXB4IDFweCAxcHggMXB4Ow0KfSANCg0KUVRyZWVWaWV3W2hpZGVUcmVlPSJ0cnVlIl06OmJyYW5jaDohaGFzLWNobGlkcmVuOmhhc1NpYmxpbmdzIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogbm9uZTsNCn0NCg0KUVN0YXR1c0Jhcjo6aXRlbSB7DQogIGJvcmRlcjogbm9uZTsNCn0NCg0KV2ViQnJvd3NlciBRUHJvZ3Jlc3NCYXIgew0KICBib3JkZXI6IDFweCBzb2xpZCAjQTVBNUE1Ow0KICB0ZXh0LWFsaWduOiBjZW50ZXI7DQogIGJvcmRlci1sZWZ0OiBub25lOw0KICBib3JkZXItcmlnaHQ6IG5vbmU7DQogIGJhY2tncm91bmQ6IHFsaW5lYXJncmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgI2Y0ZjRmNCwgc3RvcDowLjQgI0VDRUNFQyBzdG9wOjAuNSAjREVERURFLCBzdG9wOjEgI2Y0ZjRmNCk7DQp9DQoNCldlYkJyb3dzZXIgUVByb2dyZXNzQmFyOjpjaHVuayB7DQogIGJhY2tncm91bmQ6IHFsaW5lYXJncmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgIzkwRTg5MCwgc3RvcDowLjQgIzdDRDA3Qywgc3RvcDowLjUgIzYwQzA2MCwgc3RvcDoxICM2MEQwNjApOw0KICB3aWR0aDogMXB4Ow0KfQ0KDQpRTWVudUJhciB7DQogIGJhY2tncm91bmQ6IHFsaW5lYXJncmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgI2UwZWVlMCwgc3RvcDowLjQgI2Q4ZWVkOCwgc3RvcDowLjUgI2NjZWVjYywgc3RvcDoxICNlMGVlZTApOw0KICBjb2xvcjogIzAwMDAwMDsNCiAgcGFkZGluZzogMXB4Ow0KfQ0KDQpRTWVudUJhcjo6aXRlbSB7DQogIHBhZGRpbmc6IDNweCA2cHg7DQogIGJhY2tncm91bmQ6IHRyYW5zcGFyZW50Ow0KfQ0KDQpRTWVudUJhcjo6aXRlbTpzZWxlY3RlZCB7DQogIGJvcmRlcjogMXB4IHNvbGlkICM4NGNjODQ7DQogIGJhY2tncm91bmQ6IHFsaW5lYXJncmFkaWVudCh4MTowLCB5MTowLCB4MjowLCB5MjoxLCBzdG9wOjAgI2U5ZmZlOSwgc3RvcDowLjQgI2UxZWVlMSwgc3RvcDowLjUgI2Q5ZWVkOSwgc3RvcDoxICNlOWZmZTkpOw0KfQ0KDQpRTWVudUJhcjo6aXRlbTpwcmVzc2VkIHsNCiAgYm9yZGVyOiAxcHggc29saWQgIzM0YWEzNDsNCiAgYm9yZGVyLWJvdHRvbTogbm9uZTsNCiAgYmFja2dyb3VuZDogcWxpbmVhcmdyYWRpZW50KHgxOjAsIHkxOjAsIHgyOjAsIHkyOjEsIHN0b3A6MCAjN2FjYzdhLCBzdG9wOjAuNCAjNzBjODcwLCBzdG9wOjAuNSAjNjBjNDYwLCBzdG9wOjEgIzdhY2M3YSk7DQogIGNvbG9yOiB3aGl0ZTsNCn0=</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/solarized.xml b/resources/skins/base/solarized.xml
index 6df800ed7..6310db878 100644
--- a/resources/skins/base/solarized.xml
+++ b/resources/skins/base/solarized.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style>plastique,fusion</style>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4gICANCiAgICAgIGJvZHkgeyAgDQogICAgICAgIG1hcmdpbjogMHB4Ow0KICAgICAgICBwYWRkaW5nOiAwcHg7DQogICAgICAgIGJhY2tncm91bmQtY29sb3I6ICNmZGY2ZTM7DQogICAgICB9DQogICAgDQogICAgICBwcmUgew0KICAgICAgICB3aGl0ZS1zcGFjZTogcHJlLXdyYXA7DQogICAgICB9DQogICAgICANCiAgICAgIC5jb250YWluZXIgew0KICAgICAgICBjb2xvcjogIzY1N2I4MzsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlcnRleHQgew0KICAgICAgICBmb250LXNpemU6IDIwcHg7DQogICAgICB9DQoNCiAgICAgIC5oZWFkZXIgew0KICAgICAgICBiYWNrZ3JvdW5kLWNvbG9yOiAjMDAyYjM2OyAvKiBSZW1vdmUgdG8gZ2V0IHJpZCBvZiBzcGVjaWFsIGNvbG9yIGZvciBoZWFkZXIuICovDQogICAgICAgIGNvbG9yOiAjODM5NDk2OyAvKiBSZW1vdmUgdG8gZ2V0IHJpZCBvZiBzcGVjaWFsIGNvbG9yIGZvciBoZWFkZXIuICovDQogICAgICAgIGJvcmRlcjogMC41cHggc29saWQgYmxhY2s7DQogICAgICAgIGZvbnQtc2l6ZTogMTZweDsNCiAgICAgICAgcGFkZGluZzogNnB4Ow0KICAgICAgfQ0KDQogICAgICBhLCBhOmFjdGl2ZSwgYTp2aXNpdGVkIHsNCiAgICAgICAgY29sb3I6ICMyNjhiZDI7DQogICAgICAgIHdvcmQtd3JhcDogYnJlYWstd29yZDsNCiAgICAgIH0NCiAgICAgIA0KICAgICAgYTpob3ZlciB7DQogICAgICAgIGNvbG9yOiAjODM5NDk2Ow0KICAgICAgfQ0KICAgICAgDQogICAgICA6OnNlbGVjdGlvbiB7DQogICAgICAgIGJhY2tncm91bmQtY29sb3I6ICMwNzM2NDI7DQogICAgICB9DQoNCiAgICAgIC5jb250ZW50IHsNCiAgICAgICAgYm9yZGVyOiAwLjVweCBzb2xpZCBibGFjazsNCiAgICAgICAgcGFkZGluZzogMTJweDsNCiAgICAgICAgZm9udC1zaXplOiAxMnB4Ow0KICAgICAgfQ0KICAgIDwvc3R5bGU+DQogICAgPHRpdGxlPg0KICAgICAgJTENCiAgICA8L3RpdGxlPg0KICA8L2hlYWQ+DQogIDxib2R5Pg0KICAgICUyDQogIDwvYm9keT4NCjwvaHRtbD4=</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPiUxPC9kaXY+DQogICAgICAgICUyLCAlNQ0KICAgICAgICA8YnIvPg0KICAgICAgICA8YSBocmVmPSIlMyI+JTM8L2E+DQogICAgICAgICU2DQogICAgICA8L2Rpdj4NCiAgICAgIDxkaXYgY2xhc3M9ImNvbnRlbnQiPiU0PC9kaXY+DQogICAgPC9kaXY+</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>QWidget {
  color: #657b83;
  background-color: #fdf6e3;
}

QWidget::item:hover {
  background-color: #eee8d5;
  color: #657b83;
}

QWidget:disabled {
  color: gray;
  background-color: #fdf6e3;
}

QFrame[frameShape="6"] {
  border: 1px solid #88a6b1;
}

QTreeView::branch:has-siblings:!adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-siblings:adjoins-item {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:!has-children:!has-siblings:adjoins-item  {
  border-image: url(qss/dummy.png) 0;
}

QTreeView::branch:has-children:!has-siblings:closed,
QTreeView::branch:closed:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-closed.png);
}

QTreeView::branch:open:has-children:!has-siblings,
QTreeView::branch:open:has-children:has-siblings  {
  border-image: none;
  image: url(qss/branch-open.png);
}

QTreeView::item {
  padding: 1px;
} 

QTreeView[hideTree="true"]::branch:!has-chlidren:hasSiblings {
  border-image: none;
  image: none;
}

QTreeView::item:selected, QTreeView::branch:selected, QTreeView::item:selected:active, QTreeView::item:selected:!active, QTreeView::item:hover, QListView::item:selected, QListView::item:selected:!active, QListView::item:selected:active, QListView::item:hover {
  background-color: #073642;
  color: #839496;
}

QToolTip {
  border: 1px solid #88a6b1;
  background-color: #fdf6e3;
  color: #657b83;
  border-radius: 1px;
  opacity: 220;
  padding: 2px;
}
 
QStatusBar::item {
  border: none;
}

QSplitter::handle {
  width: 1px;
  background-color: #88a6b1;
}

QSplitter::handle:vertical {
  margin: 1px 0px 0px 0px;
}

QSplitter::handle:horizontal {
  margin: 0px 1px 0px 1px;
}

QStatusBar QToolButton {
  margin-left: 5px;
  margin-right: 5px;
}

QStatusBar::item {
  border: transparent;
}

QProgressBar {
  border: transparent;
  text-align: center;
}

QProgressBar::chunk {
  background-color: #839496;
  width: 1px;
  margin: 0px;
}

QProgressBar QLabel {
  color: #002b36;
  background: transparent;
}

QToolButton, QToolButton:disabled {
  border: none;
  padding: 0px;
  background: transparent;
}

QToolButton:hover, QToolButton:pressed {
  border: 1px solid #eee8d5;
}

QToolButton[popupMode="1"] {
  padding-right: 11px;
}

QToolButton::menu-button {
  border-top-right-radius: 0px;
  border-bottom-right-radius: 0px;
  width: 11px;
}

QToolButton::menu-button:hover, QToolButton::menu-button:pressed {
  background-color: #073642;
}

QToolButton::menu-arrow {
  image: url(##/images/down_arrow_dark.png);
}

QToolBar::separator {
  width: 1px;
  background-color: #88a6b1;
  margin-left: 5px;
  margin-right: 5px;
}

QToolBar {
  padding-left: 5px;
  padding-right: 5px;
}

QMenuBar {
  color: #657b83;
  background-color: #fdf6e3;
  padding: 1px;
}

QMenuBar::item {
  padding: 3px 6px;
  background: transparent;
}

QMenuBar::item:selected, QMenuBar::item:pressed {
  border: none;
  color: #839496;
  background: #073642;
}

QMenu {
  border: 1px solid #073642;
}

QMenu::item {
  padding: 2px 10px 2px 23px;
}

QMenu::icon {
  padding-left: 4px;
}

QMenu::item:selected {
  background-color: #073642;
  color: #839496;
}

QMenu::separator {
  height: 1px;
  background-color: #657b83;
  color: white;
  margin-top: 3px;
  margin-bottom: 3px;
  margin-left: 5px;
  margin-right: 5px;
}

QScrollBar:vertical {
  background: #fdf6e3;
  width: 14px;
  margin: 16px 0px 16px 0px;
  border: 1px solid #fdf6e3;
}

QScrollBar:horizontal {
  background: #fdf6e3;
  height: 14px;
  margin: 0px 16px 0px 16px;
  border: 1px solid #fdf6e3;
}

QScrollBar::handle:vertical, QScrollBar::handle:horizontal {
  background: #073642;
  min-height: 20px;
  border-radius: 0px;
}

QScrollBar::handle:horizontal {
  background: #073642;
  min-width: 20px;
  border-radius: 0px;
}

QScrollBar::add-line:vertical {
  border: 1px solid #fdf6e3;
  border-radius: 0px;
  background: #073642;
  height: 14px;
  subcontrol-position: bottom;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:vertical {
  border: 1px solid #fdf6e3;
  border-radius: 0px;
  background: #073642;
  height: 14px;
  subcontrol-position: top;
  subcontrol-origin: margin;
}

QScrollBar::add-line:horizontal {
  border: 1px solid #fdf6e3;
  border-radius: 0px;
  background: #073642;
  width: 14px;
  subcontrol-position: right;
  subcontrol-origin: margin;
}

QScrollBar::sub-line:horizontal {
  border: 1px solid #fdf6e3;
  border-radius: 0px;
  background: #073642;
  width: 14px;
  subcontrol-position: left;
  subcontrol-origin: margin;
}

QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical, QScrollBar::right-arrow:horizontal, QScrollBar::left-arrow:horizontal {
  border: none;
  background: none;
  width: 0px;
  height: 0px;
}

QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical, QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal {
  background: none;
}

QHeaderView {
  color: #657b83;
  background-color: #fdf6e3;
}

QHeaderView::section, QHeaderView::section:hover {
  min-height: 20px;
  border: 0.5px solid #eee8d5;
  background-color: #fdf6e3;
}

QHeaderView::section:first {
  padding-left: 4px;
  padding-right: 2px;
  border-left: none;
}

QHeaderView::section:!first {
  padding-left: 2px;
  padding-right: 2px;
}

QPushButton {
  color: #657b83;
  background-color: #fdf6e3;
  border: 1px solid #657b83;
  border-radius: 1px;
  padding: 3px;
  font-size: 12px;
  padding-left: 6px;
  padding-right: 6px;
}

QPushButton:pressed, QPushButton:hover {
  background-color: #073642;
  color: #839496;
  border: 1px solid #657b83;
}

QCheckBox::indicator {
  color: #073642;
  background-color: #fdf6e3;
  border: 1px solid #073642;
  width: 13px;
  height: 13px;
}

QCheckBox::indicator:checked {
  image: url(##/images/checkbox_dark.png)
}

QCheckBox::indicator:disabled {
  border: 1px solid gray;
  background-color: gray;
}



QTextEdit:focus, QPlainTextEdit:focus, QLineEdit:focus {
  border: 1px solid #073642;
}

QTextEdit, QPlainTextEdit {
  background-color: #fcf9f0;
}

QLineEdit {
  color: #657b83;
  background-color: #fcf9f0;
  padding: 1px;
  border: 1px solid #073642;
  border-radius: 0px;
}

QComboBox {
  color: #657b83;
  background-color: #fcf9f0;
  selection-background-color: #073642;
  border: 1px solid #073642;
  border-radius: 0px;
  padding: 2px;
  padding-top: 1px;
  padding-bottom: 1px;
  padding-left: 4px;
}

QComboBox::drop-down {
  subcontrol-origin: padding;
  subcontrol-position: top right;
  width: 15px;
  border-left-width: 0px;
  border-left-color: darkgray;
  border-left-style: solid;
  border-top-right-radius: 1px;
  border-bottom-right-radius: 1px;
}

QComboBox QAbstractItemView {
  color: #657b83;
  background-color: #fcf9f0;
  border: 1px solid #073642;
  selection-background-color: #073642;
}

QComboBox::down-arrow {
  image: url(##/images/down_arrow_dark.png)
}</data>
 </skin>
\ No newline at end of file
diff --git a/resources/skins/base/vergilius.xml b/resources/skins/base/vergilius.xml
index 320ef2120..c11594588 100644
--- a/resources/skins/base/vergilius.xml
+++ b/resources/skins/base/vergilius.xml
@@ -6,8 +6,5 @@
     <email>rotter.martinos@gmail.com</email>
   </author>
   <style/>
-  <markup_wrapper>PGh0bWw+DQogIDxoZWFkPg0KICAgIDxzdHlsZT4NCiAgICAgIGJvZHkgew0KICAgICAgICBtYXJnaW46IDBweDsNCiAgICAgICAgcGFkZGluZzogMHB4Ow0KICAgICAgfQ0KICAgIA0KICAgICAgcHJlIHsNCiAgICAgICAgd2hpdGUtc3BhY2U6IHByZS13cmFwOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVydGV4dCB7DQogICAgICAgIGZvbnQtc2l6ZTogMjBweDsNCiAgICAgICAgbWFyZ2luLWJvdHRvbTogMTBweDsNCiAgICAgIH0NCg0KICAgICAgLmhlYWRlciB7DQogICAgICAgIGZvbnQtc2l6ZTogMTdweDsNCiAgICAgICAgYmFja2dyb3VuZDogLXdlYmtpdC1ncmFkaWVudChsaW5lYXIsIGxlZnQgdG9wLCBsZWZ0IGJvdHRvbSwgY29sb3Itc3RvcCgwJSxyZ2JhKDk5LDEzNSwyMjksMSkpLCBjb2xvci1zdG9wKDEwMCUscmdiYSg2NCwxMDksMjM2LDEpKSk7DQogICAgICAgIHBhZGRpbmc6IDZweDsNCiAgICAgICAgbWFyZ2luOiAwcHggYXV0bzsNCiAgICAgICAgY29sb3I6IHdoaXRlOw0KICAgICAgICBib3JkZXI6IDAuNXB4IHNvbGlkIGJsYWNrOw0KICAgICAgfQ0KDQogICAgICAuaGVhZGVyIGEgew0KICAgICAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7DQogICAgICAgIGNvbG9yOiB3aGl0ZTsNCiAgICAgICAgd29yZC13cmFwOiBicmVhay13b3JkOw0KICAgICAgfQ0KICAgICAgDQogICAgICAuaGVhZGVyIC5lbmNsb3N1cmUgew0KICAgICAgICB0ZXh0LWRlY29yYXRpb246IG5vbmU7DQogICAgICAgIGNvbG9yOiBibGFjazsNCiAgICAgICAgd29yZC13cmFwOiBicmVhay13b3JkOw0KICAgICAgfQ0KICAgICAgDQogICAgICAuZW5jbG9zdXJlOmhvdmVyLCAuaGVhZGVyIGE6aG92ZXIgew0KICAgICAgICB0ZXh0LWRlY29yYXRpb246IHVuZGVybGluZTsNCiAgICAgIH0NCg0KICAgICAgLmNvbnRlbnQgew0KICAgICAgICBib3JkZXItdG9wOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgZm9udC1zaXplOiAxNnB4Ow0KICAgICAgICBtYXJnaW46IDBweCBhdXRvOw0KICAgICAgICBwYWRkaW5nOiA2cHg7DQogICAgICAgIHBhZGRpbmctdG9wOiAxMnB4Ow0KICAgICAgfQ0KICAgICAgDQogICAgICAuY29udGFpbmVyIHsNCiAgICAgICAgYm9yZGVyOiAxcHggc29saWQgZ3JheTsNCiAgICAgICAgLXdlYmtpdC1ib3JkZXItcmFkaXVzOiAycHg7DQogICAgICAgIG1hcmdpbjogMTBweDsNCiAgICAgICAgLXdlYmtpdC1ib3gtc2hhZG93OiAycHggMnB4IDE2cHggMHB4IHJnYmEoNTAsIDUwLCA1MCwgMC42Mik7DQogICAgICB9DQogICAgPC9zdHlsZT4NCiAgICA8dGl0bGU+DQogICAgICAlMQ0KICAgIDwvdGl0bGU+DQogIDwvaGVhZD4NCiAgPGJvZHk+DQogICAgJTINCiAgPC9ib2R5Pg0KPC9odG1sPg==</markup_wrapper>
-  <markup>PGRpdiBjbGFzcz0iY29udGFpbmVyIj4NCiAgICAgIDxkaXYgY2xhc3M9ImhlYWRlciI+DQogICAgICAgIDxkaXYgY2xhc3M9ImhlYWRlcnRleHQiPg0KICAgICAgICAgICUxDQogICAgICAgIDwvZGl2Pg0KICAgICAgICAlMiAoJTUpDQogICAgICAgIDxicj4NCiAgICAgICAgPGEgaHJlZj0iJTMiPiUzPC9hPg0KICAgICAgICAlNg0KICAgICAgPC9kaXY+DQogICAgICA8ZGl2IGNsYXNzPSJjb250ZW50Ij4NCiAgICAgICAgJTQgDQogICAgICA8L2Rpdj4NCiAgICA8L2Rpdj4=</markup>
-  <markup_enclosure>PGEgY2xhc3M9ImVuY2xvc3VyZSIgaHJlZj0iJTMiPiUzPC9hPg==</markup_enclosure>
   <data>UVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOiFhZGpvaW5zLWl0ZW0gIHsNCiAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCn0NCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLXNpYmxpbmdzOmFkam9pbnMtaXRlbSB7DQogIGJvcmRlci1pbWFnZTogdXJsKHFzcy9kdW1teS5wbmcpIDA7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOiFoYXMtY2hpbGRyZW46IWhhcy1zaWJsaW5nczphZGpvaW5zLWl0ZW0gIHsNCiAgYm9yZGVyLWltYWdlOiB1cmwocXNzL2R1bW15LnBuZykgMDsNCn0NCg0KUVRyZWVWaWV3OjpicmFuY2g6aGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3M6Y2xvc2VkLA0KUVRyZWVWaWV3OjpicmFuY2g6Y2xvc2VkOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogdXJsKHFzcy9icmFuY2gtY2xvc2VkLnBuZyk7DQp9DQoNClFUcmVlVmlldzo6YnJhbmNoOm9wZW46aGFzLWNoaWxkcmVuOiFoYXMtc2libGluZ3MsDQpRVHJlZVZpZXc6OmJyYW5jaDpvcGVuOmhhcy1jaGlsZHJlbjpoYXMtc2libGluZ3MgIHsNCiAgYm9yZGVyLWltYWdlOiBub25lOw0KICBpbWFnZTogdXJsKHFzcy9icmFuY2gtb3Blbi5wbmcpOw0KfQ0KDQpRVHJlZVZpZXc6Oml0ZW0gew0KICBwYWRkaW5nOiAxcHggMXB4IDFweCAxcHg7DQp9IA0KDQpRVHJlZVZpZXdbaGlkZVRyZWU9InRydWUiXTo6YnJhbmNoOiFoYXMtY2hsaWRyZW46aGFzU2libGluZ3Mgew0KICBib3JkZXItaW1hZ2U6IG5vbmU7DQogIGltYWdlOiBub25lOw0KfQ0KDQpRU3RhdHVzQmFyOjppdGVtIHsNCiAgYm9yZGVyOiBub25lOw0KfQ==</data>
 </skin>
\ No newline at end of file
diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index cde7ce5ea..8b3a54d5f 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -3,8 +3,8 @@
 
 Main:
 
-▪ Internal web browser and message preview window now use component based on Chromium/Blink (QtWebEngine). Note that new QtWebEngine lacks some features and those were thus removed from RSS Guard, including Adblock, mouse gestures and some other features. Note that I was force to switch to this component because old Qt WebKit component will be removed from Qt.
-▪ RSS Guard now uses only Qt 5.6 or higher.
+▪ Internal web browser was REMOVED. This is because old Qt WebKit web component will be removed from Qt and new Qt component for web viewing is based on Chromium, which is fucking joke. Some people hate Chromium because of many (technocal, philosophical, etical) reasons. Moreover, it lacks some useful features and is memory hungry. It is also very buggy in Qt now. Therefore now internal web browser is gone. Message preview component now uses much lighter solution and still can display certain HTML subset. RSS Guard was tweaked to be more friendly to external web browser. Double-clicking any message results in it being opened via external web browser.
+▪ RSS Guard now depends only Qt 5.6 or higher.
 
 Added:
 
@@ -16,13 +16,11 @@ Added:
 Fixed:
 
 ▪ Download manager now correctly displays download progress/info.
-▪ When user selects "Save as..." for some file from internal web browser, file selection dialog is always shown. (bug #174)
 ▪ Better detection of MySQL server status. (bug #169)
 ▪ Ordering of messages is now done on SQL server (stands for both MySQL and SQLite). (bug #172)
 ▪ Now title of the RSS/ATOM message is taken into account when deciding message "uniqueness". (bug #171)
 ▪ MySQL scripts improved. (bug #170)
 ▪ Fixed little problem with feed list hiding. (bug #163)
-▪ Web browser search context menu item now trims the searched string. (bug #168)
 
 Changed:
 
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index f6c6f0ea7..18d0fe1e1 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -240,9 +240,9 @@ void FeedMessageViewer::createConnections() {
   
   // Message changers.
   connect(m_messagesView, SIGNAL(currentMessageRemoved()), m_messagesBrowser, SLOT(clear()));
-  connect(m_messagesView, SIGNAL(currentMessageChanged(Message)), m_messagesBrowser, SLOT(loadMessage(Message)));
+  connect(m_messagesView, SIGNAL(currentMessageChanged(Message,RootItem*)), m_messagesBrowser, SLOT(loadMessage(Message,RootItem*)));
   connect(m_messagesView, SIGNAL(currentMessageRemoved()), this, SLOT(updateMessageButtonsAvailability()));
-  connect(m_messagesView, SIGNAL(currentMessageChanged(Message)), this, SLOT(updateMessageButtonsAvailability()));
+  connect(m_messagesView, SIGNAL(currentMessageChanged(Message,RootItem*)), this, SLOT(updateMessageButtonsAvailability()));
   
   connect(m_feedsView, SIGNAL(itemSelected(RootItem*)), this, SLOT(updateFeedButtonsAvailability()));
   connect(qApp->feedUpdateLock(), SIGNAL(locked()), this, SLOT(updateFeedButtonsAvailability()));
@@ -253,16 +253,14 @@ void FeedMessageViewer::createConnections() {
   
   // State of many messages is changed, then we need
   // to reload selections.
-  connect(m_feedsView->sourceModel(), SIGNAL(reloadMessageListRequested(bool)), m_messagesView, SLOT(reloadSelections(bool)));
+  connect(m_feedsView->sourceModel(), SIGNAL(reloadMessageListRequested(bool)),
+          m_messagesView, SLOT(reloadSelections(bool)));
   connect(m_feedsView->sourceModel(), SIGNAL(feedsUpdateFinished()), this, SLOT(onFeedsUpdateFinished()));
   connect(m_feedsView->sourceModel(), SIGNAL(feedsUpdateStarted()), this, SLOT(onFeedsUpdateStarted()));
 
   // Message openers.
-  connect(m_messagesView, SIGNAL(openLinkMiniBrowser(QString)), m_messagesBrowser, SLOT(navigateToUrl(QString)));
   connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),
           form_main->m_ui->m_tabWidget, SLOT(addBrowserWithMessages(QList<Message>)));
-  connect(m_messagesView, SIGNAL(openLinkNewTab(QString)),
-          form_main->m_ui->m_tabWidget, SLOT(addLinkedBrowser(QString)));
   connect(m_feedsView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),
           form_main->m_ui->m_tabWidget, SLOT(addBrowserWithMessages(QList<Message>)));
   
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
index ef0ef8d25..a511bd6da 100644
--- a/src/gui/messagepreviewer.cpp
+++ b/src/gui/messagepreviewer.cpp
@@ -23,6 +23,7 @@
 #include "gui/dialogs/formmain.h"
 
 #include <QScrollBar>
+#include <QToolBar>
 
 
 MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
@@ -49,12 +50,29 @@ MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
     }
   });
 
+  m_toolBar = new QToolBar(this);
+  m_toolBar->setOrientation(Qt::Vertical);
+  m_ui->m_layout->addWidget(m_toolBar, 0, 0, -1, 1);
+
+  connect(m_actionMarkRead = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-read"), tr("Mark message as read")),
+          &QAction::triggered,
+          this,
+          &MessagePreviewer::markMessageAsRead);
+  connect(m_actionMarkUnread = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-unread"), tr("Mark message as unread")),
+          &QAction::triggered,
+          this,
+          &MessagePreviewer::markMessageAsUnread);
+  connect(m_actionSwitchImportance = m_toolBar->addAction(qApp->icons()->fromTheme("mail-mark-favorite"), tr("Switch message importance")),
+          &QAction::triggered,
+          this,
+          &MessagePreviewer::switchMessageImportance);
+
+  m_actionSwitchImportance->setCheckable(true);
+
   clear();
 }
 
-
 MessagePreviewer::~MessagePreviewer() {
-  delete m_ui;
 }
 
 void MessagePreviewer::clear() {
@@ -64,19 +82,40 @@ void MessagePreviewer::clear() {
   hide();
 }
 
-void MessagePreviewer::loadMessage(const Message &message) {
-  m_ui->m_lblTitle->setText(message.m_title);
-  m_ui->m_txtMessage->setHtml(prepareHtmlForMessage(message));
-  show();
+void MessagePreviewer::loadMessage(const Message &message, RootItem *root) {
+  m_message = message;
+  m_root = root;
+
+  m_actionMarkRead->setEnabled(!message.m_isRead);
+  m_actionMarkUnread->setEnabled(message.m_isRead);
+  m_actionSwitchImportance->setChecked(message.m_isImportant);
+
+  if (!m_root.isNull()) {
+    m_ui->m_lblTitle->setText(message.m_title);
+    m_ui->m_txtMessage->setHtml(prepareHtmlForMessage(message));
+    show();
+
+    m_ui->m_txtMessage->verticalScrollBar()->triggerAction(QScrollBar::SliderToMinimum);
+  }
+}
+
+void MessagePreviewer::markMessageAsRead() {
+
+}
+
+void MessagePreviewer::markMessageAsUnread() {
+
+}
+
+void MessagePreviewer::switchMessageImportance(bool checked) {
 
-  m_ui->m_txtMessage->verticalScrollBar()->triggerAction(QScrollBar::SliderToMinimum);
 }
 
 QString MessagePreviewer::prepareHtmlForMessage(const Message &message) {
-  QString html = QString("<p><a href=\"%1\">%1</a><p/>").arg(message.m_url);
+  QString html = QString("<p>[url] <a href=\"%1\">%1</a></p>").arg(message.m_url);
 
   foreach (const Enclosure &enc, message.m_enclosures) {
-    html += QString("<p>[%2] <a href=\"%1\">%1</a><p/>").arg(enc.m_url, enc.m_mimeType);
+    html += QString("<p>[%2] <a href=\"%1\">%1</a></p>").arg(enc.m_url, enc.m_mimeType);
   }
 
   if (!message.m_enclosures.isEmpty()) {
diff --git a/src/gui/messagepreviewer.h b/src/gui/messagepreviewer.h
index eb9dee1d4..f8e9a3e3f 100644
--- a/src/gui/messagepreviewer.h
+++ b/src/gui/messagepreviewer.h
@@ -23,12 +23,17 @@
 #include "ui_messagepreviewer.h"
 
 #include "core/message.h"
+#include "services/abstract/rootitem.h"
+
+#include <QPointer>
 
 
 namespace Ui {
   class MessagePreviewer;
 }
 
+class QToolBar;
+
 class MessagePreviewer : public QWidget {
     Q_OBJECT
 
@@ -38,12 +43,24 @@ class MessagePreviewer : public QWidget {
 
   public slots:
     void clear();
-    void loadMessage(const Message &message);
+    void loadMessage(const Message &message, RootItem *root);
+
+  private slots:
+    void markMessageAsRead();
+    void markMessageAsUnread();
+    void switchMessageImportance(bool checked);
 
   private:
     QString prepareHtmlForMessage(const Message &message);
 
-    Ui::MessagePreviewer *m_ui;
+    QToolBar *m_toolBar;
+    QScopedPointer<Ui::MessagePreviewer> m_ui;
+    Message m_message;
+    QPointer<RootItem> m_root;
+
+    QAction *m_actionMarkRead;
+    QAction *m_actionMarkUnread;
+    QAction *m_actionSwitchImportance;
 };
 
 #endif // MESSAGEPREVIEWER_H
diff --git a/src/gui/messagepreviewer.ui b/src/gui/messagepreviewer.ui
index 87a091655..2965eddf7 100644
--- a/src/gui/messagepreviewer.ui
+++ b/src/gui/messagepreviewer.ui
@@ -16,8 +16,17 @@
   <property name="autoFillBackground">
    <bool>true</bool>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout">
-   <item>
+  <layout class="QGridLayout" name="m_layout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
+   <item row="0" column="1">
     <widget class="QLabel" name="m_lblTitle">
      <property name="font">
       <font>
@@ -28,7 +37,7 @@
       <bool>true</bool>
      </property>
      <property name="text">
-      <string>avas</string>
+      <string/>
      </property>
      <property name="alignment">
       <set>Qt::AlignCenter</set>
@@ -36,9 +45,15 @@
      <property name="wordWrap">
       <bool>true</bool>
      </property>
+     <property name="margin">
+      <number>0</number>
+     </property>
+     <property name="textInteractionFlags">
+      <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+     </property>
     </widget>
    </item>
-   <item>
+   <item row="1" column="1">
     <widget class="QTextBrowser" name="m_txtMessage">
      <property name="autoFillBackground">
       <bool>true</bool>
@@ -49,6 +64,9 @@
      <property name="frameShadow">
       <enum>QFrame::Plain</enum>
      </property>
+     <property name="tabChangesFocus">
+      <bool>true</bool>
+     </property>
      <property name="openLinks">
       <bool>false</bool>
      </property>
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index aa742e39c..57ac3d6d5 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -203,7 +203,7 @@ void MessagesView::selectionChanged(const QItemSelection &selected, const QItemS
       m_sourceModel->setMessageRead(mapped_current_index.row(), RootItem::Read);
     }
 
-    emit currentMessageChanged(message);
+    emit currentMessageChanged(message, m_sourceModel->loadedItem());
   }
   else {
     emit currentMessageRemoved();
diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h
index 2cc069e2a..2f79d0c9f 100755
--- a/src/gui/messagesview.h
+++ b/src/gui/messagesview.h
@@ -95,7 +95,7 @@ class MessagesView : public QTreeView {
     void openMessagesInNewspaperView(const QList<Message> &messages);
 
     // Notify others about message selections.
-    void currentMessageChanged(const Message &message);
+    void currentMessageChanged(const Message &message, RootItem *root);
     void currentMessageRemoved();
 
   private:
diff --git a/src/miscellaneous/skinfactory.cpp b/src/miscellaneous/skinfactory.cpp
index 15c50050f..b837fabb2 100755
--- a/src/miscellaneous/skinfactory.cpp
+++ b/src/miscellaneous/skinfactory.cpp
@@ -135,19 +135,6 @@ Skin SkinFactory::skinInfo(const QString &skin_name, bool *ok) const {
 
   // Obtain version.
   skin.m_version = skin_node.attributes().namedItem(QSL("version")).toAttr().value();
-
-  // Obtain layout markup wrapper.
-  skin.m_layoutMarkupWrapper = skin_node.namedItem(QSL("markup_wrapper")).toElement().text();
-  skin.m_layoutMarkupWrapper = QByteArray::fromBase64(skin.m_layoutMarkupWrapper.toLocal8Bit());
-
-  // Obtain layout markup.
-  skin.m_layoutMarkup = skin_node.namedItem(QSL("markup")).toElement().text();
-  skin.m_layoutMarkup = QByteArray::fromBase64(skin.m_layoutMarkup.toLocal8Bit());
-
-  // Obtain enclosure hyperlink wrapper.
-  skin.m_enclosureMarkup = skin_node.namedItem(QSL("markup_enclosure")).toElement().text();
-  skin.m_enclosureMarkup = QByteArray::fromBase64(skin.m_enclosureMarkup.toLocal8Bit());
-
   // Obtain other information.
   skin.m_baseName = QString(skin_name).replace(QDir::separator(), '/');
 
@@ -157,8 +144,7 @@ Skin SkinFactory::skinInfo(const QString &skin_name, bool *ok) const {
 
   if (ok != NULL) {
     *ok = !skin.m_author.isEmpty() && !skin.m_version.isEmpty() &&
-          !skin.m_baseName.isEmpty() && !skin.m_email.isEmpty() &&
-          !skin.m_layoutMarkup.isEmpty();
+          !skin.m_baseName.isEmpty() && !skin.m_email.isEmpty();
   }
 
   return skin;
diff --git a/src/miscellaneous/skinfactory.h b/src/miscellaneous/skinfactory.h
index ca62e670f..423b2d29c 100755
--- a/src/miscellaneous/skinfactory.h
+++ b/src/miscellaneous/skinfactory.h
@@ -32,9 +32,6 @@ struct Skin {
     QString m_email;
     QString m_version;
     QString m_rawData;
-    QString m_layoutMarkupWrapper;
-    QString m_layoutMarkup;
-    QString m_enclosureMarkup;
 };
 
 Q_DECLARE_METATYPE(Skin)

From 27d892cb715e3a4d7829f7bf75cb24395cefe8bb Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 12:23:08 +0200
Subject: [PATCH 19/31] Copy only needed dlls.

---
 CMakeLists.txt     | 126 +++++++++++++++++++++++----------------------
 resources/binaries |   2 +-
 2 files changed, 66 insertions(+), 62 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36620879e..5f07f5c56 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,7 +141,7 @@ if(EXISTS "${PROJECT_SOURCE_DIR}/.git")
       COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
       WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
       OUTPUT_VARIABLE GIT_REVISION
-    )
+      )
 
     string(REGEX REPLACE "\n" "" GIT_REVISION "${GIT_REVISION}")
     set(APP_REVISION ${GIT_REVISION})
@@ -163,7 +163,7 @@ if(UNIX)
   configure_file (
     ${PROJECT_SOURCE_DIR}/resources/desktop/rssguard.desktop.in
     ${CMAKE_BINARY_DIR}/resources/desktop/rssguard.desktop
-  )
+    )
   set(DESKTOP_ENTRY_PATH ${CMAKE_INSTALL_PREFIX}/share/applications)
 endif(UNIX)
 
@@ -171,7 +171,7 @@ endif(UNIX)
 configure_file (
   ${PROJECT_SOURCE_DIR}/src/definitions/definitions.h.in
   ${CMAKE_BINARY_DIR}/src/definitions/definitions.h
-)
+  )
 
 # Define some useful DEBUG for, ehrm, debug build.
 if(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RELEASE")
@@ -183,15 +183,15 @@ else(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release"
   add_definitions(-DDEBUG)
   set(CMAKE_BUILD_TYPE Debug)
 
-# Enable compiler warnings.
-# See http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
-message(STATUS "[${APP_LOW_NAME}] Enabling verbose makefile and full warning reports.")
-if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
-  add_definitions(-pedantic -Wall)  # -Wextra -Wno-unused-variable
-endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+  # Enable compiler warnings.
+  # See http://stackoverflow.com/questions/2368811/how-to-set-warning-level-in-cmake
+  message(STATUS "[${APP_LOW_NAME}] Enabling verbose makefile and full warning reports.")
+  if(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
+    add_definitions(-pedantic -Wall)  # -Wextra -Wno-unused-variable
+  endif(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_GNUCXX)
 
-# Verbose compiling outputs.
-set(CMAKE_VERBOSE_MAKEFILE ON)
+  # Verbose compiling outputs.
+  set(CMAKE_VERBOSE_MAKEFILE ON)
 endif(CMAKE_BUILD_TYPE STREQUAL "release" OR CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "RELEASE")
 
 # Force Qt to use string builders.
@@ -205,7 +205,7 @@ add_definitions(-DUNICODE -D_UNICODE)
 if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
   execute_process(
     COMMAND ${CMAKE_CXX_COMPILER} -dumpversion OUTPUT_VARIABLE GCC_VERSION
-  )
+    )
   if(${GCC_VERSION} VERSION_GREATER 4.7 OR ${GCC_VERSION} VERSION_EQUAL 4.7)
     add_definitions(-std=c++11)
   elseif(GCC_VERSION VERSION_GREATER 4.3 OR GCC_VERSION VERSION_EQUAL 4.3)
@@ -246,7 +246,7 @@ if(WIN32)
   configure_file (
     ${PROJECT_SOURCE_DIR}/resources/executable_properties/rssguard_win.rc.in
     ${CMAKE_BINARY_DIR}/resources/executable_properties/rssguard_win.rc
-  )
+    )
 endif(WIN32)
 
 # Set special linker flag for Windows XP & MSVC++ 2013 support.
@@ -261,11 +261,11 @@ if(WIN32 AND MINGW)
   message(STATUS "[${APP_LOW_NAME}] Icon file binary will be builded for Windows.")
   message(STATUS "[${APP_LOW_NAME}] Used tool is: ${CMAKE_RC_COMPILER}")
   set(CMAKE_RC_COMPILE_OBJECT
-      "<CMAKE_RC_COMPILER> -i <SOURCE> -o <OBJECT>")
+    "<CMAKE_RC_COMPILER> -i <SOURCE> -o <OBJECT>")
 
   set(APP_SOURCES
-      ${APP_SOURCES}
-      ${CMAKE_BINARY_DIR}/resources/executable_properties/rssguard_win.rc)
+    ${APP_SOURCES}
+    ${CMAKE_BINARY_DIR}/resources/executable_properties/rssguard_win.rc)
 elseif(WIN32 AND MSVC)
   # MSVC takes care of this automatically - no need to use windres.exe
   # for MSVC compilers.
@@ -302,7 +302,7 @@ file( GLOB APP_SOURCES_GL
 set(APP_SOURCES
   ${APP_SOURCES}
   ${APP_SOURCES_GL}
-)
+  )
 
 # APP headers.
 file( GLOB APP_HEADERS
@@ -352,6 +352,12 @@ if(WIN32)
   file( GLOB APP_DLLS_QT5_MSVC2013
     "resources/binaries/windows/qt5-msvc2013/*.dll")
 
+  file( GLOB APP_DLLS_QT5_MSVC2013_BEARER
+    "resources/binaries/windows/qt5-msvc2013/bearer/*.dll")
+
+  file( GLOB APP_DLLS_QT5_MSVC2013_ICONENGINES
+    "resources/binaries/windows/qt5-msvc2013/iconengines/*.dll")
+
   file( GLOB APP_DLLS_QT5_MSVC2013_IMAGEFORMATS
     "resources/binaries/windows/qt5-msvc2013/imageformats/*.dll")
 
@@ -360,9 +366,6 @@ if(WIN32)
 
   file( GLOB APP_DLLS_QT5_MSVC2013_PLATFORMS
     "resources/binaries/windows/qt5-msvc2013/platforms/*.dll")
-
-  file( GLOB APP_DLLS_QT5_MSVC2013_PRINTSUPPORT
-    "resources/binaries/windows/qt5-msvc2013/printsupport/*.dll")
 endif(WIN32)
 
 # Add custom icon on Mac OS X.
@@ -390,7 +393,7 @@ include_directories (
   ${CMAKE_SOURCE_DIR}/src/network-web
   ${CMAKE_SOURCE_DIR}/src/dynamic-shortcuts
   ${CMAKE_BINARY_DIR}/src
-)
+  )
 
 # Compile "rssguard"
 add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE
@@ -398,7 +401,7 @@ add_executable(${EXE_NAME} WIN32 MACOSX_BUNDLE
   ${APP_FORMS}
   ${APP_RCC}
   ${APP_QM}
-)
+  )
 
 if(WIN32)
   target_link_libraries(${EXE_NAME} Qt5::WinMain)
@@ -414,9 +417,9 @@ if(UNIX)
     Network
     Xml
     PrintSupport
-  )
+    )
 else(UNIX)
-# Use modules from Qt.
+  # Use modules from Qt.
   qt5_use_modules(${EXE_NAME}
     Core
     Widgets
@@ -424,7 +427,7 @@ else(UNIX)
     Network
     Xml
     PrintSupport
-  )
+    )
 endif(UNIX)
 
 # Installation stage.
@@ -435,10 +438,11 @@ if(WIN32)
   # Copy DLLs and other binary files for main installation.
   if(WIN32)
     install(FILES ${APP_DLLS_QT5_MSVC2013} DESTINATION ./)
+    install(FILES ${APP_DLLS_QT5_MSVC2013_BEARER} DESTINATION ./bearer)
+    install(FILES ${APP_DLLS_QT5_MSVC2013_ICONENGINES} DESTINATION ./iconengines)
     install(FILES ${APP_DLLS_QT5_MSVC2013_IMAGEFORMATS} DESTINATION ./imageformats)
-    install(FILES ${APP_DLLS_QT5_MSVC2013_SQLDRIVERS} DESTINATION ./sqldrivers)
     install(FILES ${APP_DLLS_QT5_MSVC2013_PLATFORMS} DESTINATION ./platforms)
-    install(FILES ${APP_DLLS_QT5_MSVC2013_PRINTSUPPORT} DESTINATION ./printsupport)
+    install(FILES ${APP_DLLS_QT5_MSVC2013_SQLDRIVERS} DESTINATION ./sqldrivers)
   endif(WIN32)
 
   install(DIRECTORY resources/graphics/icons/mini-kfaenza DESTINATION ./icons)
@@ -450,33 +454,33 @@ if(WIN32)
   endif(ENABLE_ADDITIONAL_ICONS)
 
   install(DIRECTORY resources/skins/base
-          DESTINATION ./skins)
+    DESTINATION ./skins)
   install(DIRECTORY resources/misc
-          DESTINATION ./)
+    DESTINATION ./)
   install(DIRECTORY resources/initial_feeds
-          DESTINATION ./)
+    DESTINATION ./)
   install(FILES resources/graphics/${APP_LOW_NAME}_128.png
-          DESTINATION ./
-          RENAME ${APP_LOW_NAME}.png)
+    DESTINATION ./
+    RENAME ${APP_LOW_NAME}.png)
   install(FILES resources/graphics/${APP_LOW_NAME}_plain_128.png
-          DESTINATION ./
-          RENAME ${APP_LOW_NAME}_plain.png)
+    DESTINATION ./
+    RENAME ${APP_LOW_NAME}_plain.png)
   install(FILES resources/graphics/${APP_LOW_NAME}.ico
-          DESTINATION ./)
+    DESTINATION ./)
   install(FILES ${APP_QM}
-          DESTINATION ./l10n)
+    DESTINATION ./l10n)
   install(FILES ${APP_TEXT}
-          DESTINATION ./)
+    DESTINATION ./)
 elseif(APPLE)
   message(STATUS "[${APP_LOW_NAME}] You will probably install on Mac OS X.")
 
   set_target_properties(${EXE_NAME}
-                        PROPERTIES
-                        MACOSX_BUNDLE_INFO_PLIST
-                        "${CMAKE_SOURCE_DIR}/resources/macosx/Info.plist.in")
+    PROPERTIES
+    MACOSX_BUNDLE_INFO_PLIST
+    "${CMAKE_SOURCE_DIR}/resources/macosx/Info.plist.in")
 
   set_source_files_properties(${CMAKE_SOURCE_DIR}/resources/macosx/${APP_LOW_NAME}.icns
-                              PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
+    PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 
   set(MACOSX_BUNDLE_ICON_FILE ${APP_LOW_NAME}.icns)
   set(MACOSX_BUNDLE_INFO_STRING "${EXE_NAME} ${APP_VERSION}")
@@ -546,30 +550,30 @@ set(CPACK_PACKAGE_VERSION_PATCH "0")
 set(CPACK_PACKAGE_VENDOR ${APP_AUTHOR})
 set(CPACK_PACKAGE_INSTALL_REGISTRY_KEY ${APP_NAME})
 set(CPACK_IGNORE_FILES "/resources/aur/;\\\\.psd$;/resources/deployment;/CVS/;/\\\\.svn/;/\\\\.git/;\\\\.swp$;/CMakeLists.txt.user;\\\\.#;/#;\\\\.tar.gz$;/CMakeFiles/;CMakeCache.txt;\\\\.qm$;/build/;\\\\.diff$;.DS_Store'")
-set(CPACK_SOURCE_GENERATOR "TGZ")
-set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
-set(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES})
+  set(CPACK_SOURCE_GENERATOR "TGZ")
+  set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
+  set(CPACK_SOURCE_IGNORE_FILES ${CPACK_IGNORE_FILES})
 
-set(CPACK_NSIS_INSTALLED_ICON_NAME "${APP_LOW_NAME}.ico")
-set(CPACK_NSIS_HELP_LINK ${APP_URL})
-set(CPACK_NSIS_URL_INFO_ABOUT ${APP_URL})
-set(CPACK_NSIS_CONTACT ${APP_EMAIL})
+  set(CPACK_NSIS_INSTALLED_ICON_NAME "${APP_LOW_NAME}.ico")
+  set(CPACK_NSIS_HELP_LINK ${APP_URL})
+  set(CPACK_NSIS_URL_INFO_ABOUT ${APP_URL})
+  set(CPACK_NSIS_CONTACT ${APP_EMAIL})
 
-# Load packaging facilities.
-include(CPack)
+  # Load packaging facilities.
+  include(CPack)
 
-# Configure file with custom definitions for NSIS.
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/resources/nsis/NSIS.definitions.nsh.in
-  ${CMAKE_CURRENT_BINARY_DIR}/resources/nsis/NSIS.definitions.nsh
-)
+  # Configure file with custom definitions for NSIS.
+  configure_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/resources/nsis/NSIS.definitions.nsh.in
+    ${CMAKE_CURRENT_BINARY_DIR}/resources/nsis/NSIS.definitions.nsh
+    )
 
-# make dist implementation.
-add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
+  # make dist implementation.
+  add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
-# make lupdate implementation.
-add_custom_target(lupdate
-  ${Qt5Core_QMAKE_EXECUTABLE} -project -o ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
+  # make lupdate implementation.
+  add_custom_target(lupdate
+    ${Qt5Core_QMAKE_EXECUTABLE} -project -o ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
     COMMAND ${Qt5_LUPDATE_EXECUTABLE} -no-obsolete -ts ${APP_TRANSLATIONS_WO_QT} -pro ${CMAKE_BINARY_DIR}/${APP_LOW_NAME}.pro
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-)
+    )
diff --git a/resources/binaries b/resources/binaries
index 9ac6aeaba..2392b936c 160000
--- a/resources/binaries
+++ b/resources/binaries
@@ -1 +1 @@
-Subproject commit 9ac6aeabaae34afe02602f51dae7fc181aff49dd
+Subproject commit 2392b936c08eac92a6a34361a916a739f53836d0

From d7bcf3c3fc0fc7de33d62a754ceab96568959890 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 12:52:21 +0200
Subject: [PATCH 20/31] Enable msg status change from previewer.

---
 src/gui/feedmessageviewer.cpp |  4 ++-
 src/gui/messagepreviewer.cpp  | 48 +++++++++++++++++++++++++++++++++++
 src/gui/messagepreviewer.h    |  3 +++
 src/gui/messagesview.cpp      |  1 +
 4 files changed, 55 insertions(+), 1 deletion(-)

diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 18d0fe1e1..66c7549d6 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -243,7 +243,9 @@ void FeedMessageViewer::createConnections() {
   connect(m_messagesView, SIGNAL(currentMessageChanged(Message,RootItem*)), m_messagesBrowser, SLOT(loadMessage(Message,RootItem*)));
   connect(m_messagesView, SIGNAL(currentMessageRemoved()), this, SLOT(updateMessageButtonsAvailability()));
   connect(m_messagesView, SIGNAL(currentMessageChanged(Message,RootItem*)), this, SLOT(updateMessageButtonsAvailability()));
-  
+  connect(m_messagesBrowser, SIGNAL(requestMessageListReload(bool)), m_messagesView, SLOT(reloadSelections(bool)));
+
+
   connect(m_feedsView, SIGNAL(itemSelected(RootItem*)), this, SLOT(updateFeedButtonsAvailability()));
   connect(qApp->feedUpdateLock(), SIGNAL(locked()), this, SLOT(updateFeedButtonsAvailability()));
   connect(qApp->feedUpdateLock(), SIGNAL(unlocked()), this, SLOT(updateFeedButtonsAvailability()));
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
index a511bd6da..0190dc08c 100644
--- a/src/gui/messagepreviewer.cpp
+++ b/src/gui/messagepreviewer.cpp
@@ -21,9 +21,11 @@
 #include "network-web/webfactory.h"
 #include "gui/messagebox.h"
 #include "gui/dialogs/formmain.h"
+#include "services/abstract/serviceroot.h"
 
 #include <QScrollBar>
 #include <QToolBar>
+#include <QSqlQuery>
 
 
 MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
@@ -100,15 +102,61 @@ void MessagePreviewer::loadMessage(const Message &message, RootItem *root) {
 }
 
 void MessagePreviewer::markMessageAsRead() {
+  if (!m_root.isNull()) {
+    if (m_root->getParentServiceRoot()->onBeforeSetMessagesRead(m_root.data(),
+                                                                QList<Message>() << m_message,
+                                                                RootItem::Read)) {
 
+      // TODO: upravit v db.
+      QSqlQuery query_read_msg(qApp->database()->connection(objectName(), DatabaseFactory::FromSettings));
+      query_read_msg.setForwardOnly(true);
+
+      query_read_msg.prepare(QSL("UPDATE Messages SET is_read = :read WHERE id = :id;"));
+      query_read_msg.bindValue(QSL(":id"), m_message.m_id);
+      query_read_msg.bindValue(QSL(":read"), 1);
+      query_read_msg.exec();
+
+      m_root->getParentServiceRoot()->onAfterSetMessagesRead(m_root.data(),
+                                                             QList<Message>() << m_message,
+                                                             RootItem::Read);
+
+      emit requestMessageListReload(false);
+    }
+  }
 }
 
 void MessagePreviewer::markMessageAsUnread() {
+  if (!m_root.isNull()) {
+    if (m_root->getParentServiceRoot()->onBeforeSetMessagesRead(m_root.data(),
+                                                                QList<Message>() << m_message,
+                                                                RootItem::Unread)) {
 
+      // TODO: upravit v db.
+
+      m_root->getParentServiceRoot()->onAfterSetMessagesRead(m_root.data(),
+                                                             QList<Message>() << m_message,
+                                                             RootItem::Unread);
+    }
+  }
 }
 
 void MessagePreviewer::switchMessageImportance(bool checked) {
+  if (!m_root.isNull()) {
+    if (m_root->getParentServiceRoot()->onBeforeSwitchMessageImportance(m_root.data(),
+                                                                        QList<ImportanceChange>() << ImportanceChange(m_message,
+                                                                                                                      m_message.m_isImportant ?
+                                                                                                                      RootItem::NotImportant :
+                                                                                                                      RootItem::Important))) {
 
+      // TODO: upravit v db.
+
+      m_root->getParentServiceRoot()->onBeforeSwitchMessageImportance(m_root.data(),
+                                                                      QList<ImportanceChange>() << ImportanceChange(m_message,
+                                                                                                                    m_message.m_isImportant ?
+                                                                                                                    RootItem::NotImportant :
+                                                                                                                    RootItem::Important));
+    }
+  }
 }
 
 QString MessagePreviewer::prepareHtmlForMessage(const Message &message) {
diff --git a/src/gui/messagepreviewer.h b/src/gui/messagepreviewer.h
index f8e9a3e3f..124910c4c 100644
--- a/src/gui/messagepreviewer.h
+++ b/src/gui/messagepreviewer.h
@@ -50,6 +50,9 @@ class MessagePreviewer : public QWidget {
     void markMessageAsUnread();
     void switchMessageImportance(bool checked);
 
+  signals:
+    void requestMessageListReload(bool mark_current_as_read);
+
   private:
     QString prepareHtmlForMessage(const Message &message);
 
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 57ac3d6d5..836bd32b7 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -201,6 +201,7 @@ void MessagesView::selectionChanged(const QItemSelection &selected, const QItemS
       // Set this message as read only if current item
       // wasn't changed by "mark selected messages unread" action.
       m_sourceModel->setMessageRead(mapped_current_index.row(), RootItem::Read);
+      message.m_isRead = true;
     }
 
     emit currentMessageChanged(message, m_sourceModel->loadedItem());

From 6591047fec26e836c1f6e8d293972ec0c2b2870e Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 13:10:58 +0200
Subject: [PATCH 21/31] Operations in previewer work.

---
 src/gui/feedsview.cpp        |  1 -
 src/gui/messagepreviewer.cpp | 20 ++++++++++++++++----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index 09d4f6975..11f68f3f0 100755
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -323,7 +323,6 @@ void FeedsView::openSelectedItemsInNewspaperMode() {
 
   if (!messages.isEmpty()) {
     emit openMessagesInNewspaperView(messages);
-    QTimer::singleShot(150, this, SLOT(markSelectedItemRead()));
   }
 }
 
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
index 0190dc08c..243bedcf9 100644
--- a/src/gui/messagepreviewer.cpp
+++ b/src/gui/messagepreviewer.cpp
@@ -106,8 +106,6 @@ void MessagePreviewer::markMessageAsRead() {
     if (m_root->getParentServiceRoot()->onBeforeSetMessagesRead(m_root.data(),
                                                                 QList<Message>() << m_message,
                                                                 RootItem::Read)) {
-
-      // TODO: upravit v db.
       QSqlQuery query_read_msg(qApp->database()->connection(objectName(), DatabaseFactory::FromSettings));
       query_read_msg.setForwardOnly(true);
 
@@ -130,12 +128,19 @@ void MessagePreviewer::markMessageAsUnread() {
     if (m_root->getParentServiceRoot()->onBeforeSetMessagesRead(m_root.data(),
                                                                 QList<Message>() << m_message,
                                                                 RootItem::Unread)) {
+      QSqlQuery query_read_msg(qApp->database()->connection(objectName(), DatabaseFactory::FromSettings));
+      query_read_msg.setForwardOnly(true);
 
-      // TODO: upravit v db.
+      query_read_msg.prepare(QSL("UPDATE Messages SET is_read = :read WHERE id = :id;"));
+      query_read_msg.bindValue(QSL(":id"), m_message.m_id);
+      query_read_msg.bindValue(QSL(":read"), 0);
+      query_read_msg.exec();
 
       m_root->getParentServiceRoot()->onAfterSetMessagesRead(m_root.data(),
                                                              QList<Message>() << m_message,
                                                              RootItem::Unread);
+
+      emit requestMessageListReload(false);
     }
   }
 }
@@ -147,14 +152,21 @@ void MessagePreviewer::switchMessageImportance(bool checked) {
                                                                                                                       m_message.m_isImportant ?
                                                                                                                       RootItem::NotImportant :
                                                                                                                       RootItem::Important))) {
+      QSqlQuery query_read_msg(qApp->database()->connection(objectName(), DatabaseFactory::FromSettings));
+      query_read_msg.setForwardOnly(true);
 
-      // TODO: upravit v db.
+      query_read_msg.prepare(QSL("UPDATE Messages SET is_important = :important WHERE id = :id;"));
+      query_read_msg.bindValue(QSL(":id"), m_message.m_id);
+      query_read_msg.bindValue(QSL(":important"), (int) checked);
+      query_read_msg.exec();
 
       m_root->getParentServiceRoot()->onBeforeSwitchMessageImportance(m_root.data(),
                                                                       QList<ImportanceChange>() << ImportanceChange(m_message,
                                                                                                                     m_message.m_isImportant ?
                                                                                                                     RootItem::NotImportant :
                                                                                                                     RootItem::Important));
+
+      emit requestMessageListReload(false);
     }
   }
 }

From 649af6089bccb6386e2ed5c6e0d957c96c701d19 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 13:28:08 +0200
Subject: [PATCH 22/31] Tweaked readme.

---
 README.md | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index 65ff8c76e..2a5f426d7 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@ RSS Guard
 =========
 Welcome to RSS Guard website. You can find here basic information.
 
-RSS Guard is simple and easy-to-use RSS/ATOM feed aggregator developed using Qt framework which supports online feed synchronization.
+RSS Guard is simple, light and easy-to-use RSS/ATOM feed aggregator developed using Qt framework which supports online feed synchronization.
 
 #####################
 # **PLEASE, ALL USERS -> fill [this survey](http://goo.gl/forms/GcvPYgS2a8).**
@@ -80,7 +80,6 @@ RSS Guard is simple (yet powerful) feed reader. It is able to fetch the most kno
 
 * Windows XP and newer,
 * GNU/Linux,
-* OS/2 (eComStation),
 * Mac OS X,
 * xBSD (possibly),
 * Android (possibly),
@@ -98,9 +97,9 @@ RSS Guard is written in C++. It is pretty fast even with tons of messages loaded
 * downloader with own tab and support for up to 6 parallel downloads,
 * message filter with regular expressions,
 * feed metadata fetching including icons,
-* simple Adblock functionality,
-* customized popup notifications,
-* Google-based auto-completion for internal web browser location bar,
+* no crazy dependencies,
+* small memory footprint,
+* small installation package,
 * ability to cleanup internal message database with various options,
 * enhanced feed auto-updating with separate time intervals,
 * multiple data backend support,
@@ -111,11 +110,9 @@ RSS Guard is written in C++. It is pretty fast even with tons of messages loaded
 * feed categorization,
 * drap-n-drop for feed list,
 * automatic checking for updates,
-* ability to discover existing feeds on websites,
 * full support of podcasts (both RSS & ATOM),
 * ability to backup/restore database or settings,
 * fully-featured recycle bin,
-* printing of messages and any web pages,
 * can be fully controlled via keyboard,
 * feed authentication (Digest-MD5, BASIC, NTLM-2),
 * handles tons of messages & feeds,
@@ -131,8 +128,6 @@ RSS Guard is written in C++. It is pretty fast even with tons of messages loaded
 * ability to hide list of feeds/categories,
 * open-source development model based on GNU GPL license, version 3,
 * tabbed interface,
-* integrated web browser with adjustable behavior + external browser support,
-* internal web browser mouse gestures support,
 * desktop integration via tray icon,
 * localizations to some languages,
 * Qt library is the only dependency,

From 2eb40949c9f9b67324a16077fdb9ae954e5fcc6b Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Fri, 1 Apr 2016 13:33:51 +0200
Subject: [PATCH 23/31] Tweaked readme.

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2a5f426d7..750002092 100644
--- a/README.md
+++ b/README.md
@@ -14,10 +14,9 @@ Core features are:
     * Tiny Tiny RSS (from RSS Guard 3.0.0),
     * ownCloud News (from RSS Guard 3.1.0).
 * multiplatformity,
-* multiple data backend support,
+* multiple data backend support.
     * SQLite (in-memory DBs too),
     * MySQL.
-* Adblock.
 
 See below for more information about features and other RSS Guard aspects.
 

From 724165b0ddd705e674f59bacf2e4177b0b464bf2 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 3 Apr 2016 06:49:00 +0200
Subject: [PATCH 24/31] Added newspaper view widget.

---
 src/gui/feedmessageviewer.cpp  |   4 +-
 src/gui/messagesview.cpp       |   2 +-
 src/gui/messagesview.h         |   2 +-
 src/gui/newspaperpreviewer.cpp |  58 +++++++++++++++++++
 src/gui/newspaperpreviewer.h   |  58 +++++++++++++++++++
 src/gui/newspaperpreviewer.ui  | 102 +++++++++++++++++++++++++++++++++
 src/gui/tabwidget.cpp          |   7 ++-
 src/gui/tabwidget.h            |   3 +-
 8 files changed, 228 insertions(+), 8 deletions(-)
 create mode 100644 src/gui/newspaperpreviewer.cpp
 create mode 100644 src/gui/newspaperpreviewer.h
 create mode 100644 src/gui/newspaperpreviewer.ui

diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 66c7549d6..68f598dcf 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -261,8 +261,8 @@ void FeedMessageViewer::createConnections() {
   connect(m_feedsView->sourceModel(), SIGNAL(feedsUpdateStarted()), this, SLOT(onFeedsUpdateStarted()));
 
   // Message openers.
-  connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),
-          form_main->m_ui->m_tabWidget, SLOT(addBrowserWithMessages(QList<Message>)));
+  connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(RootItem*,QList<Message>)),
+          form_main->m_ui->m_tabWidget, SLOT(addBrowserWithMessages(RootItem*,QList<Message>)));
   connect(m_feedsView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),
           form_main->m_ui->m_tabWidget, SLOT(addBrowserWithMessages(QList<Message>)));
   
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 836bd32b7..79bc5d96b 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -258,7 +258,7 @@ void MessagesView::openSelectedMessagesInternally() {
   }
 
   if (!messages.isEmpty()) {
-    emit openMessagesInNewspaperView(messages);
+    emit openMessagesInNewspaperView(m_sourceModel->loadedItem(), messages);
 
     // Finally, mark opened messages as read.
     QTimer::singleShot(0, this, SLOT(markSelectedMessagesRead()));
diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h
index 2f79d0c9f..5c5f66bec 100755
--- a/src/gui/messagesview.h
+++ b/src/gui/messagesview.h
@@ -92,7 +92,7 @@ class MessagesView : public QTreeView {
     // Link/message openers.
     void openLinkNewTab(const QString &link);
     void openLinkMiniBrowser(const QString &link);
-    void openMessagesInNewspaperView(const QList<Message> &messages);
+    void openMessagesInNewspaperView(RootItem *root, const QList<Message> &messages);
 
     // Notify others about message selections.
     void currentMessageChanged(const Message &message, RootItem *root);
diff --git a/src/gui/newspaperpreviewer.cpp b/src/gui/newspaperpreviewer.cpp
new file mode 100644
index 000000000..0d9ddd66c
--- /dev/null
+++ b/src/gui/newspaperpreviewer.cpp
@@ -0,0 +1,58 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
+#include "gui/newspaperpreviewer.h"
+
+#include "gui/messagepreviewer.h"
+
+
+NewspaperPreviewer::NewspaperPreviewer(RootItem *root, QList<Message> messages, QWidget *parent)
+  : TabContent(parent), m_ui(new Ui::NewspaperPreviewer), m_root(root), m_messages(messages) {
+  m_ui->setupUi(this);
+  connect(m_ui->m_btnShowMoreMessages, SIGNAL(clicked(bool)), this, SLOT(showMoreMessages()));
+  showMoreMessages();
+}
+
+NewspaperPreviewer::~NewspaperPreviewer() {
+}
+
+void NewspaperPreviewer::showMoreMessages() {
+  if (!m_root.isNull()) {
+    for (int i = 0; i < 10 && !m_messages.isEmpty(); i++) {
+      Message msg = m_messages.takeFirst();
+      MessagePreviewer *prev = new MessagePreviewer(this);
+
+      connect(prev, SIGNAL(requestMessageListReload(bool)), this, SIGNAL(requestMessageListReload(bool)));
+
+      prev->setFixedHeight(300);
+      prev->loadMessage(msg, m_root);
+      m_ui->m_layout->insertWidget(m_ui->m_layout->count() - 2, prev);
+    }
+
+    m_ui->m_btnShowMoreMessages->setText(tr("Show more messages (%n remaining)", "", m_messages.size()));
+    m_ui->m_btnShowMoreMessages->setEnabled(!m_messages.isEmpty());
+
+    // TODO: pokračovat, pridat signal void requestMessageListReload(bool mark_current_as_read);
+    // ktery bude forwardovar tentyz signal z toho message previeweru kazdeho
+    // a ten signal navazat na obnoveni seznamu zprav
+    //
+    // taky opravit spojeni v pripade ze se zada o novinovy nahled z feedviewu
+  }
+  else {
+    // TODO: ukazat chybu
+  }
+}
diff --git a/src/gui/newspaperpreviewer.h b/src/gui/newspaperpreviewer.h
new file mode 100644
index 000000000..253201659
--- /dev/null
+++ b/src/gui/newspaperpreviewer.h
@@ -0,0 +1,58 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef NEWSPAPERPREVIEWER_H
+#define NEWSPAPERPREVIEWER_H
+
+#include <QWidget>
+
+#include "gui/tabcontent.h"
+
+#include "ui_newspaperpreviewer.h"
+
+#include "core/message.h"
+#include "services/abstract/rootitem.h"
+
+#include <QPointer>
+
+
+namespace Ui {
+  class NewspaperPreviewer;
+}
+
+class RootItem;
+
+class NewspaperPreviewer : public TabContent {
+    Q_OBJECT
+
+  public:
+    explicit NewspaperPreviewer(RootItem *root, QList<Message> messages, QWidget *parent = 0);
+    virtual ~NewspaperPreviewer();
+
+  private slots:
+    void showMoreMessages();
+
+  signals:
+    void requestMessageListReload(bool mark_current_as_read);
+
+  private:
+    QScopedPointer<Ui::NewspaperPreviewer> m_ui;
+    QPointer<RootItem> m_root;
+    QList<Message> m_messages;
+};
+
+#endif // NEWSPAPERPREVIEWER_H
diff --git a/src/gui/newspaperpreviewer.ui b/src/gui/newspaperpreviewer.ui
new file mode 100644
index 000000000..6dfc2f57b
--- /dev/null
+++ b/src/gui/newspaperpreviewer.ui
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>NewspaperPreviewer</class>
+ <widget class="QWidget" name="NewspaperPreviewer">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <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>
+   <item>
+    <widget class="QScrollArea" name="scrollArea">
+     <property name="widgetResizable">
+      <bool>true</bool>
+     </property>
+     <widget class="QWidget" name="scrollAreaWidgetContents">
+      <property name="geometry">
+       <rect>
+        <x>0</x>
+        <y>0</y>
+        <width>398</width>
+        <height>298</height>
+       </rect>
+      </property>
+      <layout class="QVBoxLayout" name="m_layout">
+       <item>
+        <layout class="QHBoxLayout" name="m_btnLayout">
+         <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="m_btnShowMoreMessages">
+           <property name="text">
+            <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>
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>246</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp
index abdca760e..8a4a183bd 100755
--- a/src/gui/tabwidget.cpp
+++ b/src/gui/tabwidget.cpp
@@ -26,6 +26,7 @@
 #include "gui/feedmessageviewer.h"
 #include "gui/plaintoolbutton.h"
 #include "gui/dialogs/formmain.h"
+#include "gui/newspaperpreviewer.h"
 
 #include <QMenu>
 #include <QToolButton>
@@ -239,9 +240,9 @@ int TabWidget::insertTab(int index, QWidget *widget, const QString &label, const
   return tab_index;
 }
 
-int TabWidget::addBrowserWithMessages(const QList<Message> &messages) {
-  // TODO: TODO - volano kdyz se maji zobrazit zpravy v novinovem nahledu
-  return 0; /* new index */
+int TabWidget::addBrowserWithMessages(RootItem *root, const QList<Message> &messages) {
+  NewspaperPreviewer *prev = new NewspaperPreviewer(root, messages, this);
+  return addTab(prev, qApp->icons()->fromTheme(QSL("item-newspaper")), tr("Newspaper view"), TabBar::Closable);
 }
 
 void TabWidget::changeIcon(int index, const QIcon &new_icon) {
diff --git a/src/gui/tabwidget.h b/src/gui/tabwidget.h
index cb09a1e1d..b5f5f828c 100755
--- a/src/gui/tabwidget.h
+++ b/src/gui/tabwidget.h
@@ -28,6 +28,7 @@
 class QMenu;
 class PlainToolButton;
 class Message;
+class RootItem;
 class FeedMessageViewer;
 
 class TabWidget : public QTabWidget {
@@ -111,7 +112,7 @@ class TabWidget : public QTabWidget {
     void closeAllTabsExceptCurrent();
 
     // Open single or multiple (newspaper mode) messages in new tab.
-    int addBrowserWithMessages(const QList<Message> &messages);
+    int addBrowserWithMessages(RootItem *root, const QList<Message> &messages);
 
   private:
     PlainToolButton *m_btnMainMenu;

From e9b796173286576a78f545f9c17cbf2aaf324e5d Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 3 Apr 2016 08:15:25 +0200
Subject: [PATCH 25/31] Better newspaper view.

---
 resources/text/CHANGELOG       |  2 +-
 src/gui/feedmessageviewer.cpp  |  6 +++---
 src/gui/feedsview.cpp          |  5 +++--
 src/gui/feedsview.h            |  2 +-
 src/gui/messagepreviewer.cpp   | 35 ++++++++++++++++++++++++++--------
 src/gui/messagepreviewer.h     |  2 ++
 src/gui/messagepreviewer.ui    |  2 +-
 src/gui/messagesview.cpp       | 12 ++++++++++++
 src/gui/messagesview.h         |  2 ++
 src/gui/newspaperpreviewer.cpp | 21 +++++++++++---------
 src/gui/tabwidget.cpp          |  6 ------
 src/gui/tabwidget.h            |  3 ---
 12 files changed, 64 insertions(+), 34 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 8b3a54d5f..49f0b2b30 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -9,7 +9,7 @@ Main:
 Added:
 
 ▪ RSS Guard now automatically switches to SQLite backend if MySQL is not available on program startup.
-▪ Opened web browser tabs now can be saved. (issue #126)
+▪ Newspaper view now allows marking individual messages read/unread/starred/unstarred.
 ▪ Added experimental support for tweakable statusbar. (issue #158)
 ▪ Opening of download manager when new file download starts is now optional. (issue #165)
 
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index 68f598dcf..f16dc9ea9 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -262,9 +262,9 @@ void FeedMessageViewer::createConnections() {
 
   // Message openers.
   connect(m_messagesView, SIGNAL(openMessagesInNewspaperView(RootItem*,QList<Message>)),
-          form_main->m_ui->m_tabWidget, SLOT(addBrowserWithMessages(RootItem*,QList<Message>)));
-  connect(m_feedsView, SIGNAL(openMessagesInNewspaperView(QList<Message>)),
-          form_main->m_ui->m_tabWidget, SLOT(addBrowserWithMessages(QList<Message>)));
+          m_messagesView, SLOT(createNewspaperView(RootItem*,QList<Message>)));
+  connect(m_feedsView, SIGNAL(openMessagesInNewspaperView(RootItem*,QList<Message>)),
+          m_messagesView, SLOT(createNewspaperView(RootItem*,QList<Message>)));
   
   // Toolbar forwardings.
   connect(form_main->m_ui->m_actionAddFeedIntoSelectedAccount, SIGNAL(triggered()),
diff --git a/src/gui/feedsview.cpp b/src/gui/feedsview.cpp
index 11f68f3f0..37312e078 100755
--- a/src/gui/feedsview.cpp
+++ b/src/gui/feedsview.cpp
@@ -319,10 +319,11 @@ void FeedsView::markAllItemsRead() {
 }
 
 void FeedsView::openSelectedItemsInNewspaperMode() {
-  const QList<Message> messages = m_sourceModel->messagesForItem(selectedItem());
+  RootItem *selected_item = selectedItem();
+  const QList<Message> messages = m_sourceModel->messagesForItem(selected_item);
 
   if (!messages.isEmpty()) {
-    emit openMessagesInNewspaperView(messages);
+    emit openMessagesInNewspaperView(selected_item, messages);
   }
 }
 
diff --git a/src/gui/feedsview.h b/src/gui/feedsview.h
index e90721679..ac983d090 100755
--- a/src/gui/feedsview.h
+++ b/src/gui/feedsview.h
@@ -99,7 +99,7 @@ class FeedsView : public QTreeView {
     void itemSelected(RootItem *item);
 
     // Requests opening of given messages in newspaper mode.
-    void openMessagesInNewspaperView(const QList<Message> &messages);
+    void openMessagesInNewspaperView(RootItem *root, const QList<Message> &messages);
 
   private slots:
     void markSelectedItemReadStatus(RootItem::ReadStatus read);
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
index 243bedcf9..b740809ba 100644
--- a/src/gui/messagepreviewer.cpp
+++ b/src/gui/messagepreviewer.cpp
@@ -88,13 +88,14 @@ void MessagePreviewer::loadMessage(const Message &message, RootItem *root) {
   m_message = message;
   m_root = root;
 
-  m_actionMarkRead->setEnabled(!message.m_isRead);
-  m_actionMarkUnread->setEnabled(message.m_isRead);
-  m_actionSwitchImportance->setChecked(message.m_isImportant);
-
   if (!m_root.isNull()) {
-    m_ui->m_lblTitle->setText(message.m_title);
-    m_ui->m_txtMessage->setHtml(prepareHtmlForMessage(message));
+    updateButtons();
+    m_actionSwitchImportance->setChecked(m_message.m_isImportant);
+
+    m_ui->m_lblTitle->setText(m_message.m_title);
+    m_ui->m_txtMessage->setHtml(prepareHtmlForMessage(m_message));
+
+    updateTitle();
     show();
 
     m_ui->m_txtMessage->verticalScrollBar()->triggerAction(QScrollBar::SliderToMinimum);
@@ -119,6 +120,9 @@ void MessagePreviewer::markMessageAsRead() {
                                                              RootItem::Read);
 
       emit requestMessageListReload(false);
+      m_message.m_isRead = true;
+      updateButtons();
+      updateTitle();
     }
   }
 }
@@ -141,6 +145,9 @@ void MessagePreviewer::markMessageAsUnread() {
                                                              RootItem::Unread);
 
       emit requestMessageListReload(false);
+      m_message.m_isRead = false;
+      updateButtons();
+      updateTitle();
     }
   }
 }
@@ -163,14 +170,26 @@ void MessagePreviewer::switchMessageImportance(bool checked) {
       m_root->getParentServiceRoot()->onBeforeSwitchMessageImportance(m_root.data(),
                                                                       QList<ImportanceChange>() << ImportanceChange(m_message,
                                                                                                                     m_message.m_isImportant ?
-                                                                                                                    RootItem::NotImportant :
-                                                                                                                    RootItem::Important));
+                                                                                                                      RootItem::NotImportant :
+                                                                                                                      RootItem::Important));
 
       emit requestMessageListReload(false);
+      m_message.m_isImportant = checked;
     }
   }
 }
 
+void MessagePreviewer::updateButtons() {
+  m_actionMarkRead->setEnabled(!m_message.m_isRead);
+  m_actionMarkUnread->setEnabled(m_message.m_isRead);
+}
+
+void MessagePreviewer::updateTitle() {
+  QFont fon = m_ui->m_lblTitle->font();
+  fon.setBold(!m_message.m_isRead);
+  m_ui->m_lblTitle->setFont(fon);
+}
+
 QString MessagePreviewer::prepareHtmlForMessage(const Message &message) {
   QString html = QString("<p>[url] <a href=\"%1\">%1</a></p>").arg(message.m_url);
 
diff --git a/src/gui/messagepreviewer.h b/src/gui/messagepreviewer.h
index 124910c4c..24e10885d 100644
--- a/src/gui/messagepreviewer.h
+++ b/src/gui/messagepreviewer.h
@@ -54,6 +54,8 @@ class MessagePreviewer : public QWidget {
     void requestMessageListReload(bool mark_current_as_read);
 
   private:
+    void updateButtons();
+    void updateTitle();
     QString prepareHtmlForMessage(const Message &message);
 
     QToolBar *m_toolBar;
diff --git a/src/gui/messagepreviewer.ui b/src/gui/messagepreviewer.ui
index 2965eddf7..0166bd4d3 100644
--- a/src/gui/messagepreviewer.ui
+++ b/src/gui/messagepreviewer.ui
@@ -46,7 +46,7 @@
       <bool>true</bool>
      </property>
      <property name="margin">
-      <number>0</number>
+      <number>5</number>
      </property>
      <property name="textInteractionFlags">
       <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
diff --git a/src/gui/messagesview.cpp b/src/gui/messagesview.cpp
index 79bc5d96b..d789d02da 100755
--- a/src/gui/messagesview.cpp
+++ b/src/gui/messagesview.cpp
@@ -24,6 +24,7 @@
 #include "network-web/webfactory.h"
 #include "gui/dialogs/formmain.h"
 #include "gui/messagebox.h"
+#include "gui/newspaperpreviewer.h"
 #include "gui/styleditemdelegatewithoutfocus.h"
 
 #include <QKeyEvent>
@@ -466,6 +467,17 @@ void MessagesView::filterMessages(MessagesModel::MessageHighlighter filter) {
   m_sourceModel->highlightMessages(filter);
 }
 
+void MessagesView::createNewspaperView(RootItem *selected_item, const QList<Message> &messages) {
+  NewspaperPreviewer *prev = new NewspaperPreviewer(selected_item, messages, this);
+  int index = qApp->mainForm()->tabWidget()->addTab(prev,
+                                                    qApp->icons()->fromTheme(QSL("item-newspaper")),
+                                                    tr("Newspaper view"),
+                                                    TabBar::Closable);
+  qApp->mainForm()->tabWidget()->setCurrentIndex(index);
+
+  connect(prev, SIGNAL(requestMessageListReload(bool)), this, SLOT(reloadSelections(bool)));
+}
+
 void MessagesView::adjustColumns() {
   if (header()->count() > 0 && !m_columnsAdjusted) {
     m_columnsAdjusted = true;
diff --git a/src/gui/messagesview.h b/src/gui/messagesview.h
index 5c5f66bec..f553f511b 100755
--- a/src/gui/messagesview.h
+++ b/src/gui/messagesview.h
@@ -78,6 +78,8 @@ class MessagesView : public QTreeView {
     void searchMessages(const QString &pattern);
     void filterMessages(MessagesModel::MessageHighlighter filter);
 
+    void createNewspaperView(RootItem *selected_item, const QList<Message> &messages);
+
   private slots:
     // Marks given indexes as selected.
     void reselectIndexes(const QModelIndexList &indexes);
diff --git a/src/gui/newspaperpreviewer.cpp b/src/gui/newspaperpreviewer.cpp
index 0d9ddd66c..108fa1ee6 100644
--- a/src/gui/newspaperpreviewer.cpp
+++ b/src/gui/newspaperpreviewer.cpp
@@ -18,11 +18,15 @@
 #include "gui/newspaperpreviewer.h"
 
 #include "gui/messagepreviewer.h"
+#include "gui/dialogs/formmain.h"
+#include "miscellaneous/application.h"
+
+#include <QScrollBar>
 
 
 NewspaperPreviewer::NewspaperPreviewer(RootItem *root, QList<Message> messages, QWidget *parent)
   : TabContent(parent), m_ui(new Ui::NewspaperPreviewer), m_root(root), m_messages(messages) {
-  m_ui->setupUi(this);
+  m_ui->setupUi(this); 
   connect(m_ui->m_btnShowMoreMessages, SIGNAL(clicked(bool)), this, SLOT(showMoreMessages()));
   showMoreMessages();
 }
@@ -32,12 +36,13 @@ NewspaperPreviewer::~NewspaperPreviewer() {
 
 void NewspaperPreviewer::showMoreMessages() {
   if (!m_root.isNull()) {
+    int current_scroll = m_ui->scrollArea->verticalScrollBar()->value();
+
     for (int i = 0; i < 10 && !m_messages.isEmpty(); i++) {
       Message msg = m_messages.takeFirst();
       MessagePreviewer *prev = new MessagePreviewer(this);
 
       connect(prev, SIGNAL(requestMessageListReload(bool)), this, SIGNAL(requestMessageListReload(bool)));
-
       prev->setFixedHeight(300);
       prev->loadMessage(msg, m_root);
       m_ui->m_layout->insertWidget(m_ui->m_layout->count() - 2, prev);
@@ -45,14 +50,12 @@ void NewspaperPreviewer::showMoreMessages() {
 
     m_ui->m_btnShowMoreMessages->setText(tr("Show more messages (%n remaining)", "", m_messages.size()));
     m_ui->m_btnShowMoreMessages->setEnabled(!m_messages.isEmpty());
-
-    // TODO: pokračovat, pridat signal void requestMessageListReload(bool mark_current_as_read);
-    // ktery bude forwardovar tentyz signal z toho message previeweru kazdeho
-    // a ten signal navazat na obnoveni seznamu zprav
-    //
-    // taky opravit spojeni v pripade ze se zada o novinovy nahled z feedviewu
+    m_ui->scrollArea->verticalScrollBar()->setValue(current_scroll);
   }
   else {
-    // TODO: ukazat chybu
+    qApp->showGuiMessage(tr("Cannot show more messages"),
+                         tr("Cannot show more messages because parent feed was removed."),
+                         QSystemTrayIcon::Warning,
+                         qApp->mainForm(), true);
   }
 }
diff --git a/src/gui/tabwidget.cpp b/src/gui/tabwidget.cpp
index 8a4a183bd..6d7320bd1 100755
--- a/src/gui/tabwidget.cpp
+++ b/src/gui/tabwidget.cpp
@@ -26,7 +26,6 @@
 #include "gui/feedmessageviewer.h"
 #include "gui/plaintoolbutton.h"
 #include "gui/dialogs/formmain.h"
-#include "gui/newspaperpreviewer.h"
 
 #include <QMenu>
 #include <QToolButton>
@@ -240,11 +239,6 @@ int TabWidget::insertTab(int index, QWidget *widget, const QString &label, const
   return tab_index;
 }
 
-int TabWidget::addBrowserWithMessages(RootItem *root, const QList<Message> &messages) {
-  NewspaperPreviewer *prev = new NewspaperPreviewer(root, messages, this);
-  return addTab(prev, qApp->icons()->fromTheme(QSL("item-newspaper")), tr("Newspaper view"), TabBar::Closable);
-}
-
 void TabWidget::changeIcon(int index, const QIcon &new_icon) {
   setTabIcon(index, new_icon);
 }
diff --git a/src/gui/tabwidget.h b/src/gui/tabwidget.h
index b5f5f828c..e5b8c37c9 100755
--- a/src/gui/tabwidget.h
+++ b/src/gui/tabwidget.h
@@ -111,9 +111,6 @@ class TabWidget : public QTabWidget {
     // Closes all "closable" tabs except the active tab.
     void closeAllTabsExceptCurrent();
 
-    // Open single or multiple (newspaper mode) messages in new tab.
-    int addBrowserWithMessages(RootItem *root, const QList<Message> &messages);
-
   private:
     PlainToolButton *m_btnMainMenu;
     QMenu *m_menuMain;

From 9e7f6ed5dc545d495feb05161093b9b1e9d5fc2c Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 3 Apr 2016 08:49:14 +0200
Subject: [PATCH 26/31] Fixed #177.

---
 resources/text/CHANGELOG         |  1 +
 src/gui/dialogs/formsettings.cpp | 23 +++++++++++++--
 src/gui/dialogs/formsettings.h   |  1 +
 src/gui/dialogs/formsettings.ui  | 50 +++++++++++++++++---------------
 src/gui/feedmessageviewer.cpp    |  8 ++---
 src/gui/messagepreviewer.cpp     | 11 +++++++
 src/gui/messagepreviewer.h       |  2 ++
 src/miscellaneous/settings.cpp   |  2 +-
 8 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 49f0b2b30..46b12bea8 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -8,6 +8,7 @@ Main:
 
 Added:
 
+▪ Message preview's font is now fully adjustable in settings. (issue #177)
 ▪ RSS Guard now automatically switches to SQLite backend if MySQL is not available on program startup.
 ▪ Newspaper view now allows marking individual messages read/unread/starred/unstarred.
 ▪ Added experimental support for tweakable statusbar. (issue #158)
diff --git a/src/gui/dialogs/formsettings.cpp b/src/gui/dialogs/formsettings.cpp
index df40fbcf1..a84469654 100755
--- a/src/gui/dialogs/formsettings.cpp
+++ b/src/gui/dialogs/formsettings.cpp
@@ -48,6 +48,7 @@
 #include <QColorDialog>
 #include <QFileDialog>
 #include <QKeyEvent>
+#include <QFontDialog>
 #include <QDir>
 
 
@@ -118,6 +119,7 @@ FormSettings::FormSettings(QWidget *parent) : QDialog(parent), m_ui(new Ui::Form
   connect(m_ui->m_cmbDatabaseDriver, SIGNAL(currentIndexChanged(int)), this, SLOT(selectSqlBackend(int)));
   connect(m_ui->m_btnDownloadsTargetDirectory, SIGNAL(clicked()), this, SLOT(selectDownloadsDirectory()));
   connect(m_ui->m_checkMysqlShowPassword, SIGNAL(toggled(bool)), this, SLOT(switchMysqlPasswordVisiblity(bool)));
+  connect(m_ui->m_btnChangeMessagesFont, SIGNAL(clicked()), this, SLOT(changeMessagesFont()));
 
   connect(m_ui->m_checkEnableNotifications, &QCheckBox::toggled, [=](bool checked) {
     if (!checked) {
@@ -242,8 +244,12 @@ void FormSettings::loadFeedsMessages() {
     m_ui->m_cmbMessagesDateTimeFormat->setCurrentIndex(index_format);
   }
 
-  m_ui->m_cmbMessageFontStandard->setCurrentIndex(m_ui->m_cmbMessageFontStandard->findText(m_settings->value(GROUP(Messages),
-                                                                                                             SETTING(Messages::PreviewerFontStandard)).toString()));
+  m_ui->m_lblMessagesFont->setText(tr("Font preview"));
+  QFont fon;
+  fon.fromString(m_settings->value(GROUP(Messages),
+                                   SETTING(Messages::PreviewerFontStandard)).toString());
+  m_ui->m_lblMessagesFont->setFont(fon);
+
 }
 
 void FormSettings::initializeMessageDateFormats() {
@@ -258,6 +264,17 @@ void FormSettings::initializeMessageDateFormats() {
   }
 }
 
+void FormSettings::changeMessagesFont() {
+  bool ok;
+  QFont new_font = QFontDialog::getFont(&ok, m_ui->m_lblMessagesFont->font(),
+                                        this, tr("Select new font for message viewer"),
+                                        QFontDialog::DontUseNativeDialog);
+
+  if (ok) {
+    m_ui->m_lblMessagesFont->setFont(new_font);
+  }
+}
+
 void FormSettings::saveFeedsMessages() {
   m_settings->setValue(GROUP(Messages), Messages::KeepCursorInCenter, m_ui->m_checkKeppMessagesInTheMiddle->isChecked());
   m_settings->setValue(GROUP(Messages), Messages::ClearReadOnExit, m_ui->m_checkRemoveReadMessagesOnExit->isChecked());
@@ -271,7 +288,7 @@ void FormSettings::saveFeedsMessages() {
                        m_ui->m_cmbMessagesDateTimeFormat->itemData(m_ui->m_cmbMessagesDateTimeFormat->currentIndex()).toString());
 
   // Save fonts.
-  m_settings->setValue(GROUP(Messages), Messages::PreviewerFontStandard, m_ui->m_cmbMessageFontStandard->currentFont().family());
+  m_settings->setValue(GROUP(Messages), Messages::PreviewerFontStandard, m_ui->m_lblMessagesFont->font().toString());
 
   qApp->mainForm()->tabWidget()->feedMessageViewer()->loadMessageViewerFonts();
   qApp->mainForm()->tabWidget()->feedMessageViewer()->feedsView()->sourceModel()->updateAutoUpdateStatus();
diff --git a/src/gui/dialogs/formsettings.h b/src/gui/dialogs/formsettings.h
index 9eb10f7f6..c3933b270 100755
--- a/src/gui/dialogs/formsettings.h
+++ b/src/gui/dialogs/formsettings.h
@@ -102,6 +102,7 @@ class FormSettings : public QDialog {
 
     void loadFeedsMessages();
     void initializeMessageDateFormats();
+    void changeMessagesFont();
     void saveFeedsMessages();
     
   private:
diff --git a/src/gui/dialogs/formsettings.ui b/src/gui/dialogs/formsettings.ui
index 07eb791f9..3dbcae00b 100755
--- a/src/gui/dialogs/formsettings.ui
+++ b/src/gui/dialogs/formsettings.ui
@@ -88,7 +88,7 @@
    <item row="0" column="1">
     <widget class="QStackedWidget" name="m_stackedSettings">
      <property name="currentIndex">
-      <number>5</number>
+      <number>6</number>
      </property>
      <widget class="QWidget" name="m_pageGeneral">
       <layout class="QFormLayout" name="formLayout_5">
@@ -424,8 +424,8 @@ Authors of this application are NOT responsible for lost data.</string>
            <rect>
             <x>0</x>
             <y>0</y>
-            <width>782</width>
-            <height>451</height>
+            <width>100</width>
+            <height>30</height>
            </rect>
           </property>
           <layout class="QHBoxLayout" name="horizontalLayout_4">
@@ -502,8 +502,8 @@ Authors of this application are NOT responsible for lost data.</string>
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>776</width>
-                <height>425</height>
+                <width>167</width>
+                <height>219</height>
                </rect>
               </property>
               <layout class="QFormLayout" name="formLayout">
@@ -1251,7 +1251,7 @@ Authors of this application are NOT responsible for lost data.</string>
        <item>
         <widget class="QTabWidget" name="m_tabFeedsMessages">
          <property name="currentIndex">
-          <number>0</number>
+          <number>1</number>
          </property>
          <widget class="QWidget" name="m_tabFeeds">
           <attribute name="title">
@@ -1400,30 +1400,34 @@ Authors of this application are NOT responsible for lost data.</string>
              <property name="title">
               <string>Internal message browser fonts</string>
              </property>
-             <layout class="QFormLayout" name="formLayout_24">
-              <item row="0" column="0">
-               <widget class="QLabel" name="label_12">
+             <layout class="QHBoxLayout" name="horizontalLayout_16">
+              <item>
+               <widget class="QLabel" name="m_lblMessagesFont">
                 <property name="text">
-                 <string>Standard font</string>
+                 <string/>
                 </property>
                </widget>
               </item>
-              <item row="0" column="1">
-               <widget class="QFontComboBox" name="m_cmbMessageFontStandard">
-                <property name="sizePolicy">
-                 <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                  <horstretch>0</horstretch>
-                  <verstretch>0</verstretch>
-                 </sizepolicy>
-                </property>
-                <property name="editable">
-                 <bool>false</bool>
-                </property>
-                <property name="sizeAdjustPolicy">
-                 <enum>QComboBox::AdjustToContents</enum>
+              <item>
+               <widget class="QPushButton" name="m_btnChangeMessagesFont">
+                <property name="text">
+                 <string>&amp;Change font</string>
                 </property>
                </widget>
               </item>
+              <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>
              </layout>
             </widget>
            </item>
diff --git a/src/gui/feedmessageviewer.cpp b/src/gui/feedmessageviewer.cpp
index f16dc9ea9..85d13ab3e 100755
--- a/src/gui/feedmessageviewer.cpp
+++ b/src/gui/feedmessageviewer.cpp
@@ -116,12 +116,12 @@ void FeedMessageViewer::loadSize() {
                                                                         default_msg_section_size).toInt());
 }
 
-void FeedMessageViewer::loadMessageViewerFonts() {
-  const Settings *settings = qApp->settings();
+void FeedMessageViewer::loadMessageViewerFonts() {  
+  m_messagesBrowser->reloadFontSettings();
 
   // TODO: TODO
   //QWebEngineSettings *view_settings = m_messagesBrowser->view()->settings();
-  
+
   //view_settings->setFontFamily(QWebEngineSettings::StandardFont, settings->value(GROUP(Messages),
   //                                                                         SETTING(Messages::PreviewerFontStandard)).toString());
 }
@@ -350,7 +350,7 @@ void FeedMessageViewer::initialize() {
   m_toolBarMessages->setMovable(false);
   m_toolBarMessages->setAllowedAreas(Qt::TopToolBarArea);
   m_toolBarMessages->loadChangeableActions();
-   
+
   // Now refresh visual setup.
   refreshVisualProperties();
 }
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
index b740809ba..df647a43a 100644
--- a/src/gui/messagepreviewer.cpp
+++ b/src/gui/messagepreviewer.cpp
@@ -71,12 +71,23 @@ MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
 
   m_actionSwitchImportance->setCheckable(true);
 
+  reloadFontSettings();
   clear();
 }
 
 MessagePreviewer::~MessagePreviewer() {
 }
 
+void MessagePreviewer::reloadFontSettings() {
+  const Settings *settings = qApp->settings();
+  QFont fon;
+
+  fon.fromString(settings->value(GROUP(Messages),
+                                 SETTING(Messages::PreviewerFontStandard)).toString());
+
+  m_ui->m_txtMessage->setFont(fon);
+}
+
 void MessagePreviewer::clear() {
   m_ui->m_lblTitle->clear();
   m_ui->m_txtMessage->clear();
diff --git a/src/gui/messagepreviewer.h b/src/gui/messagepreviewer.h
index 24e10885d..f23cc5ff4 100644
--- a/src/gui/messagepreviewer.h
+++ b/src/gui/messagepreviewer.h
@@ -41,6 +41,8 @@ class MessagePreviewer : public QWidget {
     explicit MessagePreviewer(QWidget *parent = 0);
     virtual ~MessagePreviewer();
 
+    void reloadFontSettings();
+
   public slots:
     void clear();
     void loadMessage(const Message &message, RootItem *root);
diff --git a/src/miscellaneous/settings.cpp b/src/miscellaneous/settings.cpp
index b8c8a16cd..3343b19b5 100755
--- a/src/miscellaneous/settings.cpp
+++ b/src/miscellaneous/settings.cpp
@@ -62,7 +62,7 @@ DKEY Messages::KeepCursorInCenter               = "keep_cursor_center";
 DVALUE(bool) Messages::KeepCursorInCenterDef    = false;
 
 DKEY Messages::PreviewerFontStandard                                    = "previewer_font_standard";
-NON_CONST_DVALUE(QString) Messages::PreviewerFontStandardDef            = QString();
+NON_CONST_DVALUE(QString) Messages::PreviewerFontStandardDef            = QFont().toString();
 
 // GUI.
 DKEY GUI::ID                                      = "gui";

From fc9add9be67710611df1e64139ab559f1702b0f0 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 3 Apr 2016 09:42:09 +0200
Subject: [PATCH 27/31] Fixed #176.

---
 resources/text/CHANGELOG                      |  1 +
 src/gui/dialogs/formsettings.ui               | 71 +++++++++----------
 src/gui/timespinbox.cpp                       | 61 ++++++++++++++++
 src/gui/timespinbox.h                         | 34 +++++++++
 .../standard/gui/formstandardfeeddetails.ui   | 35 +++------
 src/services/tt-rss/gui/formeditfeed.ui       | 27 ++-----
 6 files changed, 149 insertions(+), 80 deletions(-)
 create mode 100644 src/gui/timespinbox.cpp
 create mode 100644 src/gui/timespinbox.h

diff --git a/resources/text/CHANGELOG b/resources/text/CHANGELOG
index 46b12bea8..21ce16100 100755
--- a/resources/text/CHANGELOG
+++ b/resources/text/CHANGELOG
@@ -8,6 +8,7 @@ Main:
 
 Added:
 
+▪ Global auto-update feed interval spinbox now has better format. (issue #176)
 ▪ Message preview's font is now fully adjustable in settings. (issue #177)
 ▪ RSS Guard now automatically switches to SQLite backend if MySQL is not available on program startup.
 ▪ Newspaper view now allows marking individual messages read/unread/starred/unstarred.
diff --git a/src/gui/dialogs/formsettings.ui b/src/gui/dialogs/formsettings.ui
index 3dbcae00b..b27f8810b 100755
--- a/src/gui/dialogs/formsettings.ui
+++ b/src/gui/dialogs/formsettings.ui
@@ -1251,7 +1251,7 @@ Authors of this application are NOT responsible for lost data.</string>
        <item>
         <widget class="QTabWidget" name="m_tabFeedsMessages">
          <property name="currentIndex">
-          <number>1</number>
+          <number>0</number>
          </property>
          <widget class="QWidget" name="m_tabFeeds">
           <attribute name="title">
@@ -1275,25 +1275,6 @@ Authors of this application are NOT responsible for lost data.</string>
              </property>
             </widget>
            </item>
-           <item row="1" column="1">
-            <widget class="QSpinBox" name="m_spinAutoUpdateInterval">
-             <property name="enabled">
-              <bool>false</bool>
-             </property>
-             <property name="suffix">
-              <string> minutes</string>
-             </property>
-             <property name="minimum">
-              <number>5</number>
-             </property>
-             <property name="maximum">
-              <number>240</number>
-             </property>
-             <property name="value">
-              <number>15</number>
-             </property>
-            </widget>
-           </item>
            <item row="2" column="0">
             <widget class="QLabel" name="label_3">
              <property name="text">
@@ -1355,6 +1336,19 @@ Authors of this application are NOT responsible for lost data.</string>
              </property>
             </widget>
            </item>
+           <item row="1" column="1">
+            <widget class="TimeSpinBox" name="m_spinAutoUpdateInterval">
+             <property name="enabled">
+              <bool>false</bool>
+             </property>
+             <property name="readOnly">
+              <bool>false</bool>
+             </property>
+             <property name="accelerated">
+              <bool>true</bool>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
          <widget class="QWidget" name="m_tabMessages">
@@ -1549,6 +1543,11 @@ Authors of this application are NOT responsible for lost data.</string>
    <header>toolbareditor.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>TimeSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>timespinbox.h</header>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>m_cmbDatabaseDriver</tabstop>
@@ -1635,22 +1634,6 @@ Authors of this application are NOT responsible for lost data.</string>
     </hint>
    </hints>
   </connection>
-  <connection>
-   <sender>m_checkAutoUpdate</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>m_spinAutoUpdateInterval</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>324</x>
-     <y>48</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>597</x>
-     <y>49</y>
-    </hint>
-   </hints>
-  </connection>
   <connection>
    <sender>m_checkMessagesDateTimeFormat</sender>
    <signal>toggled(bool)</signal>
@@ -1699,5 +1682,21 @@ Authors of this application are NOT responsible for lost data.</string>
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>m_checkAutoUpdate</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>m_spinAutoUpdateInterval</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>324</x>
+     <y>71</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>707</x>
+     <y>72</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
 </ui>
diff --git a/src/gui/timespinbox.cpp b/src/gui/timespinbox.cpp
new file mode 100644
index 000000000..be5f0014a
--- /dev/null
+++ b/src/gui/timespinbox.cpp
@@ -0,0 +1,61 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
+#include "gui/timespinbox.h"
+
+
+TimeSpinBox::TimeSpinBox(QWidget *parent) : QDoubleSpinBox(parent) {
+  setMinimum(5.0);
+  setAccelerated(true);
+  setDecimals(0);
+  setMaximum(10000000.0);
+}
+
+TimeSpinBox::~TimeSpinBox() {
+}
+
+double TimeSpinBox::valueFromText(const QString &text) const {
+  bool ok;
+  double value = text.toDouble(&ok);
+
+  if (ok) {
+    return value;
+  }
+  else {
+    return 0.0;
+  }
+}
+
+QString TimeSpinBox::textFromValue(double val) const {
+  int minutes_total = (int)val;
+  int minutes_val = minutes_total % 60;
+  int hours_val = (minutes_total - minutes_val) / 60;
+
+  QString hours = tr("%n hour(s)", "", hours_val);
+  QString minutes = tr("%n minute(s)", "", minutes_val);
+
+  return hours + tr(" and ") + minutes;
+}
+
+void TimeSpinBox::fixup(QString &input) const {
+  bool ok;
+  double value = input.toDouble(&ok);
+
+  if (ok) {
+    input = textFromValue(value);
+  }
+}
diff --git a/src/gui/timespinbox.h b/src/gui/timespinbox.h
new file mode 100644
index 000000000..74c7f1ebd
--- /dev/null
+++ b/src/gui/timespinbox.h
@@ -0,0 +1,34 @@
+// This file is part of RSS Guard.
+//
+// Copyright (C) 2011-2016 by Martin Rotter <rotter.martinos@gmail.com>
+//
+// RSS Guard 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 3 of the License, or
+// (at your option) any later version.
+//
+// RSS Guard 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 RSS Guard. If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef TIMESPINBOX_H
+#define TIMESPINBOX_H
+
+#include <QDoubleSpinBox>
+
+
+class TimeSpinBox : public QDoubleSpinBox {
+  public:
+    explicit TimeSpinBox(QWidget *parent = 0);
+    virtual ~TimeSpinBox();
+
+    double valueFromText(const QString &text) const;
+    QString textFromValue(double val) const;
+    void fixup(QString &input) const;
+};
+
+#endif // TIMESPINBOX_H
diff --git a/src/services/standard/gui/formstandardfeeddetails.ui b/src/services/standard/gui/formstandardfeeddetails.ui
index 31b13fc7d..dc6dfebae 100755
--- a/src/services/standard/gui/formstandardfeeddetails.ui
+++ b/src/services/standard/gui/formstandardfeeddetails.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>517</width>
+    <width>622</width>
     <height>442</height>
    </rect>
   </property>
@@ -96,28 +96,10 @@
         </widget>
        </item>
        <item>
-        <widget class="QSpinBox" name="m_spinAutoUpdateInterval">
+        <widget class="TimeSpinBox" name="m_spinAutoUpdateInterval">
          <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="maximumSize">
-          <size>
-           <width>130</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="suffix">
-          <string> minutes</string>
-         </property>
-         <property name="minimum">
-          <number>5</number>
-         </property>
-         <property name="maximum">
-          <number>240</number>
-         </property>
-         <property name="value">
-          <number>15</number>
-         </property>
         </widget>
        </item>
       </layout>
@@ -307,6 +289,12 @@
   </layout>
  </widget>
  <customwidgets>
+  <customwidget>
+   <class>LabelWithStatus</class>
+   <extends>QWidget</extends>
+   <header>labelwithstatus.h</header>
+   <container>1</container>
+  </customwidget>
   <customwidget>
    <class>LineEditWithStatus</class>
    <extends>QWidget</extends>
@@ -314,10 +302,9 @@
    <container>1</container>
   </customwidget>
   <customwidget>
-   <class>LabelWithStatus</class>
-   <extends>QWidget</extends>
-   <header>labelwithstatus.h</header>
-   <container>1</container>
+   <class>TimeSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>timespinbox.h</header>
   </customwidget>
  </customwidgets>
  <resources/>
diff --git a/src/services/tt-rss/gui/formeditfeed.ui b/src/services/tt-rss/gui/formeditfeed.ui
index 62b04c096..62db8b751 100755
--- a/src/services/tt-rss/gui/formeditfeed.ui
+++ b/src/services/tt-rss/gui/formeditfeed.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>469</width>
+    <width>598</width>
     <height>235</height>
    </rect>
   </property>
@@ -75,28 +75,10 @@
         </widget>
        </item>
        <item>
-        <widget class="QSpinBox" name="m_spinAutoUpdateInterval">
+        <widget class="TimeSpinBox" name="m_spinAutoUpdateInterval">
          <property name="enabled">
           <bool>false</bool>
          </property>
-         <property name="maximumSize">
-          <size>
-           <width>130</width>
-           <height>16777215</height>
-          </size>
-         </property>
-         <property name="suffix">
-          <string> minutes</string>
-         </property>
-         <property name="minimum">
-          <number>5</number>
-         </property>
-         <property name="maximum">
-          <number>240</number>
-         </property>
-         <property name="value">
-          <number>15</number>
-         </property>
         </widget>
        </item>
       </layout>
@@ -169,6 +151,11 @@
    <header>lineeditwithstatus.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>TimeSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header>timespinbox.h</header>
+  </customwidget>
  </customwidgets>
  <resources/>
  <connections>

From a87ac0fecd438ea0c1b054e37cdd589f44866b0b Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 3 Apr 2016 10:04:01 +0200
Subject: [PATCH 28/31] Lang sync etc.

---
 localization/rssguard-cs_CZ.ts |  827 +++---------
 localization/rssguard-da_DK.ts | 1563 ++++++++--------------
 localization/rssguard-de_DE.ts | 1645 +++++++++--------------
 localization/rssguard-en_GB.ts |  646 ++-------
 localization/rssguard-en_US.ts | 2281 +++++++++++++-------------------
 localization/rssguard-fr_FR.ts | 1525 ++++++++-------------
 localization/rssguard-it_IT.ts | 1613 +++++++++-------------
 localization/rssguard-nl_NL.ts |  741 +++--------
 localization/rssguard-pt_BR.ts |  737 +++--------
 localization/rssguard-sv_SE.ts |  735 +++-------
 src/gui/messagepreviewer.cpp   |    9 +
 11 files changed, 3991 insertions(+), 8331 deletions(-)

diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts
index fa7f9dd78..a0adf8b1d 100644
--- a/localization/rssguard-cs_CZ.ts
+++ b/localization/rssguard-cs_CZ.ts
@@ -1,174 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.1">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation>Přidat skupinu filtrů</translation>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation>Vlastní seznam filtrů</translation>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation>Zadaný název je v pořádku.</translation>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation>Zadaný název je prázdný.</translation>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation>Zadaná adresa je v pořádku.</translation>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation>Zadaná adresa je prázdná.</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>Nadpis</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adresa</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation>Vlastní pravidla</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation>Nastavení Adblocku</translation>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation>Povolit Adblock</translation>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation>Berte v potaz, že Adblock může tuto aplikaci podstatně zpomalit, pokud si aktivujete veliké skupiny filtrů. Příliš mnoho pravidel škodí výkonu. Také se ujistěte, že po významných úpravach nastavení Adblocku restartujete aplikaci. Adblock je znám tím, že může žrát hodně paměti.
-
-Berte také na paměti, že některé prostředky webových stránek jsou interním webovým prohlížečem cachovány.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Možnosti</translation>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation>Filtrovat pravidla</translation>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation>Použít pouze základní části EasyListu (z výkonnostních důvodů)</translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Přidat pravidlo</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Smazat pravidlo</translation>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation>Přidat skupinu filtrů</translation>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation>Smazat skupinu filtrů</translation>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation>Aktualizovat skupinu filtrů</translation>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation>Jak psát filtry</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation>Zobrazit &amp;nastavení Adblocku</translation>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation>Zakázat pro %1</translation>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation>Zakázat pouze pro tuto stránku</translation>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation>Zablokovaná vyskakovací okna</translation>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation>%1 skrze (%2)</translation>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation>Nic se aktuálně neblokuje</translation>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation>Nějaký obsah zablokován - klikněte pro editaci pravidla</translation>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation>Adblock - jsem vzhůru a makám</translation>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation>Adblock - nemakám</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation>Nelze načíst sadu pravidel!</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation>Zadejte své pravidlo sem</translation>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation>%1 (aktualizováno)</translation>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation>%1 (chyba: %2)</translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Přidat pravidlo</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Smazat  pravidlo</translation>
-    </message>
-</context>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="cs_CZ">
 <context>
     <name>Application</name>
     <message>
@@ -269,38 +101,15 @@ Berte také na paměti, že některé prostředky webových stránek jsou intern
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation>Tato stránka bohužel neobsahuje žádné kanály.</translation>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation><numerusform>Pro přidání kanálů z této stránky na mě klikni.
-Tato stránka obsahuje %n kanál.</numerusform><numerusform>Pro přidání kanálů z této stránky na mě klikni.
-Tato stránka obsahuje %n kanály.</numerusform><numerusform>Pro přidání kanálů z této stránky na mě klikni.
-Tato stránka obsahuje %n kanálů.</numerusform></translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation>Nepodporováno</translation>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation>Tento účet nepodporuje přidávání kanálů.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -378,7 +187,7 @@ Tato stránka obsahuje %n kanálů.</numerusform></translation>
         <translation>Stahování dokončeno</translation>
     </message>
     <message>
-        <source>File '%1' is downloaded.
+        <source>File &apos;%1&apos; is downloaded.
 Click here to open parent directory.</source>
         <translation>Soubor &apos;%1&apos; je stažen.
 Klikněte sem pro otevření nadřazeného adresáře.</translation>
@@ -404,11 +213,19 @@ Klikněte sem pro otevření nadřazeného adresáře.</translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation><numerusform>%n minuta do konce</numerusform><numerusform>%n minuty do konce</numerusform><numerusform>%n minut do konce</numerusform></translation>
+        <translation>
+            <numerusform>%n minuta do konce</numerusform>
+            <numerusform>%n minuty do konce</numerusform>
+            <numerusform>%n minut do konce</numerusform>
+        </translation>
     </message>
     <message numerus="yes">
         <source>%n seconds remaining</source>
-        <translation><numerusform>%n vteřina do konce</numerusform><numerusform>%n vteřiny do konce</numerusform><numerusform>%n vteřin do konce</numerusform></translation>
+        <translation>
+            <numerusform>%n vteřina do konce</numerusform>
+            <numerusform>%n vteřiny do konce</numerusform>
+            <numerusform>%n vteřin do konce</numerusform>
+        </translation>
     </message>
     <message>
         <source>bytes</source>
@@ -416,19 +233,23 @@ Klikněte sem pro otevření nadřazeného adresáře.</translation>
     </message>
     <message>
         <source>kB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation><numerusform>Stahuji %n soubor...</numerusform><numerusform>Stahuji %n soubory...</numerusform><numerusform>Stahuji %n souborů...</numerusform></translation>
+        <translation>
+            <numerusform>Stahuji %n soubor...</numerusform>
+            <numerusform>Stahuji %n soubory...</numerusform>
+            <numerusform>Stahuji %n souborů...</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -491,7 +312,11 @@ Klikněte sem pro otevření nadřazeného adresáře.</translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation><numerusform>Budu aktualizovat %n kanál.</numerusform><numerusform>Budu aktualizovat %n kanály.</numerusform><numerusform>Budu aktualizovat %n kanálů.</numerusform></translation>
+        <translation>
+            <numerusform>Budu aktualizovat %n kanál.</numerusform>
+            <numerusform>Budu aktualizovat %n kanály.</numerusform>
+            <numerusform>Budu aktualizovat %n kanálů.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -801,7 +626,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation><numerusform> den</numerusform><numerusform> dny</numerusform><numerusform> dnů</numerusform></translation>
+        <translation>
+            <numerusform> den</numerusform>
+            <numerusform> dny</numerusform>
+            <numerusform> dnů</numerusform>
+        </translation>
     </message>
     <message>
         <source>Shrink database file</source>
@@ -892,7 +721,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Test setup</source>
@@ -1024,11 +853,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1047,7 +876,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update</source>
@@ -1057,10 +886,6 @@ or this functionality is not implemented yet.</source>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Zvolte strategii auto-aktualizací tohoto kanálu. Výchozí strategorie auto-aktualizace znamená, že kanál bude aktualizován v intervalech udaných v nastavení aplikace.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> minut</translation>
-    </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
         <translation>Některé kanály vyžaduje autentizaci, a to včetně kanálů pro GMail. Je podporována autentizace BASIC, NTLM-2 a DIGEST-MD5.</translation>
@@ -1150,11 +975,11 @@ or this functionality is not implemented yet.</source>
     <name>FormEditOwnCloudAccount</name>
     <message>
         <source>URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -1182,11 +1007,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
@@ -1198,7 +1023,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
@@ -1210,27 +1035,27 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
@@ -1238,7 +1063,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
@@ -1295,22 +1120,10 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Settings</source>
         <translation>Na&amp;stavení</translation>
     </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation>&amp;Aktivní panel</translation>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation>&amp;Přidat panel</translation>
-    </message>
     <message>
         <source>&amp;Messages</source>
         <translation>&amp;Zprávy</translation>
     </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation>&amp;Webovy prohlížeč</translation>
-    </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
         <translation>Přepnout &amp;důležitost vybraných zpráv</translation>
@@ -1327,14 +1140,6 @@ or this functionality is not implemented yet.</source>
         <source>Switch fullscreen mode.</source>
         <translation>Přepnout režim celé obrazovky.</translation>
     </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation>Přidat nový panel webového prohlížeče.</translation>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation>Zavřít aktuální panel webového prohlížeče..</translation>
-    </message>
     <message>
         <source>No actions available</source>
         <translation>Žádná dostupná akce</translation>
@@ -1367,22 +1172,10 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Delete selected messages</source>
         <translation>Sma&amp;zat vybrané zprávy</translation>
     </message>
-    <message>
-        <source>Settings</source>
-        <translation>Nastavení</translation>
-    </message>
     <message>
         <source>Hides or displays the main menu.</source>
         <translation>Skryje či zobrazí hlavní menu.</translation>
     </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation>&amp;Zavřít všechny taby až na ten aktivní</translation>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation>&amp;Zavřít aktivní tab</translation>
-    </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
         <translation>Označit vybrané zprávy jako &amp;přečtené</translation>
@@ -1399,10 +1192,6 @@ or this functionality is not implemented yet.</source>
         <source>Open selected messages in &amp;internal browser</source>
         <translation>&amp;Otevřít vybrané krátké články v interním prohlížeči</translation>
     </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation>&amp;Otevřít vybrané zdrojové články v interním prohlížeči</translation>
-    </message>
     <message>
         <source>Select &amp;next message</source>
         <translation>Vybrat &amp;další zprávu</translation>
@@ -1415,18 +1204,6 @@ or this functionality is not implemented yet.</source>
         <source>Check for &amp;updates</source>
         <translation>Ověřit dostupnost &amp;aktualizace</translation>
     </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation>Povolit &amp;JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation>Povolit externí &amp;pluginy</translation>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation>Automaticky načítat &amp;obrázky</translation>
-    </message>
     <message>
         <source>Show/hide</source>
         <translation>Zobrazit/skrýt</translation>
@@ -1467,10 +1244,6 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Feed/message list headers</source>
         <translation>&amp;Hlavičky seznamů zpráv/kanálů</translation>
     </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation>Zavřít všechny taby kromě aktivního.</translation>
-    </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
         <translation>Nahlásit &amp;chybu (GitHub)...</translation>
@@ -1669,11 +1442,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1761,7 +1534,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons &amp;&amp; skins</source>
@@ -1790,7 +1563,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Port</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -1826,11 +1599,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Socks5</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Http</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (not supported on this platform)</source>
@@ -1856,14 +1629,6 @@ or this functionality is not implemented yet.</source>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
         <translation>Otevírat nové panely poklepáním na panelový pruh</translation>
     </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation>Povolit gesta myši</translation>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation>Zařadit nově otevíraný panel za ten aktuální</translation>
-    </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
@@ -2009,10 +1774,6 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.</tr
         <source>in-memory database switched</source>
         <translation>paměťová databáze přepnuta</translation>
     </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation>Interní webový prohlížeč</translation>
-    </message>
     <message>
         <source>External web browser</source>
         <translation>Externí webový prohlížeč</translation>
@@ -2041,10 +1802,6 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.</tr
         <source>Auto-update all feeds every</source>
         <translation>Auto-aktualizovat všechny kanály každých</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> minut</translation>
-    </message>
     <message>
         <source>Feed connection timeout</source>
         <translation>Časový limit stažení souboru kanálu</translation>
@@ -2055,7 +1812,7 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.</tr
     </message>
     <message>
         <source> ms</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update all feed on application startup</source>
@@ -2165,18 +1922,6 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.</tr
         <source>Launch %1 on operating system startup</source>
         <translation>Spustit %1 při spuštění operačního systému</translation>
     </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation>Povolit JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation>Povolit externí NPAPI pluginy</translation>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation>Načítat obrázky ve webových stránkách</translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Pokud bude nezaškrtnuto, pak se použije výchozí systémový webový prohlížeč.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -2284,18 +2029,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Working database</source>
         <translation>Pracovní databáze</translation>
     </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation>Gesta myši se aktivují kliknutím prostředního tlačítka myši, mezi gesta patří:
- • předchozí stránka (táhnutí myši vlevo),
- • následující stránka (táhnutí myši vpravo),
- • obnovení aktuální stránky (táhnutí myši nahoru),
- • otevření nového tabu (táhnutí myši dolu).</translation>
-    </message>
     <message>
         <source>Use custom external web browser</source>
         <translation>Použít vlastní webový prohlížeč</translation>
@@ -2338,7 +2071,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
@@ -2352,73 +2085,57 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Working database is ok.</source>
         <translation>Pracovní databáze je ok.</translation>
     </message>
-    <message>
-        <source>Notification position</source>
-        <translation>Pozice notifikací</translation>
-    </message>
     <message>
         <source>(Tray icon is not available.)</source>
         <translation>(Tray ikona není dostupná.)</translation>
     </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation>Levý-dolní roh</translation>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation>Levý-horní roh</translation>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation>Pravý-dolní roh</translation>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation>Pravý-horní roh</translation>
-    </message>
     <message>
         <source>Internal message browser fonts</source>
         <translation>Písma interního prohlížeče zpráv</translation>
     </message>
-    <message>
-        <source>Standard font</source>
-        <translation>Standardní písmo</translation>
-    </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
         <translation>Mějte na paměti, že rychlost a latence použitého MySQL serveru těžce ovlivňuje svižnost aplikace. Použití pomalého databázového spojení může vést ke špatnému výkonu aplikace např. při prohlížení zpráv.</translation>
     </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation>Moderní notifikace (Toto používá nativní notifikace přes D-Bus, jsou-li dostupné.)</translation>
-    </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable notifications</source>
         <translation>Povolit notifikace</translation>
     </message>
-    <message>
-        <source>Background color</source>
-        <translation>Barva pozadí</translation>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation>Změnit</translation>
-    </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2583,10 +2300,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Zvolte strategii auto-aktualizací tohoto kanálu. Výchozí strategorie auto-aktualizace znamená, že kanál bude aktualizován v intervalech udaných v nastavení aplikace.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> minut</translation>
-    </message>
     <message>
         <source>Title</source>
         <translation>Nadpis</translation>
@@ -2597,7 +2310,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fetch it now</source>
@@ -3101,17 +2814,41 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
-        <translation>Adresu webové stránky zadejte sem</translation>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MessagesModel</name>
     <message>
         <source>Id</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read</source>
@@ -3135,7 +2872,7 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     </message>
     <message>
         <source>Url</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
@@ -3231,11 +2968,11 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3283,14 +3020,6 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
         <source>Context menu for messages</source>
         <translation>Kontextové menu pro zprávy</translation>
     </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation>Zpráva bez URL</translation>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation>Zpráva &apos;%s&apos; neobsahuje URL.</translation>
-    </message>
     <message>
         <source>Problem with starting external web browser</source>
         <translation>PRoblém s externím webovým prohlížečem</translation>
@@ -3307,6 +3036,10 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
         <source>External e-mail client could not be started.</source>
         <translation>Externí e-mailový klient nemohl být úspěšně spuštěn.</translation>
     </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished">Novinový náhled</translation>
+    </message>
 </context>
 <context>
     <name>NetworkFactory</name>
@@ -3386,7 +3119,30 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3426,13 +3182,17 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
         <source>
 
 + %n other feeds.</source>
-        <translation><numerusform>
+        <translation>
+            <numerusform>
 
-+ %n další kanál.</numerusform><numerusform>
++ %n další kanál.</numerusform>
+            <numerusform>
 
-+ %n další kanály.</numerusform><numerusform>
++ %n další kanály.</numerusform>
+            <numerusform>
 
-+ %n dalších kanálů.</numerusform></translation>
++ %n dalších kanálů.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Welcome to %1.
@@ -3466,7 +3226,7 @@ Je vyžadování verze API minimálně %1.</translation>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3481,7 +3241,11 @@ Je vyžadování verze API minimálně %1.</translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation><numerusform>%n smazaná zpráva.</numerusform><numerusform>%n smazané zprávy.</numerusform><numerusform>%n smazaných zpráv.</numerusform></translation>
+        <translation>
+            <numerusform>%n smazaná zpráva.</numerusform>
+            <numerusform>%n smazané zprávy.</numerusform>
+            <numerusform>%n smazaných zpráv.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Recycle bin
@@ -3505,7 +3269,11 @@ Je vyžadování verze API minimálně %1.</translation>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation><numerusform>%n nepřečtená zpráva.</numerusform><numerusform>%n nepřečtené zprávy.</numerusform><numerusform>%n nepřečtených zpráv.</numerusform></translation>
+        <translation>
+            <numerusform>%n nepřečtená zpráva.</numerusform>
+            <numerusform>%n nepřečtené zprávy.</numerusform>
+            <numerusform>%n nepřečtených zpráv.</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -3560,7 +3328,11 @@ Tato kategorie neobsahuje žádné položky.</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation><numerusform>používá specifické nastavení (%n minuta do další aktualizace)</numerusform><numerusform>používá specifické nastavení (%n minuty do další aktualizace)</numerusform><numerusform>používá specifické nastavení (%n minut do další aktualizace)</numerusform></translation>
+        <translation>
+            <numerusform>používá specifické nastavení (%n minuta do další aktualizace)</numerusform>
+            <numerusform>používá specifické nastavení (%n minuty do další aktualizace)</numerusform>
+            <numerusform>používá specifické nastavení (%n minut do další aktualizace)</numerusform>
+        </translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3641,29 +3413,25 @@ ID účtu: %1</translation>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished">Mezera</translation>
     </message>
 </context>
 <context>
@@ -3711,11 +3479,6 @@ Nepřečtené zprávy: %2</translation>
         <source>Browse your feeds and messages</source>
         <translation>Procházet kanály a zprávy</translation>
     </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation>Webový prohlížeč</translation>
-    </message>
     <message>
         <source>Displays main menu.</source>
         <translation>ZObrazí hlavní menu.</translation>
@@ -3724,15 +3487,34 @@ Nepřečtené zprávy: %2</translation>
         <source>Main menu</source>
         <translation>Hlavní menu</translation>
     </message>
-    <message>
-        <source>Open new web browser tab.</source>
-        <translation>Otevřít nový tab webového prohlížeče.</translation>
-    </message>
     <message>
         <source>Downloads</source>
         <translation>Stahování</translation>
     </message>
 </context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ToolBarEditor</name>
     <message>
@@ -3802,7 +3584,11 @@ Nepřečtené zprávy: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation><numerusform>používá specifické nastavení (%n minuta do další aktualizace)</numerusform><numerusform>používá specifické nastavení (%n minuty do další aktualizace)</numerusform><numerusform>používá specifické nastavení (%n minut do další aktualizace)</numerusform></translation>
+        <translation>
+            <numerusform>používá specifické nastavení (%n minuta do další aktualizace)</numerusform>
+            <numerusform>používá specifické nastavení (%n minuty do další aktualizace)</numerusform>
+            <numerusform>používá specifické nastavení (%n minut do další aktualizace)</numerusform>
+        </translation>
     </message>
     <message>
         <source>%1%2
@@ -3845,215 +3631,4 @@ Poslední přihlášení: %5</translation>
         <translation>Nelze přidat kanál, protože probíhá jiná kritická operace.</translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation>Navigační panel</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation>Zpět</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation>Vpřed</translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation>Obnovit</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Zastavit</translation>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation>Přiblížení</translation>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation>Bez názvu</translation>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation>Oddálit aktivní webovou stránku.</translation>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation>Obnovit zoom na 100%.</translation>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation>Přiblížit aktivní webovou stránku.</translation>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation>Napsal </translation>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation>Novinový náhled</translation>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation>Jít zpět.</translation>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation>Jít vpřed.</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Opět načíst aktuální webovou stránku.</translation>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation>Zastavit načítání aktuální webové stránky.</translation>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation>Obnovit stránku</translation>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation>Kopírovat adresu odkazu</translation>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation>Kopírovat obrázek</translation>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation>Kopírovat adresu obrázku</translation>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation>Otevřít odkaz v novém panelu</translation>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation>Přejít</translation>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation>Otevřít obrázek v novém panelu</translation>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation>Webový prohlížeč</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation>Obrázek</translation>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation>Hypertextový odkaz</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Opět načíst aktuální webovou stránku.</translation>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation>Kopírovat výběr</translation>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation>Zkopíruje aktuální výběr do schránky.</translation>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation>Kopírovat adresu odkazu do schránky.</translation>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation>Kopírovat obrázek do schránky.</translation>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation>Kopírovat adresu obrázku do schránky.</translation>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation>Otevřít tento odkaz v novém tabu.</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation>Otevřít tento odkaz v aktuálním tabu.</translation>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation>Otevřít tento obrázek v aktuálním tabu.</translation>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation>Otevřít odkaz v externím prohlížeči</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation>Otevřít hypertextový odkaz v externím prohlížeči.</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation>Vytisknout</translation>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation>Vytisknout aktuální webovou stránku.</translation>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation>HTML stránky (*.html)</translation>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation>Zvolte cílový soubor pro webovou stránku</translation>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation>Nelze uložit webovou stránku</translation>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation>Webová stránka nemůže být uložena, protože do cíle nelze zapisovat.</translation>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation>Uložit cíl jako...</translation>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation>Stáhnout cíl odkazu.</translation>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation>Uložit stránku jako...</translation>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation>Uloží obrázek na disk.</translation>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation>Uložit obrázek jako...</translation>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation>zdrojova_stranka</translation>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation>Hledat &quot;%1&quot; přes Google...</translation>
-    </message>
-</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/localization/rssguard-da_DK.ts b/localization/rssguard-da_DK.ts
index 6c2d9942e..521724509 100644
--- a/localization/rssguard-da_DK.ts
+++ b/localization/rssguard-da_DK.ts
@@ -1,172 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.1">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation>Tilføj abonnement</translation>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>Titel</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Addresse</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation>Brugerdefinerede regler</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation>Adblock-indstillinger</translation>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Indstillinger</translation>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Tilføj regel</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Fjern regel</translation>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation>Tilføj abonnement</translation>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation>Fjern abonnement</translation>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation>Ajourfør abonnementer</translation>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation>Vis Adblock ind&amp;stillinger</translation>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation>Deaktivér på %1</translation>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation>Deaktivér kun på denne side</translation>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation>Blokér pop-up vinduer</translation>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation>%1 med (%2)</translation>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation>%1 (fejl: %2)</translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Tilføj regl</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Fjern regel</translation>
-    </message>
-</context>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="da_DK">
 <context>
     <name>Application</name>
     <message>
@@ -175,23 +9,23 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -199,7 +33,7 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -214,11 +48,11 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recycle bin purged...</source>
@@ -230,11 +64,11 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -250,7 +84,7 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     <message>
         <source>Access denied. Invalid username or password used.</source>
         <extracomment>Access to MySQL server was denied.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error.</source>
@@ -267,42 +101,22 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation>Uunderstøttet</translation>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadItem</name>
     <message>
         <source>Ico</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename</source>
@@ -310,7 +124,7 @@ This website contains %n feed(s).</source>
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Try again</source>
@@ -334,19 +148,19 @@ This website contains %n feed(s).</source>
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open &amp;directory</source>
@@ -358,7 +172,7 @@ This website contains %n feed(s).</source>
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open directory</source>
@@ -366,16 +180,16 @@ This website contains %n feed(s).</source>
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File '%1' is downloaded.
+        <source>File &apos;%1&apos; is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL: %1</source>
@@ -383,26 +197,32 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message>
         <source>Clean up</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>bytes</source>
@@ -410,30 +230,33 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>kB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
     <name>FeedMessageViewer</name>
     <message>
         <source>Toolbar for messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar for feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot cleanup database</source>
@@ -441,7 +264,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -468,7 +291,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Titles of feeds/categories.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Counts of unread/all meesages.</source>
@@ -481,11 +304,14 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -493,36 +319,36 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update started</source>
         <extracomment>Text display in status bar when feed update is started.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated feed &apos;%1&apos;</source>
         <extracomment>Text display in status bar when particular feed is updated.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FeedsToolBar</name>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -537,23 +363,23 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
@@ -561,7 +387,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -569,20 +395,20 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported</source>
@@ -590,11 +416,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -621,7 +447,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Licenses page is available only in English language.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changelog</source>
@@ -629,7 +455,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Changelog page is available only in English language.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>License not found.</source>
@@ -637,11 +463,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Changelog not found.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%8&lt;/b&gt;&lt;br&gt;&lt;b&gt;Version:&lt;/b&gt; %1 (build on %2 with CMake %3)&lt;br&gt;&lt;b&gt;Revision:&lt;/b&gt; %4&lt;br&gt;&lt;b&gt;Build date:&lt;/b&gt; %5&lt;br&gt;&lt;b&gt;Qt:&lt;/b&gt; %6 (compiled against %7)&lt;br&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About %1</source>
@@ -658,11 +484,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PARTIALLY portable</source>
@@ -674,7 +500,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -705,7 +531,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -720,7 +546,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Items to backup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database</source>
@@ -736,7 +562,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Common name for backup files</source>
@@ -744,7 +570,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup was created successfully.</source>
@@ -756,15 +582,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select directory</source>
@@ -772,15 +598,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -791,15 +617,18 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation><numerusform>dag</numerusform><numerusform>dage</numerusform></translation>
+        <translation>
+            <numerusform>dag</numerusform>
+            <numerusform>dage</numerusform>
+        </translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database information</source>
@@ -807,7 +636,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database type</source>
@@ -815,7 +644,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I am ready.</source>
@@ -827,27 +656,27 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown</source>
@@ -855,7 +684,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -866,7 +695,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -882,7 +711,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL</source>
@@ -890,19 +719,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
@@ -910,19 +739,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
@@ -930,15 +759,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
@@ -946,11 +775,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
@@ -958,15 +787,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
@@ -998,7 +827,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
@@ -1006,23 +835,23 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1037,7 +866,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL</source>
@@ -1045,15 +874,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Auto-update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation>minutter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -1061,7 +886,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Requires authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -1089,7 +914,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update every</source>
@@ -1097,11 +922,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing feed</source>
@@ -1117,7 +942,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -1129,15 +954,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1148,7 +973,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -1156,7 +981,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -1172,19 +997,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
@@ -1192,55 +1017,55 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
@@ -1256,7 +1081,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
@@ -1289,22 +1114,10 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Settings</source>
         <translation>Ind&amp;stillinger</translation>
     </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation>&amp;Nuværende faneblad</translation>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation>Tilføj f&amp;aneblad</translation>
-    </message>
     <message>
         <source>&amp;Messages</source>
         <translation>&amp;Meddelelser</translation>
     </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation>&amp;Netlæser</translation>
-    </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
         <translation>Skift</translation>
@@ -1321,14 +1134,6 @@ or this functionality is not implemented yet.</source>
         <source>Switch fullscreen mode.</source>
         <translation>Skift til fuldskærmstilstand.</translation>
     </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation>Opret nyt faneblad i netlæser.</translation>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>No actions available</source>
         <translation>Ingen tilgængelige handlinger</translation>
@@ -1339,15 +1144,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Hides main window if it is visible and shows it if it is hidden.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides or shows the list of feeds/categories.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check if new update for the application is available for download.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;About application</source>
@@ -1355,51 +1160,35 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Displays extra info about this application.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Indstillinger</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides or displays the main menu.</source>
         <translation>Skjuler eller viser hovedmenuen.</translation>
     </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
         <translation>Marker</translation>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;unread</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open selected source articles in &amp;external browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open selected messages in &amp;internal browser</source>
         <translation>Åben valgte beskeder i &amp;intern netlæser</translation>
     </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Select &amp;next message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;previous message</source>
@@ -1409,18 +1198,6 @@ or this functionality is not implemented yet.</source>
         <source>Check for &amp;updates</source>
         <translation>Tjek for</translation>
     </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation>Aktiver &amp;JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Show/hide</source>
         <translation>Vis/skjul</translation>
@@ -1431,7 +1208,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Feed list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Main menu</source>
@@ -1439,47 +1216,43 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open external browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch visibility of main toolbars.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restart</source>
@@ -1487,23 +1260,23 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
@@ -1511,7 +1284,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update &amp;all items</source>
@@ -1519,87 +1292,87 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
@@ -1607,19 +1380,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -1627,15 +1400,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
@@ -1643,15 +1416,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category</source>
@@ -1663,22 +1436,22 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore database</source>
@@ -1694,15 +1467,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source directory</source>
@@ -1714,15 +1487,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1780,7 +1553,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Hostname or IP of your proxy server</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
@@ -1792,7 +1565,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Your username for proxy server authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
@@ -1800,7 +1573,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Your password for proxy server authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display password</source>
@@ -1808,7 +1581,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Code</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
@@ -1840,32 +1613,24 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Close tabs with</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle mouse button single-click</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot save settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
@@ -1881,27 +1646,27 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Active skin:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected skin:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide tab bar if just one tab is visible</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical settings were changed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp; messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some critical settings are not set. You must fix these settings in order confirm new settings.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Messages</source>
@@ -1909,19 +1674,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Web browser executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executable parameters</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select web browser executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executables (*.*)</source>
@@ -1941,12 +1706,12 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>some keyboard shortcuts are not unique</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of errors:
 %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of changes:
@@ -1964,15 +1729,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>skin changed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use sample arguments for</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use in-memory database as the working database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Usage of in-memory working database has several advantages and pitfalls. Make sure that you are familiar with these before you turn this feature on. Advantages:
@@ -1986,15 +1751,11 @@ Disadvantages:
 &lt;li&gt;application startup and shutdown can take little longer (max. 2 seconds).&lt;/li&gt;
 &lt;/ul&gt;
 Authors of this application are NOT responsible for lost data.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in-memory database switched</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation>Intern netlæser</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External web browser</source>
@@ -2002,7 +1763,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>WARNING: Note that switching to another data storage type will NOT copy existing your data from currently active data storage to newly selected one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database driver</source>
@@ -2018,31 +1779,27 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Right mouse button double-click</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update all feeds every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation>minutter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed connection timeout</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ms</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update all feed on application startup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data storage</source>
@@ -2062,7 +1819,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>data storage backend changed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname is empty.</source>
@@ -2094,15 +1851,15 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Hide main window when it is minimized</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No connection test triggered so far.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that these settings are applied only on newly established connections.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select browser</source>
@@ -2126,7 +1883,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Text beside icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text under icon</source>
@@ -2138,31 +1895,19 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Keep message selection in the middle of the message list viewport</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You did not executed any connection test yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Launch %1 on operating system startup</source>
         <translation>Start %1 ved systemopstart</translation>
     </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation>Aktiver JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -2170,15 +1915,15 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Message count format in feed list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter format for count of messages displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) messages.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>custom external browser is not set correctly</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbars</source>
@@ -2186,21 +1931,21 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Toolbar for feeds list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar for messages list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select toolbar to edit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart now?</source>
@@ -2208,11 +1953,11 @@ You have to restart manually.</source>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executables (*)</source>
@@ -2223,31 +1968,31 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Show password</source>
@@ -2259,23 +2004,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client</source>
@@ -2283,15 +2020,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select client</source>
@@ -2301,7 +2038,7 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all downloaded files to</source>
@@ -2317,55 +2054,27 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Notification position</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation>Øverste venstre hjørne</translation>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation>Nederste højre hjørne</translation>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation>Øverste højre hjørne</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Standard font</source>
-        <translation>Standard skrifttype</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail</source>
@@ -2373,27 +2082,39 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Background color</source>
-        <translation>Baggrundsfarve</translation>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2404,7 +2125,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select parent item for your category.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
@@ -2420,7 +2141,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select icon for your category.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category</source>
@@ -2436,7 +2157,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category was not added due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot edit category</source>
@@ -2452,7 +2173,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category name is too short.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description is empty.</source>
@@ -2493,11 +2214,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category title</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set title for your category.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category description</source>
@@ -2505,19 +2226,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Set description for your category.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon selection</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load icon from file...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not use icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use default icon</source>
@@ -2532,7 +2253,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
@@ -2540,27 +2261,23 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select type of the standard feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encoding</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select encoding of the standard feed. If you are unsure about the encoding, then select &quot;UTF-8&quot; encoding.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation>minutter</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
@@ -2576,7 +2293,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Fetch it now</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon</source>
@@ -2584,7 +2301,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select icon for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -2616,7 +2333,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Feed name is too short.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description is empty.</source>
@@ -2685,11 +2402,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Feed was not edited due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All metadata fetched successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed and icon metadata fetched.</source>
@@ -2697,11 +2414,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Result: %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed or icon metatada not fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: %1.</source>
@@ -2717,11 +2434,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No icon fetched.</source>
@@ -2733,7 +2450,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Set title for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed description</source>
@@ -2745,31 +2462,31 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set url for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set username to access the feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set password to access the feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon selection</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load icon from file...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not use icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use default icon</source>
@@ -2785,7 +2502,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update every</source>
@@ -2793,42 +2510,42 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file is selected.</source>
@@ -2836,15 +2553,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export feeds</source>
@@ -2856,7 +2573,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import feeds</source>
@@ -2868,7 +2585,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File is selected.</source>
@@ -2876,11 +2593,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were loaded.</source>
@@ -2888,15 +2605,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical error occurred.</source>
@@ -2908,31 +2625,31 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2961,16 +2678,16 @@ File filter for external e-mail selection dialog.</extracomment>
     <message>
         <source>List with updates was not
 downloaded successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New release available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is new version which can be
 downloaded and installed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: &apos;%1&apos;.</source>
@@ -2983,7 +2700,7 @@ downloaded and installed.</source>
     <message>
         <source>This release is not newer than
 currently installed one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for updates</source>
@@ -3008,11 +2725,11 @@ currently installed one.</source>
     <message>
         <source>Installation file is not available directly.
 Go to application website to obtain it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new update available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot update application</source>
@@ -3020,7 +2737,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Cannot navigate to installation file. Check new installation downloads manually on project website.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download update</source>
@@ -3028,7 +2745,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading update...</source>
@@ -3036,7 +2753,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Downloaded successfully</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package was downloaded successfully.</source>
@@ -3044,19 +2761,19 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Install update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occured</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go to application website</source>
@@ -3067,25 +2784,49 @@ Go to application website to obtain it manually.</source>
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
-        <translation>Hjemmesideadresse indføres her</translation>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MessagesModel</name>
     <message>
         <source>Id</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read</source>
@@ -3141,11 +2882,11 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Id of feed which this message belongs to.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Url of the message.</source>
@@ -3157,7 +2898,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Creation date of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contents of the message.</source>
@@ -3169,7 +2910,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachments</source>
@@ -3181,35 +2922,35 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3224,11 +2965,11 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlight unread messages</source>
@@ -3236,7 +2977,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display all messages</source>
@@ -3244,42 +2985,38 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MessagesView</name>
     <message>
         <source>Context menu for messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem with starting external web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External web browser could not be started.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3302,7 +3039,7 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>connection timed out</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL handshake failed</source>
@@ -3312,7 +3049,7 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>proxy server connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>temporary failure</source>
@@ -3322,12 +3059,12 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>authentication failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>proxy authentication required</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>proxy server not found</source>
@@ -3351,23 +3088,45 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3400,14 +3159,17 @@ Go to application website to obtain it manually.</source>
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to %1.</source>
@@ -3415,7 +3177,7 @@ version by clicking this popup notification.</source>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3423,11 +3185,11 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3438,21 +3200,24 @@ At least API level %1 is required.</source>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Empty recycle bin</source>
@@ -3464,22 +3229,25 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
     <name>ShortcutCatcher</name>
     <message>
         <source>Reset to original shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear current shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3487,12 +3255,12 @@ At least API level %1 is required.</source>
     <message>
         <source>%1 (category)%2%3</source>
         <extracomment>Tooltip for standard feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3503,7 +3271,7 @@ This category does not contain any nested items.</source>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>does not use auto-update</source>
@@ -3518,7 +3286,10 @@ This category does not contain any nested items.</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3527,22 +3298,22 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fetch metadata</source>
@@ -3550,7 +3321,7 @@ Auto-update status: %5</source>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import was completely successfull.</source>
@@ -3568,11 +3339,11 @@ Auto-update status: %5</source>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
@@ -3580,7 +3351,7 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -3588,34 +3359,30 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3626,11 +3393,11 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3661,35 +3428,47 @@ Ulæste nyheder: %2</translation>
     </message>
     <message>
         <source>Browse your feeds and messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation>Netlæser</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays main menu.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main menu</source>
         <translation>Hovedmenu</translation>
     </message>
     <message>
-        <source>Open new web browser tab.</source>
-        <translation>Åben nyt faneblad i netlæser.</translation>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>Downloads</source>
-        <translation type="unfinished"/>
+        <source> and </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ToolBarEditor</name>
     <message>
         <source>Activated actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available actions</source>
@@ -3697,7 +3476,7 @@ Ulæste nyheder: %2</translation>
     </message>
     <message>
         <source>Insert separator</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert spacer</source>
@@ -3705,38 +3484,38 @@ Ulæste nyheder: %2</translation>
     </message>
     <message>
         <source>Separator</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TrayIconMenu</name>
     <message>
         <source>Close opened modal dialogs first.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3754,14 +3533,17 @@ Ulæste nyheder: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3774,11 +3556,11 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
@@ -3786,218 +3568,7 @@ Last login on: %5</source>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation>Tilbage</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation>Frem</translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation>Genindlæs</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Stop</translation>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation>Zoom</translation>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation>Ingen titel</translation>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation>Zoom ud.</translation>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation>Nulstil zoom til standard.</translation>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation>Skrevet af</translation>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation>Go tilbage.</translation>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation>Go frem</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Genindlæs nuværende hjemmeside.</translation>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation>Genindlæs hjemmeside</translation>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation>Kopier billede</translation>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation>Kopier billedsti</translation>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation>Åben billede i nyt faneblad</translation>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation>Netlæser</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation>Billede</translation>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Genindlæs nuværende hjemmeside.</translation>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation>Kopiér udvalgte</translation>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation>Kopier billedede til udklipsholder.</translation>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation>Åben dette billede i dette faneblad.</translation>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation>Åben link i ekstern netlæser</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation>Udskriv</translation>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation>Udskriv aktuelle hjemmeside.</translation>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation>HTML hjemmesider (*.html)</translation>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation>Vælg målfil til hjemmeside</translation>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation>Kan ikke gemme hjemmeside</translation>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation>Gem side som...</translation>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation>Gem billede på disk.</translation>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation>Gem billede som...</translation>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts
index b39b605d8..5431f1390 100644
--- a/localization/rssguard-de_DE.ts
+++ b/localization/rssguard-de_DE.ts
@@ -1,172 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.1">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="de_DE">
 <context>
     <name>Application</name>
     <message>
@@ -175,23 +9,23 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -199,58 +33,58 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatabaseCleaner</name>
     <message>
         <source>Shrinking database file...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file shrinked...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recycle bin purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing old messages...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatabaseFactory</name>
     <message>
         <source>MySQL server works as expected.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No MySQL server is running in the target destination.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Access denied. Invalid username or password used.</source>
         <extracomment>Access to MySQL server was denied.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error.</source>
@@ -259,50 +93,30 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>MySQL/MariaDB (dedicated database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SQLite (embedded database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation>Diese Website enthält keine Feeds.</translation>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadItem</name>
     <message>
         <source>Ico</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename</source>
@@ -310,103 +124,109 @@ This website contains %n feed(s).</source>
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Try again</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Stop</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select destination for downloaded file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished">Fehler: %1. {1?}</translation>
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open &amp;directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File '%1' is downloaded.
+        <source>File &apos;%1&apos; is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message>
         <source>Clean up</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>bytes</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kB</source>
@@ -422,7 +242,10 @@ Click here to open parent directory.</source>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -437,26 +260,26 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FeedsImportExportModel</name>
     <message>
         <source> (category)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (feed)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category </source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -481,11 +304,14 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -493,7 +319,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update started</source>
@@ -507,15 +333,15 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -537,64 +363,64 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -646,46 +472,46 @@ or this functionality is not implemented yet.</source>
     <message>
         <source>About %1</source>
         <extracomment>About RSS Guard dialog title.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PARTIALLY portable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resources</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormAddAccount</name>
     <message>
         <source>Add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
@@ -705,14 +531,14 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormBackupDatabaseSettings</name>
     <message>
         <source>Backup database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup properties</source>
@@ -732,122 +558,125 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Common name for backup files</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup was created successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup name cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormDatabaseCleanup</name>
     <message>
         <source>Cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database information</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I am ready.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup is running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown</source>
@@ -855,7 +684,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -866,7 +695,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -878,11 +707,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL</source>
@@ -890,95 +719,95 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
@@ -998,38 +827,38 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormEditFeed</name>
     <message>
         <source>Edit feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parent category</source>
@@ -1049,11 +878,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation>Minuten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -1101,23 +926,23 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed added</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -1129,15 +954,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1148,7 +973,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -1156,7 +981,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -1168,99 +993,99 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1289,22 +1114,10 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Settings</source>
         <translation>&amp;Einstellungen</translation>
     </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation>&amp;Aktueller Reiter</translation>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation>&amp;Reiter hinzufügen</translation>
-    </message>
     <message>
         <source>&amp;Messages</source>
         <translation>&amp;Nachrichten</translation>
     </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation>&amp;Web Browser</translation>
-    </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
         <translation>Schalte die &amp;Wichtigkeit der selektierten Nachrichten um</translation>
@@ -1321,14 +1134,6 @@ or this functionality is not implemented yet.</source>
         <source>Switch fullscreen mode.</source>
         <translation>Schalte zum Vollbildmodus.</translation>
     </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation>Füge neuen Web Browser Reiter hinzu.</translation>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation>Schliesse aktuellen Web Browser Reiter.</translation>
-    </message>
     <message>
         <source>No actions available</source>
         <translation>Keine Funktionen verfügbar</translation>
@@ -1351,307 +1156,275 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;About application</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays extra info about this application.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides or displays the main menu.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;unread</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open selected source articles in &amp;external browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open selected messages in &amp;internal browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;next message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;previous message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for &amp;updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/hide</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Fullscreen</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Feed list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Main menu</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open external browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch visibility of main toolbars.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restart</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update &amp;all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category</source>
@@ -1659,70 +1432,70 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1850,14 +1623,6 @@ or this functionality is not implemented yet.</source>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
         <translation>Öffne neue Reiter mit einem Doppelklick der linken Maustaste auf der Reiterleiste</translation>
     </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation>Mausgesten einschalten</translation>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation>Reihe neue Reiter (mit Hyperlink) nach dem aktiven Reiter ein</translation>
-    </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
@@ -1937,7 +1702,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Parameters to executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>some keyboard shortcuts are not unique</source>
@@ -1987,16 +1752,12 @@ Disadvantages:
 &lt;li&gt;application startup and shutdown can take little longer (max. 2 seconds).&lt;/li&gt;
 &lt;/ul&gt;
 Authors of this application are NOT responsible for lost data.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in-memory database switched</source>
         <translation>In-Speicherdatenbank umgeschaltet</translation>
     </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation>Interner Webbrowser</translation>
-    </message>
     <message>
         <source>External web browser</source>
         <translation>Externer Webbrowser</translation>
@@ -2025,10 +1786,6 @@ Authors of this application are NOT responsible for lost data.</source>
         <source>Auto-update all feeds every</source>
         <translation>Auto-Update alle Feeds alle</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> Minuten</translation>
-    </message>
     <message>
         <source>Feed connection timeout</source>
         <translation>Verbindungs-Timeout des Feed</translation>
@@ -2143,65 +1900,53 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>You did not executed any connection test yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Launch %1 on operating system startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message count format in feed list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter format for count of messages displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) messages.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>custom external browser is not set correctly</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbars</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar for feeds list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar for messages list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select toolbar to edit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart now?</source>
@@ -2209,192 +1954,168 @@ You have to restart manually.</source>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executables (*)</source>
         <extracomment>File filter for external browser selection dialog.
 ----------
 File filter for external e-mail selection dialog.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Web browser &amp; e-mail &amp; proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all downloaded files to</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select e-mail executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Notification position</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Standard font</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Background color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2557,11 +2278,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation>Minuten</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
@@ -2605,11 +2322,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed name is ok.</source>
@@ -2714,19 +2431,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Icon fetched successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No icon fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed title</source>
@@ -2746,7 +2463,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set url for your feed.</source>
@@ -2778,7 +2495,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Fetch icon from feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No metadata fetched so far.</source>
@@ -2798,38 +2515,38 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file is selected.</source>
@@ -2837,83 +2554,83 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OPML 2.0 files (*.opml)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File is selected.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were loaded.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical error occurred.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parsing data...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
@@ -2921,19 +2638,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2995,94 +2712,118 @@ die aktuell installierte.</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download new installation files.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking for updates failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download installation file for your OS.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation file is not available directly.
 Go to application website to obtain it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new update available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot update application</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot navigate to installation file. Check new installation downloads manually on project website.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading update...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloaded successfully</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package was downloaded successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occured</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go to application website</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
-        <translation>Die Webseitenadresse kommt hierhin</translation>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3169,86 +2910,86 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Permanently deleted</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of attachments.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MessagesToolBar</name>
     <message>
         <source>Search messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message search box</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlight unread messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display all messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3261,14 +3002,6 @@ Go to application website to obtain it manually.</source>
         <source>Context menu for messages</source>
         <translation>Kontextmenü der Nachricht</translation>
     </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation>Nachricht ohne URL</translation>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation>Nachricht &quot;%&quot; enthält keine URL.</translation>
-    </message>
     <message>
         <source>Problem with starting external web browser</source>
         <translation>Problem mit Start des externen Webbrowsers</translation>
@@ -3279,11 +3012,15 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished">Zeitungsansicht</translation>
     </message>
 </context>
 <context>
@@ -3301,22 +3038,22 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connection timed out</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL handshake failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>proxy server connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>temporary failure</source>
@@ -3326,17 +3063,17 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>authentication failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>proxy authentication required</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>proxy server not found</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>content not found</source>
@@ -3351,27 +3088,49 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>no errors</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3404,22 +3163,25 @@ Go to application website to obtain it manually.</source>
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3427,40 +3189,43 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RecycleBin</name>
     <message>
         <source>Recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Empty recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3468,22 +3233,25 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
     <name>ShortcutCatcher</name>
     <message>
         <source>Reset to original shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear current shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3491,38 +3259,41 @@ At least API level %1 is required.</source>
     <message>
         <source>%1 (category)%2%3</source>
         <extracomment>Tooltip for standard feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StandardFeed</name>
     <message>
         <source>Metadata not fetched</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>does not use auto-update</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>uses global settings</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3531,22 +3302,22 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fetch metadata</source>
@@ -3554,37 +3325,37 @@ Auto-update status: %5</source>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import was completely successfull.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -3592,49 +3363,45 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished">Toolbar Platzhalter</translation>
     </message>
 </context>
 <context>
     <name>SystemFactory</name>
     <message>
         <source>New version available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3642,7 +3409,7 @@ Account ID: %1</source>
     <message>
         <source>%1
 Unread news: %2</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3666,49 +3433,61 @@ Unread news: %2</source>
         <source>Browse your feeds and messages</source>
         <translation>Blätteren Sie Ihre Feeds und Nachrichten</translation>
     </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation>Web Browser</translation>
-    </message>
     <message>
         <source>Displays main menu.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open new web browser tab.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ToolBarEditor</name>
     <message>
         <source>Activated actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert separator</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separator</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3716,23 +3495,23 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3747,24 +3526,27 @@ Unread news: %2</source>
     <message>
         <source>does not use auto-update</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>uses global settings</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3777,230 +3559,19 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation>Navigations-Panel</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation>Zurück</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation>Vorwärts</translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation>Neu laden</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Stopp</translation>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation>Zoom  </translation>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation>Kein Titel</translation>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation>Zoom verkleinern.</translation>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation>Zoom auf Standard zurücksetzen.</translation>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation>Zoom vergrössern.</translation>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation>Geschrieben von</translation>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation>Zeitungsansicht</translation>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation>Geh zurück.</translation>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation>Geh vorwärts.</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Aktuelle Webseite neu laden.</translation>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation>Stoppe das laden der Webseite.</translation>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation>Webseite neu laden</translation>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation>URL-Link kopieren</translation>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation>Bild kopieren</translation>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation>Bild-URL kopieren</translation>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation>Link in neuem Reiter öffnen</translation>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation>Link folgen</translation>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation>Bild in neuem Reiter öffnen</translation>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation>Web Browser</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation>Bild</translation>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation>Hyperlink</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Lade aktuelle Webseite neu.</translation>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation>Kopiere Selektion</translation>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts
index b132b0621..857e8934d 100644
--- a/localization/rssguard-en_GB.ts
+++ b/localization/rssguard-en_GB.ts
@@ -1,174 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
 <TS version="2.1" language="en_GB">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>Application</name>
     <message>
@@ -280,29 +112,6 @@ Also note that some resources are cached by internal web browser. Thus, after ch
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>DownloadItem</name>
     <message>
@@ -1071,10 +880,6 @@ or this functionality is not implemented yet.</source>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
         <translation type="unfinished"></translation>
@@ -1309,22 +1114,10 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Settings</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&amp;Messages</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
         <translation type="unfinished"></translation>
@@ -1341,14 +1134,6 @@ or this functionality is not implemented yet.</source>
         <source>Switch fullscreen mode.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>No actions available</source>
         <translation type="unfinished"></translation>
@@ -1381,22 +1166,10 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Delete selected messages</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Hides or displays the main menu.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
         <translation type="unfinished"></translation>
@@ -1413,10 +1186,6 @@ or this functionality is not implemented yet.</source>
         <source>Open selected messages in &amp;internal browser</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Select &amp;next message</source>
         <translation type="unfinished"></translation>
@@ -1429,18 +1198,6 @@ or this functionality is not implemented yet.</source>
         <source>Check for &amp;updates</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Show/hide</source>
         <translation type="unfinished"></translation>
@@ -1481,10 +1238,6 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Feed/message list headers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
         <translation type="unfinished"></translation>
@@ -1870,14 +1623,6 @@ or this functionality is not implemented yet.</source>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
@@ -2011,10 +1756,6 @@ Authors of this application are NOT responsible for lost data.</source>
         <source>in-memory database switched</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>External web browser</source>
         <translation type="unfinished"></translation>
@@ -2043,10 +1784,6 @@ Authors of this application are NOT responsible for lost data.</source>
         <source>Auto-update all feeds every</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Feed connection timeout</source>
         <translation type="unfinished"></translation>
@@ -2167,18 +1904,6 @@ Authors of this application are NOT responsible for lost data.</source>
         <source>Launch %1 on operating system startup</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
@@ -2284,14 +2009,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Working database</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Use custom external web browser</source>
         <translation type="unfinished"></translation>
@@ -2346,46 +2063,18 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Working database is ok.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Notification position</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>(Tray icon is not available.)</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Internal message browser fonts</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Standard font</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>E-mail</source>
         <translation type="unfinished"></translation>
@@ -2394,14 +2083,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Enable notifications</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Background color</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Open download manager when new download is started</source>
         <translation type="unfinished"></translation>
@@ -2414,6 +2095,26 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Statusbar</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FormStandardCategoryDetails</name>
@@ -2577,10 +2278,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Title</source>
         <translation type="unfinished"></translation>
@@ -3094,9 +2791,33 @@ Go to application website to obtain it manually.</source>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3276,14 +2997,6 @@ Go to application website to obtain it manually.</source>
         <source>Context menu for messages</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Problem with starting external web browser</source>
         <translation type="unfinished"></translation>
@@ -3300,6 +3013,10 @@ Go to application website to obtain it manually.</source>
         <source>External e-mail client could not be started.</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>NetworkFactory</name>
@@ -3382,6 +3099,28 @@ Go to application website to obtain it manually.</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
@@ -3624,10 +3363,6 @@ Account ID: %1</source>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Feed update progress bar</source>
         <translation type="unfinished"></translation>
@@ -3693,11 +3428,6 @@ Unread news: %2</source>
         <source>Browse your feeds and messages</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Displays main menu.</source>
         <translation type="unfinished"></translation>
@@ -3707,11 +3437,28 @@ Unread news: %2</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>Open new web browser tab.</source>
+        <source>Downloads</source>
         <translation type="unfinished"></translation>
     </message>
+</context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
     <message>
-        <source>Downloads</source>
+        <source> and </source>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -3822,215 +3569,4 @@ Last login on: %5</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 </TS>
diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts
index 4f3300b55..37e6bbfa3 100644
--- a/localization/rssguard-en_US.ts
+++ b/localization/rssguard-en_US.ts
@@ -1,462 +1,285 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="en_US" version="2.1">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="en_US">
 <context>
     <name>Application</name>
     <message>
         <source>Application is already running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatabaseCleaner</name>
     <message>
         <source>Shrinking database file...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file shrinked...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recycle bin purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing old messages...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatabaseFactory</name>
     <message>
         <source>MySQL server works as expected.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No MySQL server is running in the target destination.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Access denied. Invalid username or password used.</source>
         <extracomment>Access to MySQL server was denied.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error.</source>
         <extracomment>Unknown MySQL error arised.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MySQL/MariaDB (dedicated database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SQLite (embedded database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadItem</name>
     <message>
         <source>Ico</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Try again</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Stop</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select destination for downloaded file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open &amp;directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File '%1' is downloaded.
+        <source>File &apos;%1&apos; is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message>
         <source>Clean up</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>bytes</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
     <name>FeedMessageViewer</name>
     <message>
         <source>Toolbar for messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar for feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FeedsImportExportModel</name>
     <message>
         <source> (category)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (feed)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category </source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -464,1265 +287,1215 @@ Click here to open parent directory.</source>
     <message>
         <source>Title</source>
         <extracomment>Title text in the feed list header.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Titles of feeds/categories.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Counts of unread/all meesages.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Root</source>
         <extracomment>Name of root item of feed list which can be seen in feed add/edit dialog.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Cannot update all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update started</source>
         <extracomment>Text display in status bar when feed update is started.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Updated feed &apos;%1&apos;</source>
         <extracomment>Text display in status bar when particular feed is updated.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FeedsToolBar</name>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FeedsView</name>
     <message>
         <source>Cannot edit item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot delete item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormAbout</name>
     <message>
         <source>Information</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Licenses</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GNU GPL License (applies to RSS Guard source code)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GNU GPL License</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>BSD License (applies to QtSingleApplication source code)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Licenses page is available only in English language.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changelog</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changelog page is available only in English language.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>License not found.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changelog not found.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;b&gt;%8&lt;/b&gt;&lt;br&gt;&lt;b&gt;Version:&lt;/b&gt; %1 (build on %2 with CMake %3)&lt;br&gt;&lt;b&gt;Revision:&lt;/b&gt; %4&lt;br&gt;&lt;b&gt;Build date:&lt;/b&gt; %5&lt;br&gt;&lt;b&gt;Qt:&lt;/b&gt; %6 (compiled against %7)&lt;br&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About %1</source>
         <extracomment>About RSS Guard dialog title.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PARTIALLY portable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resources</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormAddAccount</name>
     <message>
         <source>Add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormBackupDatabaseSettings</name>
     <message>
         <source>Backup database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup properties</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Items to backup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Common name for backup files</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup was created successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup name cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormDatabaseCleanup</name>
     <message>
         <source>Cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database information</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I am ready.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup is running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormEditAccount</name>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormEditFeed</name>
     <message>
         <source>Edit feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requires authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update every</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed added</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed was not added due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormEditOwnCloudAccount</name>
     <message>
         <source>URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormMain</name>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;View</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Tools</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit the application.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display settings of the application.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch fullscreen mode.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No actions available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No actions are available right now.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides main window if it is visible and shows it if it is hidden.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides or shows the list of feeds/categories.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check if new update for the application is available for download.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;About application</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays extra info about this application.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hides or displays the main menu.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;unread</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open selected source articles in &amp;external browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open selected messages in &amp;internal browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;next message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;previous message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for &amp;updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/hide</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Fullscreen</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Feed list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Main menu</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open external browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch visibility of main toolbars.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restart</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update &amp;all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1730,248 +1503,240 @@ or this functionality is not implemented yet.</source>
     <message>
         <source>General</source>
         <extracomment>General settings section.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>User interface</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon theme</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keyboard shortcuts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Language</source>
         <extracomment>Language settings section.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons &amp;&amp; skins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tray icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Start application hidden</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
         <extracomment>Proxy server type.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Host</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname or IP of your proxy server</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Port</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your username for proxy server authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Your password for proxy server authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Code</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Version</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Socks5</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Http</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (not supported on this platform)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tray area &amp;&amp; notifications</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close tabs with</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Middle mouse button single-click</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot save settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icons</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Skins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Active skin:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected skin:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide tab bar if just one tab is visible</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical settings were changed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp; messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some critical settings are not set. You must fix these settings in order confirm new settings.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Web browser executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executable parameters</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select web browser executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executables (*.*)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Opera 12 or older</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executable file of web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parameters to executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>some keyboard shortcuts are not unique</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of errors:
 %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of changes:
 %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>language changed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>icon theme changed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>skin changed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use sample arguments for</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use in-memory database as the working database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Usage of in-memory working database has several advantages and pitfalls. Make sure that you are familiar with these before you turn this feature on. Advantages:
@@ -1985,1300 +1750,1272 @@ Disadvantages:
 &lt;li&gt;application startup and shutdown can take little longer (max. 2 seconds).&lt;/li&gt;
 &lt;/ul&gt;
 Authors of this application are NOT responsible for lost data.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in-memory database switched</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>WARNING: Note that switching to another data storage type will NOT copy existing your data from currently active data storage to newly selected one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database driver</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right mouse button double-click</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update all feeds every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed connection timeout</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ms</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update all feed on application startup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Data storage</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname of your MySQL server</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username to login with</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>data storage backend changed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname looks ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username looks ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password looks ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar button style</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hide main window when it is minimized</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No connection test triggered so far.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that these settings are applied only on newly established connections.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>System proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon only</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text only</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text beside icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Text under icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Follow OS style</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Keep message selection in the middle of the message list viewport</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You did not executed any connection test yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Launch %1 on operating system startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message count format in feed list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enter format for count of messages displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) messages.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>custom external browser is not set correctly</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbars</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar for feeds list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar for messages list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select toolbar to edit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart now?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executables (*)</source>
         <extracomment>File filter for external browser selection dialog.
 ----------
 File filter for external e-mail selection dialog.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Web browser &amp; e-mail &amp; proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all downloaded files to</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select e-mail executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Notification position</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Standard font</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Background color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormStandardCategoryDetails</name>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your category.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select icon for your category.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category was not added due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot edit category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category was not edited due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category name is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category name is too short.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select icon file for the category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Images (*.bmp *.jpg *.jpeg *.png *.svg *.tga)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look in:</source>
         <extracomment>Label to describe the folder for icon file selection dialog.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon name:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon type:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category title</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set title for your category.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category description</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set description for your category.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon selection</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load icon from file...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not use icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use default icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormStandardFeedDetails</name>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select type of the standard feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Encoding</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select encoding of the standard feed. If you are unsure about the encoding, then select &quot;UTF-8&quot; encoding.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fetch it now</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select icon for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fetch metadata</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed name is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed name is too short.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Description is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select icon file for the feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Images (*.bmp *.jpg *.jpeg *.png *.svg *.tga)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Look in:</source>
         <extracomment>Label for field with icon file name textbox for selection dialog.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon name:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon type:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed was not added due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot edit feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed was not edited due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>All metadata fetched successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed and icon metadata fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Result: %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed or icon metatada not fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No metadata fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon fetched successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No icon fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed title</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set title for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed description</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set description for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set url for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set username to access the feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set password to access the feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon selection</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load icon from file...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not use icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use default icon</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fetch icon from feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No metadata fetched so far.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update every</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file is selected.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OPML 2.0 files (*.opml)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File is selected.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were loaded.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical error occurred.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parsing data...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormUpdate</name>
     <message>
         <source>Current release</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available release</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Changes</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown</source>
         <extracomment>Unknown release.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List with updates was not
 downloaded successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>New release available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is new version which can be
 downloaded and installed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new release available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This release is not newer than
 currently installed one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for updates</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download new installation files.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Checking for updates failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download installation file for your OS.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Installation file is not available directly.
 Go to application website to obtain it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new update available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot update application</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot navigate to installation file. Check new installation downloads manually on project website.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading update...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloaded successfully</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package was downloaded successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occured</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go to application website</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
-        <translation type="unfinished"/>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MessagesModel</name>
     <message>
         <source>Id</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deleted</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Important</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Url</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Created on</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contents</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Is message read?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Is message deleted?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Is message important?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Id of feed which this message belongs to.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Url of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Author of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Creation date of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Contents of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Permanently deleted</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of attachments.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MessagesToolBar</name>
     <message>
         <source>Search messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message search box</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlight unread messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display all messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MessagesView</name>
     <message>
         <source>Context menu for messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem with starting external web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External web browser could not be started.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3286,87 +3023,109 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>protocol error</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>host not found</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connection timed out</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SSL handshake failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>proxy server connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>temporary failure</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>authentication failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>proxy authentication required</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>proxy server not found</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>content not found</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown error</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no errors</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3399,22 +3158,25 @@ Go to application website to obtain it manually.</source>
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3422,40 +3184,43 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RecycleBin</name>
     <message>
         <source>Recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Empty recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3463,22 +3228,25 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
     <name>ShortcutCatcher</name>
     <message>
         <source>Reset to original shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear current shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3486,38 +3254,41 @@ At least API level %1 is required.</source>
     <message>
         <source>%1 (category)%2%3</source>
         <extracomment>Tooltip for standard feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StandardFeed</name>
     <message>
         <source>Metadata not fetched</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>does not use auto-update</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>uses global settings</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3526,110 +3297,106 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fetch metadata</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import was completely successfull.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemFactory</name>
     <message>
         <source>New version available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3637,104 +3404,116 @@ Account ID: %1</source>
     <message>
         <source>%1
 Unread news: %2</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabBar</name>
     <message>
         <source>Close this tab.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Close tab</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TabWidget</name>
     <message>
         <source>Feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Browse your feeds and messages</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays main menu.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open new web browser tab.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ToolBarEditor</name>
     <message>
         <source>Activated actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert separator</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separator</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TrayIconMenu</name>
     <message>
         <source>Close opened modal dialogs first.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3742,24 +3521,27 @@ Unread news: %2</source>
     <message>
         <source>does not use auto-update</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>uses global settings</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3772,230 +3554,19 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts
index 2a2dc22fc..0ea5c22b6 100644
--- a/localization/rssguard-fr_FR.ts
+++ b/localization/rssguard-fr_FR.ts
@@ -1,172 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.1">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="fr_FR">
 <context>
     <name>Application</name>
     <message>
@@ -175,23 +9,23 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -199,42 +33,42 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatabaseCleaner</name>
     <message>
         <source>Shrinking database file...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file shrinked...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recycle bin purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing old messages...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -259,170 +93,159 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>MySQL/MariaDB (dedicated database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SQLite (embedded database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadItem</name>
     <message>
         <source>Ico</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Filename</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Try again</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Stop</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select destination for downloaded file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished">Erreur : %1. {1?}</translation>
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open &amp;directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File '%1' is downloaded.
+        <source>File &apos;%1&apos; is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message>
         <source>Clean up</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>bytes</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>kB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -437,11 +260,11 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -456,7 +279,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Category </source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -481,11 +304,14 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -493,7 +319,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update started</source>
@@ -507,22 +333,22 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FeedsToolBar</name>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -537,64 +363,64 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -650,42 +476,42 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Settings type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PARTIALLY portable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resources</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormAddAccount</name>
     <message>
         <source>Add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
@@ -705,26 +531,26 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormBackupDatabaseSettings</name>
     <message>
         <source>Backup database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup properties</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Items to backup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings</source>
@@ -732,122 +558,125 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Common name for backup files</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup was created successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup name cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormDatabaseCleanup</name>
     <message>
         <source>Cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database information</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I am ready.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup is running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown</source>
@@ -855,7 +684,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -866,7 +695,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -878,11 +707,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL</source>
@@ -890,95 +719,95 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
@@ -998,38 +827,38 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormEditFeed</name>
     <message>
         <source>Edit feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parent category</source>
@@ -1051,10 +880,6 @@ or this functionality is not implemented yet.</source>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Sélectionner la stratégie des mises à jour automatique pour ce flux. Par défaut, cette stratégie signifie que le flux sera mis à jour par intervalle de temps défini dans les paramètres de l&apos;application.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation>minutes</translation>
-    </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
         <translation>Certain flux requière une authentification, incluant les flux GMail. Les schémas d&apos;authentification BASIC, NTLM-2 et DIGEST-MD5 sont supportés.</translation>
@@ -1105,7 +930,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed</source>
@@ -1113,11 +938,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Feed added</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -1129,15 +954,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1148,7 +973,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -1156,7 +981,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -1168,99 +993,99 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1289,22 +1114,10 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Settings</source>
         <translation>&amp;Paramètres</translation>
     </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation>&amp;Onglet courant</translation>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation>&amp;Ajouter un onglet</translation>
-    </message>
     <message>
         <source>&amp;Messages</source>
         <translation>&amp;Messages</translation>
     </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation>&amp;Navigateur web</translation>
-    </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
         <translation>Changer l&apos;&amp;importance pour les messages sélectionnés</translation>
@@ -1321,14 +1134,6 @@ or this functionality is not implemented yet.</source>
         <source>Switch fullscreen mode.</source>
         <translation>Passer en mode plein écran.</translation>
     </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation>Ajouter un nouvel onglet de navigation web.</translation>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation>Fermer l&apos;onglet de navigation web courant.</translation>
-    </message>
     <message>
         <source>No actions available</source>
         <translation>Aucune actions disponibles</translation>
@@ -1361,22 +1166,10 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Delete selected messages</source>
         <translation>&amp;Supprimer les messages sélectionnés</translation>
     </message>
-    <message>
-        <source>Settings</source>
-        <translation>Paramètres</translation>
-    </message>
     <message>
         <source>Hides or displays the main menu.</source>
         <translation>Cacher ou montrer le menu principal.</translation>
     </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation>&amp;Fermer tout les onglets sauf le courant</translation>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation>&amp;Fermer l&apos;onglet courant</translation>
-    </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
         <translation>Marquer les messages &amp;sélectionnés comme &amp;lus</translation>
@@ -1393,10 +1186,6 @@ or this functionality is not implemented yet.</source>
         <source>Open selected messages in &amp;internal browser</source>
         <translation>Ouvrir les messages sélectionnés dans le navigateur &amp;interne</translation>
     </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation>Ouvrir les sources de l&apos;article sélectionnées dans le navigateur &amp;interne</translation>
-    </message>
     <message>
         <source>Select &amp;next message</source>
         <translation>Sélectionner le message &amp;suivant</translation>
@@ -1409,18 +1198,6 @@ or this functionality is not implemented yet.</source>
         <source>Check for &amp;updates</source>
         <translation>Vérifier pour &amp;mise à jour</translation>
     </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation>Activer &amp;JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation>Activer les &amp;plugins externes</translation>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation>Chargement automatique des &amp;images</translation>
-    </message>
     <message>
         <source>Show/hide</source>
         <translation>Montrer/cacher</translation>
@@ -1439,39 +1216,35 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open external browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch visibility of main toolbars.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
@@ -1479,7 +1252,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restart</source>
@@ -1487,139 +1260,139 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update &amp;all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -1627,31 +1400,31 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category</source>
@@ -1663,66 +1436,66 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1850,14 +1623,6 @@ or this functionality is not implemented yet.</source>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
         <translation>Ouvrir de nouveaux onglets avec le double clic gauche de la souris sur la barre des onglets</translation>
     </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation>Activer les gestes de la souris</translation>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation>Mettre les nouveaux onglets (avec les hyperliens) après l&apos;onglet actif</translation>
-    </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
@@ -2003,10 +1768,6 @@ Les auteurs de cette application NE sont PAS responsable de la perte de données
         <source>in-memory database switched</source>
         <translation>base de données en mémoire changée</translation>
     </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation>Navigateur web interne</translation>
-    </message>
     <message>
         <source>External web browser</source>
         <translation>Navigateur web externe</translation>
@@ -2035,10 +1796,6 @@ Les auteurs de cette application NE sont PAS responsable de la perte de données
         <source>Auto-update all feeds every</source>
         <translation>Mettre les flux à jour automatiquement tout les</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation>minutes</translation>
-    </message>
     <message>
         <source>Feed connection timeout</source>
         <translation>Délai expiré pour les flux</translation>
@@ -2159,18 +1916,6 @@ Les auteurs de cette application NE sont PAS responsable de la perte de données
         <source>Launch %1 on operating system startup</source>
         <translation>Lancer &amp;1 au démarrage du système</translation>
     </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation>Activer JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation>Activer les plugins externes basés sur NPAPI</translation>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation>Chargement automatique des images</translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Si décoché, alors le navigateur internet du système par défaut est utilisé.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -2193,25 +1938,25 @@ Les auteurs de cette application NE sont PAS responsable de la perte de données
     </message>
     <message>
         <source>Toolbars</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar for feeds list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar for messages list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select toolbar to edit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart now?</source>
@@ -2219,192 +1964,168 @@ You have to restart manually.</source>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executables (*)</source>
         <extracomment>File filter for external browser selection dialog.
 ----------
 File filter for external e-mail selection dialog.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Web browser &amp; e-mail &amp; proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all downloaded files to</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select e-mail executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Notification position</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Standard font</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Background color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2439,7 +2160,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Edit existing category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -2471,7 +2192,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select icon file for the category</source>
@@ -2569,10 +2290,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Sélectionner la stratégie des mises à jour automatique pour ce flux. Par défaut, cette stratégie signifie que le flux sera mis à jour par intervalle de temps défini dans les paramètres de l&apos;application.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation>minutes</translation>
-    </message>
     <message>
         <source>Title</source>
         <translation>Titre</translation>
@@ -2619,7 +2336,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed name is ok.</source>
@@ -2635,7 +2352,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
@@ -2724,19 +2441,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Icon fetched successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No icon fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed title</source>
@@ -2788,7 +2505,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Fetch icon from feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No metadata fetched so far.</source>
@@ -2808,58 +2525,58 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file is selected.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source file</source>
@@ -2867,7 +2584,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import feeds</source>
@@ -2879,7 +2596,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File is selected.</source>
@@ -2887,27 +2604,27 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were loaded.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical error occurred.</source>
@@ -2915,15 +2632,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Parsing data...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
@@ -2931,19 +2648,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3039,23 +2756,23 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Download update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading update...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloaded successfully</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Package was downloaded successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Install update</source>
@@ -3067,11 +2784,11 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go to application website</source>
@@ -3082,18 +2799,42 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
-        <translation>L&apos;adresse du site web pointe ici</translation>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3180,78 +2921,78 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Permanently deleted</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of attachments.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MessagesToolBar</name>
     <message>
         <source>Search messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Message search box</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlight unread messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display all messages</source>
@@ -3259,11 +3000,11 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3272,14 +3013,6 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
         <source>Context menu for messages</source>
         <translation>Menu contextuel pour les messages</translation>
     </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation>Message sans URL</translation>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation>Le message &apos;&amp;s&apos; ne contient pas d&apos;URL.</translation>
-    </message>
     <message>
         <source>Problem with starting external web browser</source>
         <translation>Problème avec le démarrage du navigateur internet externe</translation>
@@ -3290,11 +3023,15 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished">Vue journal</translation>
     </message>
 </context>
 <context>
@@ -3366,23 +3103,45 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3415,22 +3174,25 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3438,40 +3200,43 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RecycleBin</name>
     <message>
         <source>Recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Empty recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3479,22 +3244,25 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
     <name>ShortcutCatcher</name>
     <message>
         <source>Reset to original shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Clear current shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3507,18 +3275,18 @@ At least API level %1 is required.</source>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StandardFeed</name>
     <message>
         <source>Metadata not fetched</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>does not use auto-update</source>
@@ -3533,7 +3301,10 @@ This category does not contain any nested items.</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3542,22 +3313,22 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fetch metadata</source>
@@ -3565,15 +3336,15 @@ Auto-update status: %5</source>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import was completely successfull.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import feeds</source>
@@ -3583,19 +3354,19 @@ Auto-update status: %5</source>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -3603,49 +3374,45 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>SystemFactory</name>
     <message>
         <source>New version available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3653,7 +3420,7 @@ Account ID: %1</source>
     <message>
         <source>%1
 Unread news: %2</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3677,33 +3444,45 @@ Unread news: %2</source>
         <source>Browse your feeds and messages</source>
         <translation>Parcourir vos flux et messages</translation>
     </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation>Navigateur web</translation>
-    </message>
     <message>
         <source>Displays main menu.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Main menu</source>
         <translation>Menu principal</translation>
     </message>
     <message>
-        <source>Open new web browser tab.</source>
-        <translation>Ouvrir un nouvel onglet de navigation web.</translation>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>Downloads</source>
-        <translation type="unfinished"/>
+        <source> and </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>ToolBarEditor</name>
     <message>
         <source>Activated actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Available actions</source>
@@ -3711,39 +3490,39 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Insert separator</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Insert spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Separator</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3768,14 +3547,17 @@ Unread news: %2</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3788,230 +3570,19 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation>Panneau de navigation</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation>Retour</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation>Suivant</translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation>Recharger</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Stop</translation>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation>Zoom</translation>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation>Pas de titre</translation>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation>Diminuer le zoom.</translation>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation>Remettre le zoom par défaut.</translation>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation>Augmenter le zoom.</translation>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation>Écrit par</translation>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation>Vue journal</translation>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation>Revenir en arrière.</translation>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation>Avancer.</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Recharger la page courante</translation>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation>Arrêter le chargement de la page</translation>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation>Recharger la page web</translation>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation>Copier le l&apos;URL</translation>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation>Copier l&apos;image</translation>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation>Copier l&apos;URL de l&apos;image</translation>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation>Ouvrir dans un nouvel onglet</translation>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation>Suivre le lien</translation>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation>Ouvrir l&apos;image dans un nouvel onglet</translation>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation>Navigateur web</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation>Image</translation>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation>Hyperlien</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Recharger la page courante</translation>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation>Copier la sélection</translation>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation>Copier la sélection courante dans le presse-papier.</translation>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation>Copier l&apos;URL dans le presse-papier.</translation>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation>Copier l&apos;image dans le presse-papier.</translation>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation>Copier l&apos;URL de l&apos;image dans le presse-papier.</translation>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation>Ouvrir l&apos;hyperlien dans un nouvel onglet.</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation>Ouvrir l&apos;hyperlien dans l&apos;onglet.</translation>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation>Ouvrir l&apos;image dans l&apos;onglet.</translation>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts
index aabf615de..6bcbc154c 100644
--- a/localization/rssguard-it_IT.ts
+++ b/localization/rssguard-it_IT.ts
@@ -1,172 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.1">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation>Aggiungi sottoscrizione</translation>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation>Un altra sottoscrizione</translation>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation>Il titolo inserito è ok.</translation>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>Titolo</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Indirizzo</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation>Regole personalizzate</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation>Impostazioni Adblock</translation>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation>Abilita Adblock</translation>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Opzioni</translation>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Aggiungi regola</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Rimuovi regola</translation>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation>Aggiungi sottoscrizione</translation>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation>Rimuovi sottoscrizione</translation>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation>Aggiorna sottoscrizioni</translation>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation>Adblock</translation>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation>Disabilita solo su questa pagina</translation>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation>Nessun contenuto bloccato</translation>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Aggiungi regolaAggiungi regola</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Rimuovi regola</translation>
-    </message>
-</context>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="it_IT">
 <context>
     <name>Application</name>
     <message>
@@ -175,23 +9,23 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -199,58 +33,58 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatabaseCleaner</name>
     <message>
         <source>Shrinking database file...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file shrinked...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recycle bin purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Removing old messages...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>DatabaseFactory</name>
     <message>
         <source>MySQL server works as expected.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No MySQL server is running in the target destination.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Access denied. Invalid username or password used.</source>
         <extracomment>Access to MySQL server was denied.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unknown error.</source>
@@ -259,43 +93,23 @@ Also note that some resources are cached by internal web browser. Thus, after ch
     </message>
     <message>
         <source>MySQL/MariaDB (dedicated database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>SQLite (embedded database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -310,72 +124,72 @@ This website contains %n feed(s).</source>
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Try again</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Stop</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Open file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select destination for downloaded file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished">Errore: %1. {1?}</translation>
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open &amp;directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <source>File '%1' is downloaded.
+        <source>File &apos;%1&apos; is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL: %1</source>
@@ -383,11 +197,11 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -398,11 +212,17 @@ Click here to open parent directory.</source>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <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>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>bytes</source>
@@ -422,7 +242,10 @@ Click here to open parent directory.</source>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -437,26 +260,26 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FeedsImportExportModel</name>
     <message>
         <source> (category)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> (feed)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category </source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -481,11 +304,14 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -493,7 +319,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update started</source>
@@ -507,15 +333,15 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -537,64 +363,64 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Not supported</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -641,7 +467,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&lt;b&gt;%8&lt;/b&gt;&lt;br&gt;&lt;b&gt;Version:&lt;/b&gt; %1 (build on %2 with CMake %3)&lt;br&gt;&lt;b&gt;Revision:&lt;/b&gt; %4&lt;br&gt;&lt;b&gt;Build date:&lt;/b&gt; %5&lt;br&gt;&lt;b&gt;Qt:&lt;/b&gt; %6 (compiled against %7)&lt;br&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>About %1</source>
@@ -650,23 +476,23 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Settings type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Settings file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>PARTIALLY portable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Resources</source>
@@ -674,18 +500,18 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormAddAccount</name>
     <message>
         <source>Add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Name</source>
@@ -705,22 +531,22 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormBackupDatabaseSettings</name>
     <message>
         <source>Backup database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup properties</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Items to backup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database</source>
@@ -732,90 +558,93 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Common name for backup files</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup was created successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup name cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormDatabaseCleanup</name>
     <message>
         <source>Cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database information</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>I am ready.</source>
@@ -823,31 +652,31 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database cleanup is running.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown</source>
@@ -855,18 +684,18 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormEditAccount</name>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -878,11 +707,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL</source>
@@ -890,99 +719,99 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is empty.</source>
@@ -990,7 +819,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is empty.</source>
@@ -998,46 +827,46 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormEditFeed</name>
     <message>
         <source>Edit feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL</source>
@@ -1049,15 +878,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation>minuti</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requires authentication</source>
@@ -1073,7 +898,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is empty.</source>
@@ -1081,7 +906,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is empty.</source>
@@ -1089,7 +914,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update every</source>
@@ -1097,11 +922,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing feed</source>
@@ -1113,11 +938,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Feed added</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -1129,15 +954,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1148,15 +973,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -1168,99 +993,99 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1289,25 +1114,13 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Settings</source>
         <translation>&amp;Impostazioni</translation>
     </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation>&amp;Tab corrente</translation>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation>&amp;Aggiungi tab</translation>
-    </message>
     <message>
         <source>&amp;Messages</source>
         <translation>&amp;Messaggi</translation>
     </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation>&amp;Web browser</translation>
-    </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Quit the application.</source>
@@ -1321,14 +1134,6 @@ or this functionality is not implemented yet.</source>
         <source>Switch fullscreen mode.</source>
         <translation>Passa alla modalità schermo intero.</translation>
     </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation>Aggiungi nuovo web browser tab.</translation>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation>Chiudi tab web browser corrente.</translation>
-    </message>
     <message>
         <source>No actions available</source>
         <translation>Nessuna azione disponibile</translation>
@@ -1351,7 +1156,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;About application</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays extra info about this application.</source>
@@ -1361,65 +1166,37 @@ or this functionality is not implemented yet.</source>
         <source>&amp;Delete selected messages</source>
         <translation>&amp;Elimina i messaggi selezionati</translation>
     </message>
-    <message>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
-    </message>
     <message>
         <source>Hides or displays the main menu.</source>
         <translation>Nascondi o visualizza il menu principale.</translation>
     </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation>&amp;Chiudi tab corrente</translation>
-    </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;unread</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open selected source articles in &amp;external browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open selected messages in &amp;internal browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;next message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;previous message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Check for &amp;updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation>Abilita &amp;JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation>Abilita &amp;plugin esterni</translation>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation>Auto-carica &amp;immagini</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show/hide</source>
@@ -1427,11 +1204,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Fullscreen</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Feed list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Main menu</source>
@@ -1439,7 +1216,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open external browser</source>
@@ -1447,7 +1224,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Toolbars</source>
@@ -1459,167 +1236,163 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restart</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update &amp;all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -1627,31 +1400,31 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add new category</source>
@@ -1663,66 +1436,66 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1832,7 +1605,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Tray area &amp;&amp; notifications</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Tabs</source>
@@ -1844,19 +1617,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Middle mouse button single-click</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation>Abilità gesture con il mouse</translation>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>no icon theme</source>
@@ -1901,7 +1666,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Some critical settings are not set. You must fix these settings in order confirm new settings.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Messages</source>
@@ -1917,7 +1682,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select web browser executable</source>
@@ -1973,7 +1738,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Use in-memory database as the working database</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Usage of in-memory working database has several advantages and pitfalls. Make sure that you are familiar with these before you turn this feature on. Advantages:
@@ -1987,15 +1752,11 @@ Disadvantages:
 &lt;li&gt;application startup and shutdown can take little longer (max. 2 seconds).&lt;/li&gt;
 &lt;/ul&gt;
 Authors of this application are NOT responsible for lost data.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>in-memory database switched</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation>Web browser interno</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External web browser</source>
@@ -2003,7 +1764,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>WARNING: Note that switching to another data storage type will NOT copy existing your data from currently active data storage to newly selected one.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Database driver</source>
@@ -2015,27 +1776,23 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Test setup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Right mouse button double-click</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update all feeds every</source>
         <translation>Auto-aggiorna tutti i feed ogni</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation>minuti</translation>
-    </message>
     <message>
         <source>Feed connection timeout</source>
         <translation>Timeout connessione feed</translation>
     </message>
     <message>
         <source>Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source> ms</source>
@@ -2063,7 +1820,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>data storage backend changed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Hostname is empty.</source>
@@ -2099,7 +1856,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>No connection test triggered so far.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that these settings are applied only on newly established connections.</source>
@@ -2139,31 +1896,19 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Keep message selection in the middle of the message list viewport</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>You did not executed any connection test yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Launch %1 on operating system startup</source>
         <translation>Lancia %1 all&apos;avvio del sistema operativo</translation>
     </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation>Abilita JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation>Abilita plugin esterni basati su NPAPI</translation>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation>carica automaticamente immagini</translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -2175,7 +1920,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Enter format for count of messages displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) messages.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>custom external browser is not set correctly</source>
@@ -2201,7 +1946,7 @@ Authors of this application are NOT responsible for lost data.</source>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to restart now?</source>
@@ -2209,203 +1954,179 @@ You have to restart manually.</source>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executables (*)</source>
         <extracomment>File filter for external browser selection dialog.
 ----------
 File filter for external e-mail selection dialog.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Show password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Web browser &amp; e-mail &amp; proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Save all downloaded files to</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select e-mail executable</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Notification position</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Standard font</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Background color</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormStandardCategoryDetails</name>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your category.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
@@ -2437,7 +2158,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category was not added due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot edit category</source>
@@ -2445,7 +2166,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category was not edited due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Category name is ok.</source>
@@ -2461,7 +2182,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select icon file for the category</source>
@@ -2482,7 +2203,7 @@ File filter for external e-mail selection dialog.</extracomment>
     <message>
         <source>Look in:</source>
         <extracomment>Label to describe the folder for icon file selection dialog.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon name:</source>
@@ -2529,11 +2250,11 @@ File filter for external e-mail selection dialog.</extracomment>
     <name>FormStandardFeedDetails</name>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Type</source>
@@ -2545,11 +2266,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Encoding</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select encoding of the standard feed. If you are unsure about the encoding, then select &quot;UTF-8&quot; encoding.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update</source>
@@ -2557,11 +2278,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source> minutes</source>
-        <translation>minuti</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Title</source>
@@ -2589,7 +2306,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username</source>
@@ -2625,11 +2342,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Username is empty.</source>
@@ -2637,7 +2354,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Password is empty.</source>
@@ -2662,7 +2379,7 @@ File filter for external e-mail selection dialog.</extracomment>
     <message>
         <source>Look in:</source>
         <extracomment>Label for field with icon file name textbox for selection dialog.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon name:</source>
@@ -2714,19 +2431,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Icon fetched successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No icon fetched.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed title</source>
@@ -2746,7 +2463,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Set url for your feed.</source>
@@ -2778,15 +2495,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Fetch icon from feed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No metadata fetched so far.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Auto-update every</source>
@@ -2794,146 +2511,146 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No file is selected.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Source file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>OPML 2.0 files (*.opml)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File is selected.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were loaded.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Critical error occurred.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Parsing data...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3012,7 +2729,7 @@ correntemente installato.</translation>
     <message>
         <source>Installation file is not available directly.
 Go to application website to obtain it manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No new update available.</source>
@@ -3024,7 +2741,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Cannot navigate to installation file. Check new installation downloads manually on project website.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Download update</source>
@@ -3032,7 +2749,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Downloading update...</source>
@@ -3052,37 +2769,61 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Error occured</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Go to application website</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
-        <translation>L&apos;indirizzo del sito web va qui</translation>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3169,51 +2910,51 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Permanently deleted</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>List of attachments.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3228,19 +2969,19 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlight unread messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Display all messages</source>
@@ -3248,7 +2989,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3261,14 +3002,6 @@ Go to application website to obtain it manually.</source>
         <source>Context menu for messages</source>
         <translation>Menu contestuale per i messaggi</translation>
     </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation>Messaggio senza URL</translation>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation>Il messaggio &apos;%s&apos; non contiene URL.</translation>
-    </message>
     <message>
         <source>Problem with starting external web browser</source>
         <translation>Problema con l&apos;avvio del web browser esterno</translation>
@@ -3279,11 +3012,15 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished">Modalità giornale</translation>
     </message>
 </context>
 <context>
@@ -3351,27 +3088,49 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>no errors</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3404,22 +3163,25 @@ Go to application website to obtain it manually.</source>
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3427,40 +3189,43 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>RecycleBin</name>
     <message>
         <source>Recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Empty recycle bin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3468,7 +3233,10 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -3483,7 +3251,7 @@ At least API level %1 is required.</source>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3491,23 +3259,23 @@ At least API level %1 is required.</source>
     <message>
         <source>%1 (category)%2%3</source>
         <extracomment>Tooltip for standard feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StandardFeed</name>
     <message>
         <source>Metadata not fetched</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>does not use auto-update</source>
@@ -3522,7 +3290,10 @@ This category does not contain any nested items.</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3531,22 +3302,22 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Fetch metadata</source>
@@ -3554,37 +3325,37 @@ Auto-update status: %5</source>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import was completely successfull.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -3592,30 +3363,26 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation>Adblock</translation>
-    </message>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3626,15 +3393,15 @@ Account ID: %1</source>
     <name>SystemFactory</name>
     <message>
         <source>New version available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3642,7 +3409,7 @@ Account ID: %1</source>
     <message>
         <source>%1
 Unread news: %2</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3666,11 +3433,6 @@ Unread news: %2</source>
         <source>Browse your feeds and messages</source>
         <translation>Sfoglia i tuoi feed e i messaggi</translation>
     </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation>Web browser</translation>
-    </message>
     <message>
         <source>Displays main menu.</source>
         <translation>Visualizza menu principale</translation>
@@ -3680,12 +3442,29 @@ Unread news: %2</source>
         <translation>Menu principale</translation>
     </message>
     <message>
-        <source>Open new web browser tab.</source>
-        <translation type="unfinished"/>
+        <source>Downloads</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
-        <source>Downloads</source>
-        <translation type="unfinished"/>
+        <source> and </source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3716,30 +3495,30 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>TrayIconMenu</name>
     <message>
         <source>Close opened modal dialogs first.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3757,14 +3536,17 @@ Unread news: %2</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3777,230 +3559,19 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation>Pannello di navigazione</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation>Indietro</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation>Avanti</translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation>Ricarica</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Ferma</translation>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation>Zoom</translation>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation>Nessun titolo</translation>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation>Diminuisci zoom.</translation>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation>Reimposta zoom a default.</translation>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation>Aumenta zoom.</translation>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation>Scritto da</translation>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation>Modalità giornale</translation>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation>Torna indietro.</translation>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation>Vai avanti.</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Ricarica pagina web corrente.</translation>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation>Ferma caricamento pagina web.</translation>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation>Ricarica pagina web.</translation>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation>Copia url link</translation>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation>Copia immagine</translation>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation>Copia url immagine</translation>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation>Apri link in un nuovo tab</translation>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation>Segui link</translation>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation>Apri immagine in un nuovo tab</translation>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation>Web browser</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation>Immagine</translation>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation>Hyperlink</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Ricarica pagina web corrente.</translation>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation>Copia seleziona</translation>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation>Apri questo hyperlink in un nuovo tab.</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation>Apri l&apos;hyperlink in questo tab.</translation>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation>Apri questa immagine in questo tab.</translation>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts
index 5b1f5d923..a902272b4 100644
--- a/localization/rssguard-nl_NL.ts
+++ b/localization/rssguard-nl_NL.ts
@@ -1,174 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.1">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation>Voeg subscriptie toe</translation>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation>Een andere subscriptie</translation>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation>Ingevoerde titel is oke.</translation>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation>Ingevoerde titel is leeg.</translation>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation>Ingevoerde url is oke.</translation>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation>Ingevoerde url is leeg.</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>Titel</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adres</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation>Aangepaste regels</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation>Adblock instellingen</translation>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation>Schakel Adblock in</translation>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation>Merk op dat Adblock deze applicatie aanzienlijk kan vertragen als je eenmaal enorme subscripties activeert. Te veel regels zijn niet goed voor de prestaties. Zorg er ook voor dat je de toepassing opnieuw opstart nadat u Adblock heeft uitgeschakeld als u laag geheugen footprint wilt te hebben. Van Adblock is bekend dat het veel systeemgeheugen gebruikt.
-
-Merk ook op dat sommige hulpbronnen worden gecached door de interne web browser. Zo, na het veranderen van een aantal regels of abonnementen zullen ze volledig gelden alleen voor nieuwe applicatie instances. Voor de beste Adblock ervaring moet je RSSguard herstarten.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Opties</translation>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation>Filter regels</translation>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation>Gebruik alleen essentieel onderdelen van EasyList (voor prestaties redenen)</translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Een regel toevoegen</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Een regel verwijderen</translation>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation>Voeg subscriptie toe</translation>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation>Verwijder subscriptie</translation>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation>Update subscriptie</translation>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation>De regels gids</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation>Adblock</translation>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation>Toon Adblock &amp;instellingen</translation>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation>Schakel %1 uit</translation>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation>Schakel het alleen op deze pagina uit</translation>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation>Geblokkeerde pop-upvensters</translation>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation>%1 met (%2)</translation>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation>Geen inhoud geblokkeerd</translation>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation>Bepaalde inhoud geblokkeerd - klik om de regel te bewerken</translation>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation>Adblock - Staat aan en werkt</translation>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation>Adblock - werkt niet</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation>Kan supscriptie niet laden!</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation>Schrijf aub je regels hier</translation>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation>%1 (onlangs bijgewerkt)</translation>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation>%1 (fout: %2)</translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Een regel toevoegen</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Een regel verwijderen</translation>
-    </message>
-</context>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="nl_NL">
 <context>
     <name>Application</name>
     <message>
@@ -274,33 +106,11 @@ Gelezen berichten gewist...</translation>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation>Deze website bevat geen feeds.</translation>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation><numerusform>Klik hier om feeds van deze website toe tevoegen.
-Deze website bevat %n feed.</numerusform><numerusform>Klik hier om feeds van deze website toe tevoegen.
-Deze website bevat %n feeds.</numerusform></translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation>Niet ondersteund</translation>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation>Dit account ondersteunt geen toevoeging van feeds.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -378,7 +188,7 @@ Deze website bevat %n feeds.</numerusform></translation>
         <translation>Download klaar</translation>
     </message>
     <message>
-        <source>File '%1' is downloaded.
+        <source>File &apos;%1&apos; is downloaded.
 Click here to open parent directory.</source>
         <translation>Bestand &apos;%1&apos; is klaar
 Klik hier om map te openen.</translation>
@@ -404,11 +214,17 @@ Klik hier om map te openen.</translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation><numerusform>%n resterende minuut</numerusform><numerusform>%n resterende minuten</numerusform></translation>
+        <translation>
+            <numerusform>%n resterende minuut</numerusform>
+            <numerusform>%n resterende minuten</numerusform>
+        </translation>
     </message>
     <message numerus="yes">
         <source>%n seconds remaining</source>
-        <translation><numerusform>%n resterende seconde</numerusform><numerusform>%n resterende seconden</numerusform></translation>
+        <translation>
+            <numerusform>%n resterende seconde</numerusform>
+            <numerusform>%n resterende seconden</numerusform>
+        </translation>
     </message>
     <message>
         <source>bytes</source>
@@ -428,7 +244,10 @@ Klik hier om map te openen.</translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation><numerusform>Dowloading %n bestand...</numerusform><numerusform>Downloading %n bestanden...</numerusform></translation>
+        <translation>
+            <numerusform>Dowloading %n bestand...</numerusform>
+            <numerusform>Downloading %n bestanden...</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -491,7 +310,10 @@ Klik hier om map te openen.</translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation><numerusform>Auto-update van %n feed.</numerusform><numerusform>Auto-update van %n feeds.</numerusform></translation>
+        <translation>
+            <numerusform>Auto-update van %n feed.</numerusform>
+            <numerusform>Auto-update van %n feeds.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -802,7 +624,10 @@ of deze functie bestaat nog niet.</translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation><numerusform> dag</numerusform><numerusform> dagen</numerusform></translation>
+        <translation>
+            <numerusform> dag</numerusform>
+            <numerusform> dagen</numerusform>
+        </translation>
     </message>
     <message>
         <source>Shrink database file</source>
@@ -1058,10 +883,6 @@ of deze functie bestaat nog niet.</translation>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Selekteer de automatische bijwerk strategie voor deze feed.Standaard automatische bijwerken strategie betekent dat de feed zal worden bijgewerkt in tijd tussenpauzes ingesteld in RSSguard instelling.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> minuten</translation>
-    </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
         <translation>Sommige feeds vereisen verificatie,inclusief GMail feeds, BASIC, NTLM-2 en DIGEST-MD5 verificaties schema&apos;s worden ondersteund.</translation>
@@ -1296,22 +1117,10 @@ of deze functie bestaat nog niet.</translation>
         <source>&amp;Settings</source>
         <translation>&amp;Instellingen</translation>
     </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation>&amp;Huidig tabblad</translation>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation>&amp;Tabblad toevoegen</translation>
-    </message>
     <message>
         <source>&amp;Messages</source>
         <translation>&amp;Berichten</translation>
     </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation>&amp;Webbrowser</translation>
-    </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
         <translation>Wissel het &amp;belang van geselecteerde berichten</translation>
@@ -1328,14 +1137,6 @@ of deze functie bestaat nog niet.</translation>
         <source>Switch fullscreen mode.</source>
         <translation>Schakel beeldvullende modus.</translation>
     </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation>Voeg nieuw webbrowser tabblad toe.</translation>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation>Sluit huidige webbrowser tabblad.</translation>
-    </message>
     <message>
         <source>No actions available</source>
         <translation>Geen acties beschikbaar</translation>
@@ -1368,22 +1169,10 @@ of deze functie bestaat nog niet.</translation>
         <source>&amp;Delete selected messages</source>
         <translation>Verwij&amp;der geselecteerde berichten</translation>
     </message>
-    <message>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
     <message>
         <source>Hides or displays the main menu.</source>
         <translation>Verberg of toon het hoofdmenu.</translation>
     </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation>&amp;Sluit alle tabbladen behalve deze</translation>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation>&amp;Sluit huidig tabblad</translation>
-    </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
         <translation>Markeer ge&amp;selecteerde berichten als &amp;gelezen</translation>
@@ -1400,10 +1189,6 @@ of deze functie bestaat nog niet.</translation>
         <source>Open selected messages in &amp;internal browser</source>
         <translation>Open geselecteerde berichten met &amp;ingebouwde webbrowser</translation>
     </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation>Open geselecteerde bron artikelen met &amp;ingebouwde webbrowser</translation>
-    </message>
     <message>
         <source>Select &amp;next message</source>
         <translation>Selecteer volge&amp;nd bericht</translation>
@@ -1416,18 +1201,6 @@ of deze functie bestaat nog niet.</translation>
         <source>Check for &amp;updates</source>
         <translation>Controleer op &amp;updates</translation>
     </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation>&amp;Javascript aanzetten</translation>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation>Externe &amp;plugins aanzetten</translation>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation>Automatisch afbeeld&amp;ingen laden</translation>
-    </message>
     <message>
         <source>Show/hide</source>
         <translation>Toon/verberg</translation>
@@ -1468,10 +1241,6 @@ of deze functie bestaat nog niet.</translation>
         <source>&amp;Feed/message list headers</source>
         <translation>&amp;Feed/bericht  kopteksten</translation>
     </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation>Sluit alle tabbladen behalve deze.</translation>
-    </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
         <translation>Rapporteer een &amp;bug (Github)...</translation>
@@ -1857,14 +1626,6 @@ of deze functie bestaat nog niet.</translation>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
         <translation>Open nieuwe tabbladen met linker muisknop dubbel-klik op tabblad</translation>
     </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation>Muisbewegingen aanzetten</translation>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation>Wachtrij nieuwe tabbladen (met koppelingen) na de actieve tabblad</translation>
-    </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
@@ -2011,10 +1772,6 @@ Auteurs van Rssguard zijn NIET verantwoordelijk voor verlies van gegevens.</tran
         <source>in-memory database switched</source>
         <translation>in-geheugen database overgeschakeld</translation>
     </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation>Interne webbrowser</translation>
-    </message>
     <message>
         <source>External web browser</source>
         <translation>Externe webbrowser</translation>
@@ -2043,10 +1800,6 @@ Auteurs van Rssguard zijn NIET verantwoordelijk voor verlies van gegevens.</tran
         <source>Auto-update all feeds every</source>
         <translation>Alle feeds automatisch bijwerken elke</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> minuten</translation>
-    </message>
     <message>
         <source>Feed connection timeout</source>
         <translation>Feed verbindings time-out</translation>
@@ -2167,18 +1920,6 @@ Auteurs van Rssguard zijn NIET verantwoordelijk voor verlies van gegevens.</tran
         <source>Launch %1 on operating system startup</source>
         <translation>Laad %1 als systeem opstart</translation>
     </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation>Javascript aanzetten</translation>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation>Externe plugins gebaseerd op NPAPI aanzetten</translation>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation>Automatisch afbeeldingen laden</translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Indien aangevinkt, wordt standaard de systeem  webbrowser gebruikt.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -2286,22 +2027,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Working database</source>
         <translation>Werkende database</translation>
     </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation>Muisbeweging werkt met middelste muisknop. Mogelijke muisbewegingen zijn:
-
-. vorige webpagina (sleep muis links),
-
-.volgende webpagina(sleep muis rechts),
-
-.herlaad huidige webpagina(sleep muis omhoog),
-
-Open nieuw webbrowser pagina(sleep muis omlaag).</translation>
-    </message>
     <message>
         <source>Use custom external web browser</source>
         <translation>Gebruik aangepaste externe webbrowser</translation>
@@ -2358,46 +2083,18 @@ Open nieuw webbrowser pagina(sleep muis omlaag).</translation>
         <source>Working database is ok.</source>
         <translation>Werkende database is ok.</translation>
     </message>
-    <message>
-        <source>Notification position</source>
-        <translation>Melding maken van</translation>
-    </message>
     <message>
         <source>(Tray icon is not available.)</source>
         <translation>(Pictogram in systeemvak is niet beschikbaar.)</translation>
     </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation>Linkerbenedenhoek</translation>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation>Linkerbovenenhoek</translation>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation>Rechterbenedenhoek</translation>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation>Rechterbovenhoek</translation>
-    </message>
     <message>
         <source>Internal message browser fonts</source>
         <translation>Intern bericht browser lettertypen</translation>
     </message>
-    <message>
-        <source>Standard font</source>
-        <translation>Standaard lettertype</translation>
-    </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
         <translation>Merk op dat de snelheid van de gebruikte MySQL server en wachttijd van de gebruikte verbinding ZWAAR invloed heeft op de uiteindelijke prestaties van deze toepassing. Met langzame database connecties leidt dit tot slechte prestaties tijdens het browsen feeds of berichten.</translation>
     </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation>Fancy &amp;&amp; moderne popup meldingen (Dit gebruikt OS natieve meldingen via D-Bus indien beschikbaar.)</translation>
-    </message>
     <message>
         <source>E-mail</source>
         <translation>E-mail</translation>
@@ -2406,25 +2103,37 @@ Open nieuw webbrowser pagina(sleep muis omlaag).</translation>
         <source>Enable notifications</source>
         <translation>Meldingen aanzetten</translation>
     </message>
-    <message>
-        <source>Background color</source>
-        <translation>Achtergrondkleur</translation>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation>Verander</translation>
-    </message>
     <message>
         <source>Open download manager when new download is started</source>
         <translation>Open de download manager wanneer een nieuwe download start</translation>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2589,10 +2298,6 @@ Open nieuw webbrowser pagina(sleep muis omlaag).</translation>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Selekteer de automatische bijwerk strategie voor deze feed.Standaard automatische bijwerken strategie betekent dat de feed zal worden bijgewerkt in tijd tussenpauzes ingesteld in RSSguard instelling.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> minuten</translation>
-    </message>
     <message>
         <source>Title</source>
         <translation>Titel</translation>
@@ -3110,10 +2815,34 @@ Ga naar RRSguard website en download het handmatig.</translation>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
-        <translation>Tik Website adres hier</translation>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3292,14 +3021,6 @@ Ga naar RRSguard website en download het handmatig.</translation>
         <source>Context menu for messages</source>
         <translation>Contextmenu voor berichten</translation>
     </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation>Berischt zonder URL</translation>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation>Bericht &apos;%s&apos; bevat geen geldige URL.</translation>
-    </message>
     <message>
         <source>Problem with starting external web browser</source>
         <translation>Probleem om externe webbrowser te starten</translation>
@@ -3316,6 +3037,10 @@ Ga naar RRSguard website en download het handmatig.</translation>
         <source>External e-mail client could not be started.</source>
         <translation>Externe e-mail client kon niet worden gestart.</translation>
     </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished">Krantweergave</translation>
+    </message>
 </context>
 <context>
     <name>NetworkFactory</name>
@@ -3395,7 +3120,29 @@ Ga naar RRSguard website en download het handmatig.</translation>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3435,11 +3182,14 @@ Ga naar RRSguard website en download het handmatig.</translation>
         <source>
 
 + %n other feeds.</source>
-        <translation><numerusform>
+        <translation>
+            <numerusform>
 
-+ %n andere feed.</numerusform><numerusform>
++ %n andere feed.</numerusform>
+            <numerusform>
 
-+ %n andere feeds.</numerusform></translation>
++ %n andere feeds.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Welcome to %1.
@@ -3488,7 +3238,10 @@ Een API niveau van tenminste %1 is vereist.</translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation><numerusform>%n verwijderde bericht(en).</numerusform><numerusform>%n verwijderde bericht(en).</numerusform></translation>
+        <translation>
+            <numerusform>%n verwijderde bericht(en).</numerusform>
+            <numerusform>%n verwijderde bericht(en).</numerusform>
+        </translation>
     </message>
     <message>
         <source>Recycle bin
@@ -3512,7 +3265,10 @@ Een API niveau van tenminste %1 is vereist.</translation>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation><numerusform>%n ongelezen bericht.</numerusform><numerusform>%n ongelezen berichten.</numerusform></translation>
+        <translation>
+            <numerusform>%n ongelezen bericht.</numerusform>
+            <numerusform>%n ongelezen berichten.</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -3567,7 +3323,10 @@ Deze categorie bevat geen nested items.</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation><numerusform>gebruik specifieke instellingen (%n minuut voor volgende automatische update)</numerusform><numerusform>gebruik specifieke instellingen (%n minuten voor volgende automatische update)</numerusform></translation>
+        <translation>
+            <numerusform>gebruik specifieke instellingen (%n minuut voor volgende automatische update)</numerusform>
+            <numerusform>gebruik specifieke instellingen (%n minuten voor volgende automatische update)</numerusform>
+        </translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3648,25 +3407,21 @@ Account ID: %1</translation>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation>Adblock</translation>
-    </message>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3719,11 +3474,6 @@ Ongelezen nieuws: %2</translation>
         <source>Browse your feeds and messages</source>
         <translation>Blader door feeds en berichten</translation>
     </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation>Webbrowser</translation>
-    </message>
     <message>
         <source>Displays main menu.</source>
         <translation>Toont het hoofdmenu.</translation>
@@ -3732,15 +3482,32 @@ Ongelezen nieuws: %2</translation>
         <source>Main menu</source>
         <translation>Hoofdmenu</translation>
     </message>
-    <message>
-        <source>Open new web browser tab.</source>
-        <translation>Open een nieuw webbrowser tabblad.</translation>
-    </message>
     <message>
         <source>Downloads</source>
         <translation>Downloads</translation>
     </message>
 </context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ToolBarEditor</name>
     <message>
@@ -3810,7 +3577,10 @@ Ongelezen nieuws: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation><numerusform>gebruik specifieke instellingen (%n minuut voor de volgende auto-update)</numerusform><numerusform>gebruik specifieke instellingen (%n minuten voor de volgende auto-update)</numerusform></translation>
+        <translation>
+            <numerusform>gebruik specifieke instellingen (%n minuut voor de volgende auto-update)</numerusform>
+            <numerusform>gebruik specifieke instellingen (%n minuten voor de volgende auto-update)</numerusform>
+        </translation>
     </message>
     <message>
         <source>%1%2
@@ -3853,215 +3623,4 @@ Laatste login: %5</translation>
         <translation>Kan geen feed toevoegen omdat een andere kritieke operatie aan de gang is.</translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation>Navigatie venster</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation>Terug</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation>Vooruit</translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation>Herlaad</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Stop</translation>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation>Zoom</translation>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation>Geen titel</translation>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation>Zoom verlagen.</translation>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation>Reset zoom naar standaard.</translation>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation>Zoom verhogen.</translation>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation>Geschreven door </translation>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation>Krantweergave</translation>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation>Ga terug.</translation>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation>Ga vooruit.</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Vernieuw huidige webpagina.</translation>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation>Stop het laden van pagina.</translation>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation>Herlaad webpagina</translation>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation>URL kopiëren</translation>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation>Kopiëer afbeelding</translation>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation>URL afbeelding kopiëren</translation>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation>Open link in nieuw tabblad</translation>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation>Volg koppeling</translation>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation>Open afbeelding in nieuw tabblad</translation>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation>Webbrowser</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation>Afbeelding</translation>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation>Koppeling</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Vernieuw huidige webpagina.</translation>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation>Selectie kopiëren</translation>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation>Kopiëer huidige selectie naar het klembord.</translation>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation>Kopiëer link url naar klembord.</translation>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation>Kopiëer afbeelding naar klembord.</translation>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation>Kopiëer afbeeldings url naar klembord.</translation>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation>Open deze link in nieuw tabblad.</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation>Open link in dit tabblad.</translation>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation>Open deze afbeelding in dit tabblad.</translation>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation>Open koppeling in externe browser</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation>Open de hyperlink in externe browser.</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation>Print</translation>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation>Print huidige webpagina.</translation>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation>HTML web paginas (*.html)</translation>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation>Kies bestemming bestand voor de web pagina</translation>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation>Kan webpagina niet opslaan</translation>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation>Kan webpagina niet opslaan omdat bestand niet beschrijfbaar is.</translation>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation>Doel opslaan als...</translation>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation>Download inhoud van de koppeling.</translation>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation>Pagina opslaan als...</translation>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation>Afbeelding opslaan op schijf.</translation>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation>Afbeelding opslaan als...</translation>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation>Bron_pagina</translation>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation>Zoek &quot;%1&quot; met google...</translation>
-    </message>
-</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/localization/rssguard-pt_BR.ts b/localization/rssguard-pt_BR.ts
index aa0f5915c..db35d7796 100644
--- a/localization/rssguard-pt_BR.ts
+++ b/localization/rssguard-pt_BR.ts
@@ -1,174 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation>Adicionar assinatura</translation>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation>Outra assinatura</translation>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation>O título escolhido está correto.</translation>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation>O título escolhido está vazio.</translation>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation>A URL fornecida está correta.</translation>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation>A URL fornecida está vazia.</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>Título</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Endereço</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation>Regras personalizadas</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation>Configurações do Adblock</translation>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation>Ativar o Adblock</translation>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation>Note que o Adblock pode deixar o aplicativo um pouco lento caso você tenha muitas inscrições. Muitas regras não são boas para o desempenho. Também, certifique-se de reiniciar o aplicativo após desativar o Adblock para reduzir o uso de memória. O Adblock é conhecido por usar muita memória do sistema.
-
-Note também que alguns recursos são armazenados pelo navegador interno. Sendo assim, após alterar algumas regras ou inscrições, elas serão totalmente aplicadas somente para novas instâncias do aplicativo. Certifique-se de reiniciar o RSS Guard para uma melhor experiência com o Adblock.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Opções</translation>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation>Regras do filtro</translation>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation>Usar somente parte essencial do Easylist (para melhor desempenho)</translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Adicionar regra</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Remover regra</translation>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation>Adicionar inscrição</translation>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation>Remover inscrição</translation>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation>Atualizar inscrições</translation>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation>Guia de criação de regras</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation>Adblock</translation>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation>Exibir configuraçõe&amp;s do Adblock</translation>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation>Desativar em %1</translation>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation>Desativar somente nesta página</translation>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation>Janelas popup bloqueadas</translation>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation>%1 com (%2)</translation>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation>Nenhum conteúdo bloqueado</translation>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation>Algum conteúdo bloqueado - clique para editar regra</translation>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation>Adblock - ativo e em execução</translation>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation>Adblock - não está em execução</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation>Não foi possível carregar a inscrição!</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation>Por favor, digite sua regra aqui</translation>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation>%1 (atualizado recentemente)</translation>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation>%1 (erro: %2)</translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Adicionar regra</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Remover regra</translation>
-    </message>
-</context>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="pt_BR">
 <context>
     <name>Application</name>
     <message>
@@ -273,33 +105,11 @@ Note também que alguns recursos são armazenados pelo navegador interno. Sendo
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation>Este site não contém nenhum feed.</translation>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation><numerusform>Clique para adicionar deste site.
-Este site contém %n feed.</numerusform><numerusform>Clique para adicionar deste site.
-Este site contêm %n feeds.</numerusform></translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation>Não suportado</translation>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation>A conta fornecida não suporta adicionar feeds.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -377,7 +187,7 @@ Este site contêm %n feeds.</numerusform></translation>
         <translation>Download concluído</translation>
     </message>
     <message>
-        <source>File '%1' is downloaded.
+        <source>File &apos;%1&apos; is downloaded.
 Click here to open parent directory.</source>
         <translation>Arquivo &apos;%1&apos; foi baixado.
 Clique para abrir a pasta de destino.</translation>
@@ -403,11 +213,17 @@ Clique para abrir a pasta de destino.</translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation><numerusform>%n minuto restante</numerusform><numerusform>%n minutos restantes</numerusform></translation>
+        <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>
+        <translation>
+            <numerusform>%n segundo restante</numerusform>
+            <numerusform>%n segundos restantes</numerusform>
+        </translation>
     </message>
     <message>
         <source>bytes</source>
@@ -427,7 +243,10 @@ Clique para abrir a pasta de destino.</translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation><numerusform>Baixando %n arquivo...</numerusform><numerusform>Baixando %n arquivos...</numerusform></translation>
+        <translation>
+            <numerusform>Baixando %n arquivo...</numerusform>
+            <numerusform>Baixando %n arquivos...</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -490,7 +309,10 @@ Clique para abrir a pasta de destino.</translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation><numerusform>%n feed será atualizado automaticamente.</numerusform><numerusform>%n feeds serão atualizados automaticamente.</numerusform></translation>
+        <translation>
+            <numerusform>%n feed será atualizado automaticamente.</numerusform>
+            <numerusform>%n feeds serão atualizados automaticamente.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -801,7 +623,10 @@ ou esta função ainda não foi implementada.</translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
+        <translation>
+            <numerusform>%n dia</numerusform>
+            <numerusform>%n dias</numerusform>
+        </translation>
     </message>
     <message>
         <source>Shrink database file</source>
@@ -1057,10 +882,6 @@ ou esta função ainda não foi implementada.</translation>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Selecione a estratégia de atualização automática para este feed. A estratégia padrão significa que o feed será atualizado em intervalos de tempo definidos nas configurações do aplicativo.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> minutos</translation>
-    </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
         <translation>Alguns feeds necessitam de autenticação, incluindo feeds do GMail. Esquemas de autenticação BASIC, NTLM-2 e DIGEST-MD5 são suportados.</translation>
@@ -1295,22 +1116,10 @@ ou esta função ainda não foi implementada.</translation>
         <source>&amp;Settings</source>
         <translation>&amp;Configurações</translation>
     </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation>A&amp;ba atual</translation>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation>&amp;Adicionar aba</translation>
-    </message>
     <message>
         <source>&amp;Messages</source>
         <translation>&amp;Mensagens</translation>
     </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation>Navegador da &amp;Web</translation>
-    </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
         <translation>Alterar &amp;importância das mensagens selecionadas</translation>
@@ -1327,14 +1136,6 @@ ou esta função ainda não foi implementada.</translation>
         <source>Switch fullscreen mode.</source>
         <translation>Altera para o modo tela cheia.</translation>
     </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation>Adiciona uma nova aba ao navegador.</translation>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation>Fecha a aba atual do navegador.</translation>
-    </message>
     <message>
         <source>No actions available</source>
         <translation>Nenhuma ação disponível</translation>
@@ -1367,22 +1168,10 @@ ou esta função ainda não foi implementada.</translation>
         <source>&amp;Delete selected messages</source>
         <translation>&amp;Excluir mensagens selecionadas</translation>
     </message>
-    <message>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
     <message>
         <source>Hides or displays the main menu.</source>
         <translation>Oculta ou exibe o menu principal.</translation>
     </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation>&amp;Fechar todas as abas, exceto a atual</translation>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation>&amp;Fechar aba atual</translation>
-    </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
         <translation>Marcar mensagens selecionadas como &amp;lidas</translation>
@@ -1399,10 +1188,6 @@ ou esta função ainda não foi implementada.</translation>
         <source>Open selected messages in &amp;internal browser</source>
         <translation>Abrir mensagens selecionadas no navegador &amp;interno</translation>
     </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation>Abrir artigos fonte selecionados no navegador &amp;interno</translation>
-    </message>
     <message>
         <source>Select &amp;next message</source>
         <translation>Selecionar &amp;próxima mensagem</translation>
@@ -1415,18 +1200,6 @@ ou esta função ainda não foi implementada.</translation>
         <source>Check for &amp;updates</source>
         <translation>Verificar por at&amp;ualizações</translation>
     </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation>Ativar &amp;JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation>Ativar &amp;plugins externos</translation>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation>Carregar &amp;imagens automaticamente</translation>
-    </message>
     <message>
         <source>Show/hide</source>
         <translation>Exibir/ocultar</translation>
@@ -1467,10 +1240,6 @@ ou esta função ainda não foi implementada.</translation>
         <source>&amp;Feed/message list headers</source>
         <translation>Cabeçalhos da lista de &amp;feeds/mensagens</translation>
     </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation>Fecha todas as abas, exceto a atual.</translation>
-    </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
         <translation>Relatar um &amp;bug (GitHub)...</translation>
@@ -1856,14 +1625,6 @@ ou esta função ainda não foi implementada.</translation>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
         <translation>Abrir novas abas como clique duplo do botão esquerdo do mouse na barra de abas</translation>
     </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation>Ativar gestos do mouse</translation>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation>Adicionar novas abas (com links) após a aba ativa</translation>
-    </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
@@ -2009,10 +1770,6 @@ Os autores deste aplicativo NÃO são responsáveis pela perda de dados.</transl
         <source>in-memory database switched</source>
         <translation>banco de dados na memória alterado</translation>
     </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation>Navegador da web interno</translation>
-    </message>
     <message>
         <source>External web browser</source>
         <translation>Navegador da web externo</translation>
@@ -2041,10 +1798,6 @@ Os autores deste aplicativo NÃO são responsáveis pela perda de dados.</transl
         <source>Auto-update all feeds every</source>
         <translation>Atualizar todos os feeds a cada</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> minutos</translation>
-    </message>
     <message>
         <source>Feed connection timeout</source>
         <translation>Tempo limite de conexão</translation>
@@ -2165,18 +1918,6 @@ Os autores deste aplicativo NÃO são responsáveis pela perda de dados.</transl
         <source>Launch %1 on operating system startup</source>
         <translation>Executar o %1 na inicialização do sistema operacional</translation>
     </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation>Ativar JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation>Ativar plugins externos baseados em NPAPI</translation>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation>Carregar imagens automaticamente</translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Se desmarcado, então o navegador padrão do sistema será usado.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -2284,18 +2025,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Working database</source>
         <translation>Banco de dados ativo</translation>
     </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation>Os gestos do mouse funcionam o o botão do meio. Os gestos possíveis são:
- • página anterior (arraste o mouse para a esquerda),
- • próxima página (arraste o mouse para a direita),
- • recarregar página atual (arraste o mouse para cima),
- • abrir nova aba no navegador (arraste o mouse para baixo).</translation>
-    </message>
     <message>
         <source>Use custom external web browser</source>
         <translation>Usar navegador externo personalizado</translation>
@@ -2352,46 +2081,18 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Working database is ok.</source>
         <translation>O banco de dados ativo está correto.</translation>
     </message>
-    <message>
-        <source>Notification position</source>
-        <translation>Posição da notificação</translation>
-    </message>
     <message>
         <source>(Tray icon is not available.)</source>
         <translation>(Ícone na área de notificação não está disponível.)</translation>
     </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation>Canto inferior esquerdo</translation>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation>Canto superior esquerdo</translation>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation>Canto inferior direito</translation>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation>Canto superior direito</translation>
-    </message>
     <message>
         <source>Internal message browser fonts</source>
         <translation>Fontes do navegador de mensagens interno</translation>
     </message>
-    <message>
-        <source>Standard font</source>
-        <translation>Fonte padrão</translation>
-    </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
         <translation>Note que a velocidade do servidor MySQL usado e a latência da conexão influenciam FORTEMENTE no desempenho final deste aplicativo. Usar conexões lentas ao banco de dados ocasionam um desempenho ruim ao navegar por feeds ou mensagens.</translation>
     </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation>Notificações popup modernas (Isto usa as notificações nativas do sistema via D-Bus, se disponível.)</translation>
-    </message>
     <message>
         <source>E-mail</source>
         <translation>E-mail</translation>
@@ -2400,25 +2101,37 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Enable notifications</source>
         <translation>Ativar notificações</translation>
     </message>
-    <message>
-        <source>Background color</source>
-        <translation>Cor de fundo</translation>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation>Alterar</translation>
-    </message>
     <message>
         <source>Open download manager when new download is started</source>
         <translation>Abrir gerenciador de download ao iniciar um novo download</translation>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2583,10 +2296,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Selecione a estratégia de atualização automática para este feed. A estratégia padrão significa que o feed será atualizado em intervalos de tempo definidos nas configurações do aplicativo.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation> minutos</translation>
-    </message>
     <message>
         <source>Title</source>
         <translation>Título</translation>
@@ -3104,10 +2813,34 @@ Vá até o site do aplicativo para obter manualmente.</translation>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
-        <translation>O endereço do site vai aqui</translation>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3286,14 +3019,6 @@ Vá até o site do aplicativo para obter manualmente.</translation>
         <source>Context menu for messages</source>
         <translation>Menu de contexto para mensagens</translation>
     </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation>Mensagem sem URL</translation>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation>A mensagem &apos;%s&apos; não possui URL.</translation>
-    </message>
     <message>
         <source>Problem with starting external web browser</source>
         <translation>Problema ao iniciar o navegador externo</translation>
@@ -3310,6 +3035,10 @@ Vá até o site do aplicativo para obter manualmente.</translation>
         <source>External e-mail client could not be started.</source>
         <translation>O cliente de e-mail externo não pôde ser iniciado.</translation>
     </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished">Visualização da publicação</translation>
+    </message>
 </context>
 <context>
     <name>NetworkFactory</name>
@@ -3389,7 +3118,29 @@ Vá até o site do aplicativo para obter manualmente.</translation>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3429,11 +3180,14 @@ Vá até o site do aplicativo para obter manualmente.</translation>
         <source>
 
 + %n other feeds.</source>
-        <translation><numerusform>
+        <translation>
+            <numerusform>
 
-+ %n outro feed.</numerusform><numerusform>
++ %n outro feed.</numerusform>
+            <numerusform>
 
-+ %n outros feeds.</numerusform></translation>
++ %n outros feeds.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Welcome to %1.
@@ -3482,7 +3236,10 @@ Pelo menos o API nível %1 é necessário.</translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation><numerusform>%n mensagem excluída.</numerusform><numerusform>%n mensagens excluídas.</numerusform></translation>
+        <translation>
+            <numerusform>%n mensagem excluída.</numerusform>
+            <numerusform>%n mensagens excluídas.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Recycle bin
@@ -3506,7 +3263,10 @@ Pelo menos o API nível %1 é necessário.</translation>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation><numerusform>%n mensagem não lida.</numerusform><numerusform>%n mensagem(ns) não lidas.</numerusform></translation>
+        <translation>
+            <numerusform>%n mensagem não lida.</numerusform>
+            <numerusform>%n mensagem(ns) não lidas.</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -3561,7 +3321,10 @@ Esta categoria nenhum possui itens aninhados.</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation><numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform><numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform></translation>
+        <translation>
+            <numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform>
+            <numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform>
+        </translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3642,25 +3405,21 @@ ID da Conta: %1</translation>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation>Adblock</translation>
-    </message>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3712,11 +3471,6 @@ Notícias não lidas: %2</translation>
         <source>Browse your feeds and messages</source>
         <translation>Navegue pelo seus feeds e mensagens</translation>
     </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation>Navegador da web</translation>
-    </message>
     <message>
         <source>Displays main menu.</source>
         <translation>Exibe o menu principal.</translation>
@@ -3725,15 +3479,32 @@ Notícias não lidas: %2</translation>
         <source>Main menu</source>
         <translation>Menu principal</translation>
     </message>
-    <message>
-        <source>Open new web browser tab.</source>
-        <translation>Abre uma nova aba no navegador.</translation>
-    </message>
     <message>
         <source>Downloads</source>
         <translation>Downloads</translation>
     </message>
 </context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ToolBarEditor</name>
     <message>
@@ -3803,7 +3574,10 @@ Notícias não lidas: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation><numerusform>usa configurações específicas (%n minuto para a próxima atualização automática)</numerusform><numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform></translation>
+        <translation>
+            <numerusform>usa configurações específicas (%n minuto para a próxima atualização automática)</numerusform>
+            <numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform>
+        </translation>
     </message>
     <message>
         <source>%1%2
@@ -3846,215 +3620,4 @@ Servidor: %2
         <translation>Não é possível adicionar feeds porque outra operação crítica está em curso.</translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation>Painel de navegação</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation>Voltar</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation>Avançar</translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation>Recarregar</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Parar</translation>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation>Zoom  </translation>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation>Sem título</translation>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation>Diminui o zoom.</translation>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation>Restaura o zoom para o padrão.</translation>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation>Aumenta o zoom.</translation>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation>Escrito por </translation>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation>Visualização da publicação</translation>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation>Volta.</translation>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation>Avança.</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Recarrega a página atual.</translation>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation>Interrompe o carregamento da página.</translation>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation>Recarregar página</translation>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation>Copiar URL do link</translation>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation>Copiar imagem</translation>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation>Copiar URL da imagem</translation>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation>Abrir link em uma nova aba</translation>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation>Seguir link</translation>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation>Abrir imagem em um nova aba</translation>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation>Navegador da web</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation>Imagem</translation>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation>Hyperlink</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Recarrega a página atual.</translation>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation>Copiar seleção</translation>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation>Copia a seleção atual para a área de transferência.</translation>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation>Copia a URL do link para a área de transferência.</translation>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation>Copia a imagem para a área de transferência.</translation>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation>Copia a URL da imagem para a área de transferência.</translation>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation>Abre este hyperlink em uma nova aba.</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation>Abre o hyperlink em uma nova aba.</translation>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation>Abre esta imagem em uma nova aba.</translation>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation>Abrir link no navegador externo</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation>Abre o hyperlink no navegador externo.</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation>Imprimir</translation>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation>Imprime a página atual.</translation>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation>Páginas HTML (*.html)</translation>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation>Selecione o arquivo de destino para a página da web</translation>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation>Não foi possível salvar a página da web</translation>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation>A página não pôde ser salva pois o arquivo de destino não possui permissão de escrita.</translation>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation>Salvar destino como...</translation>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation>Baixa o conteúdo do hyperlink.</translation>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation>Salvar página como...</translation>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation>Salva a imagem em disco.</translation>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation>Salvar imagem como...</translation>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation>página_de_origem</translation>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation>Pesquisar &quot;%1&quot; no Google...</translation>
-    </message>
-</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts
index e3f49327a..49b8a8b43 100644
--- a/localization/rssguard-sv_SE.ts
+++ b/localization/rssguard-sv_SE.ts
@@ -1,174 +1,6 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv_SE" version="2.1">
-<context>
-    <name>AdBlockAddSubscriptionDialog</name>
-    <message>
-        <source>Add subscription</source>
-        <translation>Lägg till prenumeration</translation>
-    </message>
-    <message>
-        <source>Another subscription</source>
-        <translation>En prenumeration till</translation>
-    </message>
-    <message>
-        <source>Entered title is okay.</source>
-        <translation>Angivet namn är okay.</translation>
-    </message>
-    <message>
-        <source>Entered title is empty.</source>
-        <translation>Namn saknas.</translation>
-    </message>
-    <message>
-        <source>Entered url is okay.</source>
-        <translation>Angiven URL är okay.</translation>
-    </message>
-    <message>
-        <source>Entered url is empty.</source>
-        <translation>URL saknas.</translation>
-    </message>
-    <message>
-        <source>Title</source>
-        <translation>Titel</translation>
-    </message>
-    <message>
-        <source>Address</source>
-        <translation>Adress</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockCustomList</name>
-    <message>
-        <source>Custom rules</source>
-        <translation>Anpassade regler</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockDialog</name>
-    <message>
-        <source>Adblock settings</source>
-        <translation>Adblock-inställningar</translation>
-    </message>
-    <message>
-        <source>Enable Adblock</source>
-        <translation>Aktivera Adblock</translation>
-    </message>
-    <message>
-        <source>Note that Adblock may significantly slow this application down once you activate huge subscriptions. Too many rules is not good for performance. Also, make sure you restart application after you disable Adblock if you wish to have low memory footprint. Adblock is known to use much system memory.
-
-Also note that some resources are cached by internal web browser. Thus, after changing some rules or subscriptions they will fully apply only for new application instances. Make sure you restart RSS Guard for best Adblock experience.</source>
-        <translation>Notera att Adblock kan göra programmet märkbart långsammare vid aktivering av stora prenumerationer. För många regler är inte bra för prestanda. Tillse också att programmet startas om efter att Adblock inaktiveras, om du vill minska minnesanvändningen. Adblock är känt för att använda mycket systemminne.
-
-Notera också att vissa resurser cachelagras av den interna webbläsaren. Om du ändrar några filterregler eller prenumerationer, verkställs ändringarna till fullo, först i nya programinstanser. Starta därför om RSS Guard, för bästa Adblock-upplevelse.</translation>
-    </message>
-    <message>
-        <source>Options</source>
-        <translation>Alternativ</translation>
-    </message>
-    <message>
-        <source>Filter rules</source>
-        <translation>Filterregler</translation>
-    </message>
-    <message>
-        <source>Use only essential part of EasyList (for performance reasons)</source>
-        <translation>Använd endast viktiga delar av EasyList (av prestandaskäl)</translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Lägg till regel</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Ta bort regel</translation>
-    </message>
-    <message>
-        <source>Add subscription</source>
-        <translation>Lägg till prenumeration</translation>
-    </message>
-    <message>
-        <source>Remove subscription</source>
-        <translation>Ta bort prenumeration</translation>
-    </message>
-    <message>
-        <source>Update subscriptions</source>
-        <translation>Uppdatera prenumerationer</translation>
-    </message>
-    <message>
-        <source>Rules writing guide</source>
-        <translation>Regelguide</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockIcon</name>
-    <message>
-        <source>Adblock</source>
-        <translation>Adblock</translation>
-    </message>
-    <message>
-        <source>Show Adblock &amp;settings</source>
-        <translation>Visa Adblock-&amp;inställningar</translation>
-    </message>
-    <message>
-        <source>Disable on %1</source>
-        <translation>Inaktivera för %1</translation>
-    </message>
-    <message>
-        <source>Disable only on this page</source>
-        <translation>Inaktivera endast på denna sida</translation>
-    </message>
-    <message>
-        <source>Blocked popup windows</source>
-        <translation>Blockerade popup-fönster</translation>
-    </message>
-    <message>
-        <source>%1 with (%2)</source>
-        <translation>%1 med (%2)</translation>
-    </message>
-    <message>
-        <source>No content blocked</source>
-        <translation>Inget innehåll blockerat</translation>
-    </message>
-    <message>
-        <source>Blocked some content - click to edit rule</source>
-        <translation>Blockerade visst innehåll - Klicka för att redigera regel</translation>
-    </message>
-    <message>
-        <source>Adblock - up and running</source>
-        <translation>Adblock - Aktiverat</translation>
-    </message>
-    <message>
-        <source>Adblock - not running</source>
-        <translation>Adblock - Inaktiverat</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockSubscription</name>
-    <message>
-        <source>Cannot load subscription!</source>
-        <translation>Kan inte läsa in prenumeration!</translation>
-    </message>
-</context>
-<context>
-    <name>AdBlockTreeWidget</name>
-    <message>
-        <source>Please write your rule here</source>
-        <translation>Ange din regel här</translation>
-    </message>
-    <message>
-        <source>%1 (recently updated)</source>
-        <translation>%1 (nyligen uppdaterad)</translation>
-    </message>
-    <message>
-        <source>%1 (error: %2)</source>
-        <translation>%1 (Fel: %2)</translation>
-    </message>
-    <message>
-        <source>Add rule</source>
-        <translation>Lägg till regel</translation>
-    </message>
-    <message>
-        <source>Remove rule</source>
-        <translation>Ta bort regel</translation>
-    </message>
-</context>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.1" language="sv_SE">
 <context>
     <name>Application</name>
     <message>
@@ -273,33 +105,11 @@ Notera också att vissa resurser cachelagras av den interna webbläsaren. Om du
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>DiscoverFeedsButton</name>
-    <message>
-        <source>This website does not contain any feeds.</source>
-        <translation>Webbsidan innehåller inga flöden.</translation>
-    </message>
-    <message numerus="yes">
-        <source>Click me to add feeds from this website.
-This website contains %n feed(s).</source>
-        <translation><numerusform>Klicka för att lägga till flöden från webbsidan.
-Denna webbsida innehåller %n flöde.</numerusform><numerusform>Klicka för att lägga till flöden från webbsidan.
-Denna webbsida innehåller %n flöden.</numerusform></translation>
-    </message>
-    <message>
-        <source>Not supported</source>
-        <translation>Stöds ej</translation>
-    </message>
-    <message>
-        <source>Given account does not support adding feeds.</source>
-        <translation>Angivet kontot stöder inte tillägg av nya flöden.</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -377,7 +187,7 @@ Denna webbsida innehåller %n flöden.</numerusform></translation>
         <translation>Nedladdning slutförd</translation>
     </message>
     <message>
-        <source>File '%1' is downloaded.
+        <source>File &apos;%1&apos; is downloaded.
 Click here to open parent directory.</source>
         <translation>Filen &apos;%1&apos; är nedlladdad.
 Klicka här för att öppna målmappen.</translation>
@@ -403,11 +213,17 @@ Klicka här för att öppna målmappen.</translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation><numerusform>%n minut kvar</numerusform><numerusform>%n minuter kvar</numerusform></translation>
+        <translation>
+            <numerusform>%n minut kvar</numerusform>
+            <numerusform>%n minuter kvar</numerusform>
+        </translation>
     </message>
     <message numerus="yes">
         <source>%n seconds remaining</source>
-        <translation><numerusform>%n sekund kvar</numerusform><numerusform>%n sekunder kvar</numerusform></translation>
+        <translation>
+            <numerusform>%n sekund kvar</numerusform>
+            <numerusform>%n sekunder kvar</numerusform>
+        </translation>
     </message>
     <message>
         <source>bytes</source>
@@ -427,7 +243,10 @@ Klicka här för att öppna målmappen.</translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation><numerusform>Laddar ner %n fil...</numerusform><numerusform>Laddar ner %n filer...</numerusform></translation>
+        <translation>
+            <numerusform>Laddar ner %n fil...</numerusform>
+            <numerusform>Laddar ner %n filer...</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -490,7 +309,10 @@ Klicka här för att öppna målmappen.</translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation><numerusform>Jag uppdaterar %n flöde automatiskt</numerusform><numerusform>Jag uppdaterar %n flöden automatiskt</numerusform></translation>
+        <translation>
+            <numerusform>Jag uppdaterar %n flöde automatiskt</numerusform>
+            <numerusform>Jag uppdaterar %n flöden automatiskt</numerusform>
+        </translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -801,7 +623,10 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation><numerusform>dag</numerusform><numerusform>dagar</numerusform></translation>
+        <translation>
+            <numerusform>dag</numerusform>
+            <numerusform>dagar</numerusform>
+        </translation>
     </message>
     <message>
         <source>Shrink database file</source>
@@ -1057,10 +882,6 @@ att funktionen inte är implementerad än.</translation>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Välj uppdateringsstrategi för flödet. Standard autouppdatering, innebär att flödet kommer att uppdateras med tidsintervall angivna i programinställningarna.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation>minuter </translation>
-    </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
         <translation>Vissa flöden kräver autentisering. Inklusive Gmail-flöden. BASIC, NTLM-2 och DIGEST-MD5 autentiseringsscheman stöds.</translation>
@@ -1295,22 +1116,10 @@ att funktionen inte är implementerad än.</translation>
         <source>&amp;Settings</source>
         <translation>&amp;Inställningar</translation>
     </message>
-    <message>
-        <source>&amp;Current tab</source>
-        <translation>Aktuell &amp;flik</translation>
-    </message>
-    <message>
-        <source>&amp;Add tab</source>
-        <translation>&amp;Lägg till flik</translation>
-    </message>
     <message>
         <source>&amp;Messages</source>
         <translation>&amp;Meddelanden</translation>
     </message>
-    <message>
-        <source>&amp;Web browser</source>
-        <translation>&amp;Webbläsare</translation>
-    </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
         <translation>Växla &amp;prioritet för markerade meddelanden</translation>
@@ -1327,14 +1136,6 @@ att funktionen inte är implementerad än.</translation>
         <source>Switch fullscreen mode.</source>
         <translation>Växla fönster-/fullskärmsläge.</translation>
     </message>
-    <message>
-        <source>Add new web browser tab.</source>
-        <translation>Lägg till ny webbläsarflik.</translation>
-    </message>
-    <message>
-        <source>Close current web browser tab.</source>
-        <translation>Stäng aktuell webbläsarflik.</translation>
-    </message>
     <message>
         <source>No actions available</source>
         <translation>Inga åtgärder tillgängliga</translation>
@@ -1367,22 +1168,10 @@ att funktionen inte är implementerad än.</translation>
         <source>&amp;Delete selected messages</source>
         <translation>&amp;Ta bort markerade meddelanden</translation>
     </message>
-    <message>
-        <source>Settings</source>
-        <translation>Inställningar</translation>
-    </message>
     <message>
         <source>Hides or displays the main menu.</source>
         <translation>Dölj/Visa huvudmenyn.</translation>
     </message>
-    <message>
-        <source>&amp;Close all tabs except current one</source>
-        <translation>&amp;Stäng alla flikar utom den aktuella</translation>
-    </message>
-    <message>
-        <source>&amp;Close current tab</source>
-        <translation>&amp;Stäng aktuell flik</translation>
-    </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
         <translation>Märk markerade &amp;meddelanden som &amp;lästa</translation>
@@ -1399,10 +1188,6 @@ att funktionen inte är implementerad än.</translation>
         <source>Open selected messages in &amp;internal browser</source>
         <translation>Öppna markerade meddelanden i &amp;intern webbläsare</translation>
     </message>
-    <message>
-        <source>Open selected source articles in &amp;internal browser</source>
-        <translation>Öppna markerade källartiklar i &amp;intern webbläsare</translation>
-    </message>
     <message>
         <source>Select &amp;next message</source>
         <translation>Gå till &amp;nästa meddelande</translation>
@@ -1415,18 +1200,6 @@ att funktionen inte är implementerad än.</translation>
         <source>Check for &amp;updates</source>
         <translation>Sök efter &amp;uppdateringar</translation>
     </message>
-    <message>
-        <source>Enable &amp;JavaScript</source>
-        <translation>Aktivera &amp;JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external &amp;plugins</source>
-        <translation>Aktivera externa &amp;tillägg</translation>
-    </message>
-    <message>
-        <source>Auto-load &amp;images</source>
-        <translation>Läs in &amp;bilder automatiskt</translation>
-    </message>
     <message>
         <source>Show/hide</source>
         <translation>Dölj/Visa</translation>
@@ -1467,10 +1240,6 @@ att funktionen inte är implementerad än.</translation>
         <source>&amp;Feed/message list headers</source>
         <translation>&amp;Kolumnrubriker</translation>
     </message>
-    <message>
-        <source>Close all tabs except current one.</source>
-        <translation>Stäng alla flikar utom aktuell.</translation>
-    </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
         <translation>Rapportera ett &amp;fel (GitHub)...</translation>
@@ -1856,14 +1625,6 @@ att funktionen inte är implementerad än.</translation>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
         <translation>Öppna nya flikar med dubbelklick i flikfältet</translation>
     </message>
-    <message>
-        <source>Enable mouse gestures</source>
-        <translation>Aktivera musgester</translation>
-    </message>
-    <message>
-        <source>Queue new tabs (with hyperlinks) after the active tab</source>
-        <translation>Öppna nya flikar (med hyperlänkar) efter aktuell flik</translation>
-    </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
@@ -2010,10 +1771,6 @@ Utvecklaren av detta program, är INTE ansvarig för förlorad data.</translatio
         <source>in-memory database switched</source>
         <translation>Minnesdatabas växlad</translation>
     </message>
-    <message>
-        <source>Internal web browser</source>
-        <translation>Intern webbläsare</translation>
-    </message>
     <message>
         <source>External web browser</source>
         <translation>Extern webbläsare</translation>
@@ -2042,10 +1799,6 @@ Utvecklaren av detta program, är INTE ansvarig för förlorad data.</translatio
         <source>Auto-update all feeds every</source>
         <translation>Auto-uppdatera alla flöden varje</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation>minuter</translation>
-    </message>
     <message>
         <source>Feed connection timeout</source>
         <translation>Anslutnings-timeout för flöden</translation>
@@ -2166,18 +1919,6 @@ Utvecklaren av detta program, är INTE ansvarig för förlorad data.</translatio
         <source>Launch %1 on operating system startup</source>
         <translation>Starta %1 vid systemstart</translation>
     </message>
-    <message>
-        <source>Enable JavaScript</source>
-        <translation>Aktivera JavaScript</translation>
-    </message>
-    <message>
-        <source>Enable external plugins based on NPAPI</source>
-        <translation>Aktivera externa tillägg baserade på NPAPI</translation>
-    </message>
-    <message>
-        <source>Auto-load images</source>
-        <translation>Läs in bilder automatiskt</translation>
-    </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Om kryssrutan lämnas omarkerad, används systemets standardwebbläsare.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
@@ -2285,18 +2026,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Working database</source>
         <translation>Arbetsdatabas</translation>
     </message>
-    <message>
-        <source>Mouse gestures work with middle mouse button. Possible gestures are:
- • previous web page (drag mouse left),
- • next web page (drag mouse right),
- • reload current web page (drag mouse up),
- • open new web browser tab (drag mouse down).</source>
-        <translation>Musgester aktiveras med mushjulsknappen. Aktuella musgester är:
- • föregående sida (dra musen åt vänster)
- • nästa sida (dra musen åt höger)
- • uppdatera aktuell webbsida (dra musen uppåt)
- • öppna ny webbläsarflik (dra musen neråt)</translation>
-    </message>
     <message>
         <source>Use custom external web browser</source>
         <translation>Använd anpassad extern webbläsare</translation>
@@ -2353,46 +2082,18 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Working database is ok.</source>
         <translation>Arbetsdatabasen är OK.</translation>
     </message>
-    <message>
-        <source>Notification position</source>
-        <translation>Aviseringsposition</translation>
-    </message>
     <message>
         <source>(Tray icon is not available.)</source>
         <translation>(meddelandefältsikon ej tillgänglig)</translation>
     </message>
-    <message>
-        <source>Bottom-left corner</source>
-        <translation>Vänster nederkant</translation>
-    </message>
-    <message>
-        <source>Top-left corner</source>
-        <translation>Vänster överkant</translation>
-    </message>
-    <message>
-        <source>Bottom-right corner</source>
-        <translation>Höger nederkant</translation>
-    </message>
-    <message>
-        <source>Top-right corner</source>
-        <translation>Höger överkant</translation>
-    </message>
     <message>
         <source>Internal message browser fonts</source>
         <translation>Teckensnitt för intern meddelandeläsare</translation>
     </message>
-    <message>
-        <source>Standard font</source>
-        <translation>Standardteckensnitt</translation>
-    </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
         <translation>Notera att hastigheten på den använda MySQL-servern och latensen för aktuellt anslutningsmedium, KRAFTIGT påverkar detta programs prestanda. Användning av långsamma databasanslutningar leder till dålig prestanda vid navigering bland flöden och meddelanden.</translation>
     </message>
-    <message>
-        <source>Fancy &amp;&amp; modern popup notifications (This uses OS native notifications via D-Bus if available.)</source>
-        <translation>Tjusiga &amp;&amp; moderna popup-aviseringar (Använder systemets integrerade aviseringar via D-Bus, om tillgängligt.)</translation>
-    </message>
     <message>
         <source>E-mail</source>
         <translation>E-post</translation>
@@ -2401,25 +2102,37 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Enable notifications</source>
         <translation>Aktivera aviseringar</translation>
     </message>
-    <message>
-        <source>Background color</source>
-        <translation>Bakgrundsfärg</translation>
-    </message>
-    <message>
-        <source>Change</source>
-        <translation>Ändra</translation>
-    </message>
     <message>
         <source>Open download manager when new download is started</source>
         <translation>Öppna nedladdningshanteraren när ny nedladdning startas</translation>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Enable D-Bus notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>&amp;Change font</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Font preview</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Select new font for message viewer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source> (not available)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2584,10 +2297,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
         <translation>Välj uppdateringsstrategi för flödet. Global auto-uppdatering, innebär att flödet kommer att uppdateras med tidsintervall angivna i programinställningarna.</translation>
     </message>
-    <message>
-        <source> minutes</source>
-        <translation>minuter</translation>
-    </message>
     <message>
         <source>Title</source>
         <translation>Titel</translation>
@@ -3104,10 +2813,34 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
     </message>
 </context>
 <context>
-    <name>LocationLineEdit</name>
+    <name>MessagePreviewer</name>
     <message>
-        <source>Website address goes here</source>
-        <translation>Webbadress anges här</translation>
+        <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>What action do you want to take?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Open in external browser</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Download</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as read</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Mark message as unread</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Switch message importance</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3286,14 +3019,6 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
         <source>Context menu for messages</source>
         <translation>Kontextmeny för meddelanden</translation>
     </message>
-    <message>
-        <source>Meesage without URL</source>
-        <translation>Meddelande utan URL</translation>
-    </message>
-    <message>
-        <source>Message &apos;%s&apos; does not contain URL.</source>
-        <translation>Meddelande &apos;%s&apos; innehåller ingen URL.</translation>
-    </message>
     <message>
         <source>Problem with starting external web browser</source>
         <translation>Problem med att starta extern webbläsare</translation>
@@ -3310,6 +3035,10 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
         <source>External e-mail client could not be started.</source>
         <translation>Extern e-postklient kunde inte startas.</translation>
     </message>
+    <message>
+        <source>Newspaper view</source>
+        <translation type="unfinished">Tidningsvy</translation>
+    </message>
 </context>
 <context>
     <name>NetworkFactory</name>
@@ -3389,7 +3118,29 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>NewspaperPreviewer</name>
+    <message>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message numerus="yes">
+        <source>Show more messages (%n remaining)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source>Cannot show more messages</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Cannot show more messages because parent feed was removed.</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -3429,9 +3180,12 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
         <source>
 
 + %n other feeds.</source>
-        <translation><numerusform>+ %n annat flöde.</numerusform><numerusform>
+        <translation>
+            <numerusform>+ %n annat flöde.</numerusform>
+            <numerusform>
 
-+ %n andra flöden.</numerusform></translation>
++ %n andra flöden.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Welcome to %1.
@@ -3480,7 +3234,10 @@ Minst API-nivå %1 krävs.</translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation><numerusform>%n borttaget meddelande.</numerusform><numerusform>%n borttagna meddelanden.</numerusform></translation>
+        <translation>
+            <numerusform>%n borttaget meddelande.</numerusform>
+            <numerusform>%n borttagna meddelanden.</numerusform>
+        </translation>
     </message>
     <message>
         <source>Recycle bin
@@ -3504,7 +3261,10 @@ Minst API-nivå %1 krävs.</translation>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation><numerusform>%n oläst meddelande.</numerusform><numerusform>%n olästa meddelanden.</numerusform></translation>
+        <translation>
+            <numerusform>%n oläst meddelande.</numerusform>
+            <numerusform>%n olästa meddelanden.</numerusform>
+        </translation>
     </message>
 </context>
 <context>
@@ -3559,7 +3319,10 @@ Denna kategori innehåller inga objekt.</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation><numerusform>använder specifika inställningar (%n minut till nästa autouppdatering)</numerusform><numerusform>använder specifika inställningar (%n minuter till nästa autouppdatering)</numerusform></translation>
+        <translation>
+            <numerusform>använder specifika inställningar (%n minut till nästa autouppdatering)</numerusform>
+            <numerusform>använder specifika inställningar (%n minuter till nästa autouppdatering)</numerusform>
+        </translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3640,25 +3403,21 @@ Konto-ID: %1</translation>
 </context>
 <context>
     <name>StatusBar</name>
-    <message>
-        <source>Adblock</source>
-        <translation>Adblock</translation>
-    </message>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3710,11 +3469,6 @@ Olästa nyheter: %2</translation>
         <source>Browse your feeds and messages</source>
         <translation>Bläddra bland dina flöden och meddelanden</translation>
     </message>
-    <message>
-        <source>Web browser</source>
-        <extracomment>Web browser default tab title.</extracomment>
-        <translation>Webbläsare</translation>
-    </message>
     <message>
         <source>Displays main menu.</source>
         <translation>Visar den primära menyn.</translation>
@@ -3723,15 +3477,32 @@ Olästa nyheter: %2</translation>
         <source>Main menu</source>
         <translation>Huvudmeny</translation>
     </message>
-    <message>
-        <source>Open new web browser tab.</source>
-        <translation>Öppna ny webbläsarflik.</translation>
-    </message>
     <message>
         <source>Downloads</source>
         <translation>Nedladdningar</translation>
     </message>
 </context>
+<context>
+    <name>TimeSpinBox</name>
+    <message numerus="yes">
+        <source>%n hour(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message numerus="yes">
+        <source>%n minute(s)</source>
+        <translation type="unfinished">
+            <numerusform></numerusform>
+            <numerusform></numerusform>
+        </translation>
+    </message>
+    <message>
+        <source> and </source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
 <context>
     <name>ToolBarEditor</name>
     <message>
@@ -3801,7 +3572,10 @@ Olästa nyheter: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation><numerusform>använder specifika inställningar (%n minut till nästa automatiska uppdatering)</numerusform><numerusform>använder specifika inställningar (%n minuter till nästa automatiska uppdatering)</numerusform></translation>
+        <translation>
+            <numerusform>använder specifika inställningar (%n minut till nästa automatiska uppdatering)</numerusform>
+            <numerusform>använder specifika inställningar (%n minuter till nästa automatiska uppdatering)</numerusform>
+        </translation>
     </message>
     <message>
         <source>%1%2
@@ -3844,215 +3618,4 @@ Senast inloggad: %5</translation>
         <translation>Kan inte lägga till flöde, eftersom en annan kritisk åtgärd pågår.</translation>
     </message>
 </context>
-<context>
-    <name>WebBrowser</name>
-    <message>
-        <source>Navigation panel</source>
-        <translation>Navigationspanel</translation>
-    </message>
-    <message>
-        <source>Back</source>
-        <translation>Tillbaka</translation>
-    </message>
-    <message>
-        <source>Forward</source>
-        <translation>Framåt</translation>
-    </message>
-    <message>
-        <source>Reload</source>
-        <translation>Uppdatera</translation>
-    </message>
-    <message>
-        <source>Stop</source>
-        <translation>Stopp</translation>
-    </message>
-    <message>
-        <source>Zoom  </source>
-        <translation>Zoom </translation>
-    </message>
-    <message>
-        <source>No title</source>
-        <extracomment>Webbrowser tab title when no title is available.</extracomment>
-        <translation>Ingen titel</translation>
-    </message>
-    <message>
-        <source>Decrease zoom.</source>
-        <translation>Mindre zoom.</translation>
-    </message>
-    <message>
-        <source>Reset zoom to default.</source>
-        <translation>Återställ zoomläget till standard.</translation>
-    </message>
-    <message>
-        <source>Increase zoom.</source>
-        <translation>Ökad zoom.</translation>
-    </message>
-    <message>
-        <source>Written by </source>
-        <translation>Skriven av </translation>
-    </message>
-    <message>
-        <source>Newspaper view</source>
-        <translation>Tidningsvy</translation>
-    </message>
-    <message>
-        <source>Go back.</source>
-        <translation>Gå tillbaka.</translation>
-    </message>
-    <message>
-        <source>Go forward.</source>
-        <translation>Gå framåt.</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Uppdatera aktuell webbsida.</translation>
-    </message>
-    <message>
-        <source>Stop web page loading.</source>
-        <translation>Stoppa inläsning av webbsidan.</translation>
-    </message>
-    <message>
-        <source>unknown author</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>WebView</name>
-    <message>
-        <source>Reload web page</source>
-        <translation>Uppdatera webbsidan</translation>
-    </message>
-    <message>
-        <source>Copy link url</source>
-        <translation>Kopiera länk</translation>
-    </message>
-    <message>
-        <source>Copy image</source>
-        <translation>Kopiera bild</translation>
-    </message>
-    <message>
-        <source>Copy image url</source>
-        <translation>Kopiera bildadress</translation>
-    </message>
-    <message>
-        <source>Open link in new tab</source>
-        <translation>Öppna länk i ny flik</translation>
-    </message>
-    <message>
-        <source>Follow link</source>
-        <translation>Följ länk</translation>
-    </message>
-    <message>
-        <source>Open image in new tab</source>
-        <translation>Öppna bild i ny flik</translation>
-    </message>
-    <message>
-        <source>Web browser</source>
-        <translation>Webbläsare</translation>
-    </message>
-    <message>
-        <source>Image</source>
-        <translation>Bild</translation>
-    </message>
-    <message>
-        <source>Hyperlink</source>
-        <translation>Hyperlänk</translation>
-    </message>
-    <message>
-        <source>Reload current web page.</source>
-        <translation>Uppdatera aktuell webbsida.</translation>
-    </message>
-    <message>
-        <source>Copy selection</source>
-        <translation>Kopiera markerat</translation>
-    </message>
-    <message>
-        <source>Copies current selection into the clipboard.</source>
-        <translation>Kopiera aktuell markering till Urklipp.</translation>
-    </message>
-    <message>
-        <source>Copy link url to clipboard.</source>
-        <translation>Kopiera länkadress till Urklipp.</translation>
-    </message>
-    <message>
-        <source>Copy image to clipboard.</source>
-        <translation>Kopiera bild till Urklipp.</translation>
-    </message>
-    <message>
-        <source>Copy image url to clipboard.</source>
-        <translation>Kopiera bildadress till Urklipp.</translation>
-    </message>
-    <message>
-        <source>Open this hyperlink in new tab.</source>
-        <translation>Öppna länken i ny flik.</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in this tab.</source>
-        <translation>Öppna länken i samma flik.</translation>
-    </message>
-    <message>
-        <source>Open this image in this tab.</source>
-        <translation>Öppna bilden i samma flik.</translation>
-    </message>
-    <message>
-        <source>Open link in external browser</source>
-        <translation>Öppna länk i extern webbläsare</translation>
-    </message>
-    <message>
-        <source>Open the hyperlink in external browser.</source>
-        <translation>Öppna länken i extern webbläsare.</translation>
-    </message>
-    <message>
-        <source>Print</source>
-        <translation>Skriv ut</translation>
-    </message>
-    <message>
-        <source>Print current web page.</source>
-        <translation>Skriv ut aktuell webbsida</translation>
-    </message>
-    <message>
-        <source>HTML web pages (*.html)</source>
-        <translation>HTML-webbsidor (*.html)</translation>
-    </message>
-    <message>
-        <source>Select destination file for web page</source>
-        <translation>Ange målfil för webbsidan</translation>
-    </message>
-    <message>
-        <source>Cannot save web page</source>
-        <translation>Kan inte spara webbsidan</translation>
-    </message>
-    <message>
-        <source>Web page cannot be saved because destination file is not writtable.</source>
-        <translation>Webbsidan kan inte sparas eftersom målfilen inte är skrivbar.</translation>
-    </message>
-    <message>
-        <source>Save target as...</source>
-        <translation>Spara målet som...</translation>
-    </message>
-    <message>
-        <source>Download content from the hyperlink.</source>
-        <translation>Ladda ner innehåll från hyperlänk.</translation>
-    </message>
-    <message>
-        <source>Save page as...</source>
-        <translation>Spara sida som...</translation>
-    </message>
-    <message>
-        <source>Save image to disk.</source>
-        <translation>Spara bild på disk.</translation>
-    </message>
-    <message>
-        <source>Save image as...</source>
-        <translation>Spara bild som...</translation>
-    </message>
-    <message>
-        <source>source_page</source>
-        <translation>source_page</translation>
-    </message>
-    <message>
-        <source>Search &quot;%1&quot; via Google...</source>
-        <translation>Sök &quot;%1&quot; via Google...</translation>
-    </message>
-</context>
-</TS>
\ No newline at end of file
+</TS>
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
index df647a43a..89e3a5b16 100644
--- a/src/gui/messagepreviewer.cpp
+++ b/src/gui/messagepreviewer.cpp
@@ -41,7 +41,9 @@ MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
     box.setInformativeText(tr("What action do you want to take?"));
     QAbstractButton *btn_open = box.addButton(tr("Open in external browser"), QMessageBox::AcceptRole);
     QAbstractButton *btn_download = box.addButton(tr("Download"), QMessageBox::RejectRole);
+    QAbstractButton *btn_cancel = box.addButton(QMessageBox::Cancel);
 
+    box.setDefaultButton(QMessageBox::Cancel);
     box.exec();
 
     if (box.clickedButton() == btn_open) {
@@ -50,6 +52,13 @@ MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
     else if (box.clickedButton() == btn_download) {
       qApp->downloadManager()->download(url);
     }
+    else {
+
+    }
+
+    btn_download->deleteLater();
+    btn_open->deleteLater();
+    btn_cancel->deleteLater();
   });
 
   m_toolBar = new QToolBar(this);

From 0678a2bc5bf2e3d45595ef4a2a489d0bb03ece99 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 3 Apr 2016 10:04:31 +0200
Subject: [PATCH 29/31] Lang sync etc.

---
 localization/rssguard-cs_CZ.ts |  218 ++---
 localization/rssguard-da_DK.ts |  965 +++++++++---------
 localization/rssguard-de_DE.ts | 1045 ++++++++++----------
 localization/rssguard-en_US.ts | 1681 ++++++++++++++++----------------
 localization/rssguard-fr_FR.ts |  927 +++++++++---------
 localization/rssguard-it_IT.ts | 1015 +++++++++----------
 localization/rssguard-nl_NL.ts |  129 +--
 localization/rssguard-pt_BR.ts |  129 +--
 localization/rssguard-sv_SE.ts |  127 +--
 9 files changed, 2927 insertions(+), 3309 deletions(-)

diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts
index a0adf8b1d..8ef6dbd17 100644
--- a/localization/rssguard-cs_CZ.ts
+++ b/localization/rssguard-cs_CZ.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="cs_CZ">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.1">
 <context>
     <name>Application</name>
     <message>
@@ -101,15 +99,15 @@
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybraná databáze doposud neexistuje, ale bude vytvořena při prvním použití.</translation>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"></translation>
+        <translation>MySQL databáze není k dispozici</translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 nemůže použít MySQL databází, není k dispozici. %1 se nyní přepne pro použití SQLite databáze. Pokud chcete opět použít MySQL, přepněte si to v nastavení.</translation>
     </message>
 </context>
 <context>
@@ -187,7 +185,7 @@
         <translation>Stahování dokončeno</translation>
     </message>
     <message>
-        <source>File &apos;%1&apos; is downloaded.
+        <source>File '%1' is downloaded.
 Click here to open parent directory.</source>
         <translation>Soubor &apos;%1&apos; je stažen.
 Klikněte sem pro otevření nadřazeného adresáře.</translation>
@@ -213,19 +211,11 @@ Klikněte sem pro otevření nadřazeného adresáře.</translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minuta do konce</numerusform>
-            <numerusform>%n minuty do konce</numerusform>
-            <numerusform>%n minut do konce</numerusform>
-        </translation>
+        <translation><numerusform>%n minuta do konce</numerusform><numerusform>%n minuty do konce</numerusform><numerusform>%n minut do konce</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n vteřina do konce</numerusform>
-            <numerusform>%n vteřiny do konce</numerusform>
-            <numerusform>%n vteřin do konce</numerusform>
-        </translation>
+        <translation><numerusform>%n vteřina do konce</numerusform><numerusform>%n vteřiny do konce</numerusform><numerusform>%n vteřin do konce</numerusform></translation>
     </message>
     <message>
         <source>bytes</source>
@@ -233,23 +223,19 @@ Klikněte sem pro otevření nadřazeného adresáře.</translation>
     </message>
     <message>
         <source>kB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation>
-            <numerusform>Stahuji %n soubor...</numerusform>
-            <numerusform>Stahuji %n soubory...</numerusform>
-            <numerusform>Stahuji %n souborů...</numerusform>
-        </translation>
+        <translation><numerusform>Stahuji %n soubor...</numerusform><numerusform>Stahuji %n soubory...</numerusform><numerusform>Stahuji %n souborů...</numerusform></translation>
     </message>
 </context>
 <context>
@@ -312,11 +298,7 @@ Klikněte sem pro otevření nadřazeného adresáře.</translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation>
-            <numerusform>Budu aktualizovat %n kanál.</numerusform>
-            <numerusform>Budu aktualizovat %n kanály.</numerusform>
-            <numerusform>Budu aktualizovat %n kanálů.</numerusform>
-        </translation>
+        <translation><numerusform>Budu aktualizovat %n kanál.</numerusform><numerusform>Budu aktualizovat %n kanály.</numerusform><numerusform>Budu aktualizovat %n kanálů.</numerusform></translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -626,11 +608,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation>
-            <numerusform> den</numerusform>
-            <numerusform> dny</numerusform>
-            <numerusform> dnů</numerusform>
-        </translation>
+        <translation><numerusform> den</numerusform><numerusform> dny</numerusform><numerusform> dnů</numerusform></translation>
     </message>
     <message>
         <source>Shrink database file</source>
@@ -721,7 +699,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Test setup</source>
@@ -853,11 +831,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation>Vynutit aktualizace kanálů na straně serveru</translation>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapnutí této položky může výrazně zpomalit aktualizaci kanálů.</translation>
     </message>
 </context>
 <context>
@@ -876,7 +854,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update</source>
@@ -975,11 +953,11 @@ or this functionality is not implemented yet.</source>
     <name>FormEditOwnCloudAccount</name>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation>Vynutit aktualizace kanálů na straně serveru.</translation>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -1007,11 +985,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation>Zapnutí této položky může výrazně zpomalit aktualizaci kanálů.</translation>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation>Je vyžadována minimálně verze %1.</translation>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
@@ -1023,7 +1001,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"></translation>
+        <translation>URL vašeho ownCloud serveru, bez jakýchkoliv API koncovek.</translation>
     </message>
     <message>
         <source>No test done yet.</source>
@@ -1035,27 +1013,27 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation>Přidat nový ownCloud News účet</translation>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation>Upravit existující účet ownCloudNews</translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybraný server pro ownCloud News běží na nepodporované verzi (%1). Je třeba minimálně verze %2.</translation>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"></translation>
+        <translation>Vybraný ownCloud News server běží na nepodporované verzi.</translation>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
@@ -1063,7 +1041,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
@@ -1442,11 +1420,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"></translation>
+        <translation>Zastavit probíhající aktualizaci kanálů</translation>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"></translation>
+        <translation>Žádná možná akce</translation>
     </message>
 </context>
 <context>
@@ -1534,7 +1512,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icons &amp;&amp; skins</source>
@@ -1563,7 +1541,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -1599,11 +1577,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Socks5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Http</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not supported on this platform)</source>
@@ -1812,7 +1790,7 @@ Autoři této aplikace nenesou žádnou odpovědnost za ztrátu Vašich dat.</tr
     </message>
     <message>
         <source> ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update all feed on application startup</source>
@@ -2071,7 +2049,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
@@ -2099,7 +2077,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable notifications</source>
@@ -2107,35 +2085,35 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2310,7 +2288,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Fetch it now</source>
@@ -2817,38 +2795,38 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagesModel</name>
     <message>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Read</source>
@@ -2872,7 +2850,7 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     </message>
     <message>
         <source>Url</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Author</source>
@@ -2968,11 +2946,11 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3038,7 +3016,7 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished">Novinový náhled</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3119,30 +3097,26 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>neznámý obsah</translation>
     </message>
 </context>
 <context>
     <name>NewspaperPreviewer</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3182,17 +3156,13 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
         <source>
 
 + %n other feeds.</source>
-        <translation>
-            <numerusform>
+        <translation><numerusform>
 
-+ %n další kanál.</numerusform>
-            <numerusform>
++ %n další kanál.</numerusform><numerusform>
 
-+ %n další kanály.</numerusform>
-            <numerusform>
++ %n další kanály.</numerusform><numerusform>
 
-+ %n dalších kanálů.</numerusform>
-        </translation>
++ %n dalších kanálů.</numerusform></translation>
     </message>
     <message>
         <source>Welcome to %1.
@@ -3226,7 +3196,7 @@ Je vyžadování verze API minimálně %1.</translation>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3241,11 +3211,7 @@ Je vyžadování verze API minimálně %1.</translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation>
-            <numerusform>%n smazaná zpráva.</numerusform>
-            <numerusform>%n smazané zprávy.</numerusform>
-            <numerusform>%n smazaných zpráv.</numerusform>
-        </translation>
+        <translation><numerusform>%n smazaná zpráva.</numerusform><numerusform>%n smazané zprávy.</numerusform><numerusform>%n smazaných zpráv.</numerusform></translation>
     </message>
     <message>
         <source>Recycle bin
@@ -3269,11 +3235,7 @@ Je vyžadování verze API minimálně %1.</translation>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation>
-            <numerusform>%n nepřečtená zpráva.</numerusform>
-            <numerusform>%n nepřečtené zprávy.</numerusform>
-            <numerusform>%n nepřečtených zpráv.</numerusform>
-        </translation>
+        <translation><numerusform>%n nepřečtená zpráva.</numerusform><numerusform>%n nepřečtené zprávy.</numerusform><numerusform>%n nepřečtených zpráv.</numerusform></translation>
     </message>
 </context>
 <context>
@@ -3328,11 +3290,7 @@ Tato kategorie neobsahuje žádné položky.</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation>
-            <numerusform>používá specifické nastavení (%n minuta do další aktualizace)</numerusform>
-            <numerusform>používá specifické nastavení (%n minuty do další aktualizace)</numerusform>
-            <numerusform>používá specifické nastavení (%n minut do další aktualizace)</numerusform>
-        </translation>
+        <translation><numerusform>používá specifické nastavení (%n minuta do další aktualizace)</numerusform><numerusform>používá specifické nastavení (%n minuty do další aktualizace)</numerusform><numerusform>používá specifické nastavení (%n minut do další aktualizace)</numerusform></translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3415,23 +3373,23 @@ ID účtu: %1</translation>
     <name>StatusBar</name>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished">Mezera</translation>
+        <translation>Mezera</translation>
     </message>
 </context>
 <context>
@@ -3496,23 +3454,15 @@ Nepřečtené zprávy: %2</translation>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3584,11 +3534,7 @@ Nepřečtené zprávy: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation>
-            <numerusform>používá specifické nastavení (%n minuta do další aktualizace)</numerusform>
-            <numerusform>používá specifické nastavení (%n minuty do další aktualizace)</numerusform>
-            <numerusform>používá specifické nastavení (%n minut do další aktualizace)</numerusform>
-        </translation>
+        <translation><numerusform>používá specifické nastavení (%n minuta do další aktualizace)</numerusform><numerusform>používá specifické nastavení (%n minuty do další aktualizace)</numerusform><numerusform>používá specifické nastavení (%n minut do další aktualizace)</numerusform></translation>
     </message>
     <message>
         <source>%1%2
@@ -3631,4 +3577,4 @@ Poslední přihlášení: %5</translation>
         <translation>Nelze přidat kanál, protože probíhá jiná kritická operace.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/localization/rssguard-da_DK.ts b/localization/rssguard-da_DK.ts
index 521724509..199fcf37e 100644
--- a/localization/rssguard-da_DK.ts
+++ b/localization/rssguard-da_DK.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="da_DK">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.1">
 <context>
     <name>Application</name>
     <message>
@@ -9,23 +7,23 @@
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -33,7 +31,7 @@
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -48,11 +46,11 @@
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Recycle bin purged...</source>
@@ -64,11 +62,11 @@
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -84,7 +82,7 @@
     <message>
         <source>Access denied. Invalid username or password used.</source>
         <extracomment>Access to MySQL server was denied.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unknown error.</source>
@@ -101,22 +99,22 @@
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DownloadItem</name>
     <message>
         <source>Ico</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Filename</source>
@@ -124,7 +122,7 @@
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Try again</source>
@@ -148,19 +146,19 @@
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open &amp;directory</source>
@@ -172,7 +170,7 @@
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open directory</source>
@@ -180,16 +178,16 @@
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File &apos;%1&apos; is downloaded.
+        <source>File '%1' is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL: %1</source>
@@ -197,32 +195,26 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message>
         <source>Clean up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>bytes</source>
@@ -230,33 +222,30 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>kB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
     <name>FeedMessageViewer</name>
     <message>
         <source>Toolbar for messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar for feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot cleanup database</source>
@@ -264,7 +253,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -291,7 +280,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Titles of feeds/categories.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Counts of unread/all meesages.</source>
@@ -304,14 +293,11 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -319,36 +305,36 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update started</source>
         <extracomment>Text display in status bar when feed update is started.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Updated feed &apos;%1&apos;</source>
         <extracomment>Text display in status bar when particular feed is updated.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FeedsToolBar</name>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -363,23 +349,23 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
@@ -387,7 +373,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Are you sure?</source>
@@ -395,20 +381,20 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Not supported</source>
@@ -416,11 +402,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -447,7 +433,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Licenses page is available only in English language.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changelog</source>
@@ -455,7 +441,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Changelog page is available only in English language.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>License not found.</source>
@@ -463,11 +449,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Changelog not found.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&lt;b&gt;%8&lt;/b&gt;&lt;br&gt;&lt;b&gt;Version:&lt;/b&gt; %1 (build on %2 with CMake %3)&lt;br&gt;&lt;b&gt;Revision:&lt;/b&gt; %4&lt;br&gt;&lt;b&gt;Build date:&lt;/b&gt; %5&lt;br&gt;&lt;b&gt;Qt:&lt;/b&gt; %6 (compiled against %7)&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>About %1</source>
@@ -484,11 +470,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>PARTIALLY portable</source>
@@ -500,7 +486,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -531,7 +517,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -546,7 +532,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Items to backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database</source>
@@ -562,7 +548,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Common name for backup files</source>
@@ -570,7 +556,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup was created successfully.</source>
@@ -582,15 +568,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Select directory</source>
@@ -598,15 +584,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -617,18 +603,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation>
-            <numerusform>dag</numerusform>
-            <numerusform>dage</numerusform>
-        </translation>
+        <translation><numerusform>dag</numerusform><numerusform>dage</numerusform></translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database information</source>
@@ -636,7 +619,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database type</source>
@@ -644,7 +627,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>I am ready.</source>
@@ -656,27 +639,27 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown</source>
@@ -684,7 +667,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -695,7 +678,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -711,7 +694,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL</source>
@@ -719,19 +702,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
@@ -739,19 +722,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
@@ -759,15 +742,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
@@ -775,11 +758,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
@@ -787,15 +770,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
@@ -827,7 +810,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
@@ -835,23 +818,23 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -866,7 +849,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL</source>
@@ -874,11 +857,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Auto-update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -886,7 +869,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Requires authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -914,7 +897,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update every</source>
@@ -922,11 +905,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing feed</source>
@@ -942,7 +925,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -954,15 +937,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -973,7 +956,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -981,7 +964,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -997,19 +980,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
@@ -1017,55 +1000,55 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
@@ -1081,7 +1064,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
@@ -1144,15 +1127,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Hides main window if it is visible and shows it if it is hidden.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hides or shows the list of feeds/categories.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Check if new update for the application is available for download.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;About application</source>
@@ -1160,11 +1143,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Displays extra info about this application.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hides or displays the main menu.</source>
@@ -1176,11 +1159,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open selected source articles in &amp;external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open selected messages in &amp;internal browser</source>
@@ -1188,7 +1171,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Select &amp;next message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;previous message</source>
@@ -1208,7 +1191,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Feed list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Main menu</source>
@@ -1216,43 +1199,43 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch visibility of main toolbars.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restart</source>
@@ -1260,23 +1243,23 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
@@ -1284,7 +1267,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update &amp;all items</source>
@@ -1292,87 +1275,87 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
@@ -1380,19 +1363,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -1400,15 +1383,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
@@ -1416,15 +1399,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category</source>
@@ -1436,22 +1419,22 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore database</source>
@@ -1467,15 +1450,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source directory</source>
@@ -1487,15 +1470,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1553,7 +1536,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Hostname or IP of your proxy server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Port</source>
@@ -1565,7 +1548,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Your username for proxy server authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password</source>
@@ -1573,7 +1556,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Your password for proxy server authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display password</source>
@@ -1581,7 +1564,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Code</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Version</source>
@@ -1613,24 +1596,24 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Close tabs with</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Middle mouse button single-click</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot save settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Name</source>
@@ -1646,27 +1629,27 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Active skin:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected skin:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hide tab bar if just one tab is visible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Critical settings were changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp; messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some critical settings are not set. You must fix these settings in order confirm new settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Messages</source>
@@ -1674,19 +1657,19 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Web browser executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executable parameters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select web browser executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executables (*.*)</source>
@@ -1706,12 +1689,12 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>some keyboard shortcuts are not unique</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>List of errors:
 %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>List of changes:
@@ -1729,15 +1712,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>skin changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use sample arguments for</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use in-memory database as the working database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Usage of in-memory working database has several advantages and pitfalls. Make sure that you are familiar with these before you turn this feature on. Advantages:
@@ -1751,11 +1734,11 @@ Disadvantages:
 &lt;li&gt;application startup and shutdown can take little longer (max. 2 seconds).&lt;/li&gt;
 &lt;/ul&gt;
 Authors of this application are NOT responsible for lost data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>in-memory database switched</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External web browser</source>
@@ -1763,7 +1746,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>WARNING: Note that switching to another data storage type will NOT copy existing your data from currently active data storage to newly selected one.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database driver</source>
@@ -1779,27 +1762,27 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Right mouse button double-click</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update all feeds every</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed connection timeout</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update all feed on application startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Data storage</source>
@@ -1819,7 +1802,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>data storage backend changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hostname is empty.</source>
@@ -1851,15 +1834,15 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Hide main window when it is minimized</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No connection test triggered so far.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that these settings are applied only on newly established connections.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select browser</source>
@@ -1883,7 +1866,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Text beside icon</source>
-        <translation type="unfinished"></translation>
+        <translation>Tekst ved siden af ikon</translation>
     </message>
     <message>
         <source>Text under icon</source>
@@ -1895,11 +1878,11 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Keep message selection in the middle of the message list viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You did not executed any connection test yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Launch %1 on operating system startup</source>
@@ -1907,7 +1890,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -1915,15 +1898,15 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Message count format in feed list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enter format for count of messages displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) messages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>custom external browser is not set correctly</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbars</source>
@@ -1931,21 +1914,21 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Toolbar for feeds list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar for messages list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select toolbar to edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to restart now?</source>
@@ -1953,11 +1936,11 @@ You have to restart manually.</source>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executables (*)</source>
@@ -1968,31 +1951,31 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Show password</source>
@@ -2004,15 +1987,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client</source>
@@ -2020,15 +2003,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select client</source>
@@ -2038,7 +2021,7 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Save all downloaded files to</source>
@@ -2054,27 +2037,27 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail</source>
@@ -2082,39 +2065,39 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2125,7 +2108,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select parent item for your category.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title</source>
@@ -2141,7 +2124,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select icon for your category.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category</source>
@@ -2157,7 +2140,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category was not added due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot edit category</source>
@@ -2173,7 +2156,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category name is too short.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Description is empty.</source>
@@ -2214,11 +2197,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category title</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set title for your category.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category description</source>
@@ -2226,19 +2209,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Set description for your category.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Load icon from file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do not use icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use default icon</source>
@@ -2253,7 +2236,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Type</source>
@@ -2261,23 +2244,23 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select type of the standard feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select encoding of the standard feed. If you are unsure about the encoding, then select &quot;UTF-8&quot; encoding.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title</source>
@@ -2293,7 +2276,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Fetch it now</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon</source>
@@ -2301,7 +2284,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select icon for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -2333,7 +2316,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Feed name is too short.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Description is empty.</source>
@@ -2402,11 +2385,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Feed was not edited due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>All metadata fetched successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed and icon metadata fetched.</source>
@@ -2414,11 +2397,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Result: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed or icon metatada not fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error: %1.</source>
@@ -2434,11 +2417,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No icon fetched.</source>
@@ -2450,7 +2433,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Set title for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed description</source>
@@ -2462,31 +2445,31 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set url for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set username to access the feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set password to access the feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Load icon from file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do not use icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use default icon</source>
@@ -2502,7 +2485,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update every</source>
@@ -2510,42 +2493,42 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No file is selected.</source>
@@ -2553,15 +2536,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Export feeds</source>
@@ -2573,7 +2556,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import feeds</source>
@@ -2585,7 +2568,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File is selected.</source>
@@ -2593,11 +2576,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were loaded.</source>
@@ -2605,15 +2588,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation>Feeds blev eksporteret succesfuldt.</translation>
     </message>
     <message>
         <source>Critical error occurred.</source>
@@ -2625,31 +2608,31 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2678,16 +2661,16 @@ File filter for external e-mail selection dialog.</extracomment>
     <message>
         <source>List with updates was not
 downloaded successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>New release available.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This is new version which can be
 downloaded and installed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error: &apos;%1&apos;.</source>
@@ -2700,7 +2683,7 @@ downloaded and installed.</source>
     <message>
         <source>This release is not newer than
 currently installed one.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Check for updates</source>
@@ -2725,11 +2708,11 @@ currently installed one.</source>
     <message>
         <source>Installation file is not available directly.
 Go to application website to obtain it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No new update available.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot update application</source>
@@ -2737,7 +2720,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Cannot navigate to installation file. Check new installation downloads manually on project website.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download update</source>
@@ -2745,7 +2728,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloading update...</source>
@@ -2753,7 +2736,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Downloaded successfully</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Package was downloaded successfully.</source>
@@ -2761,19 +2744,19 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Install update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occured</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Go to application website</source>
@@ -2784,49 +2767,49 @@ Go to application website to obtain it manually.</source>
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagesModel</name>
     <message>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Read</source>
@@ -2882,11 +2865,11 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Id of feed which this message belongs to.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Url of the message.</source>
@@ -2898,7 +2881,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Creation date of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Contents of the message.</source>
@@ -2910,7 +2893,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Attachments</source>
@@ -2922,35 +2905,35 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2965,11 +2948,11 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Highlight unread messages</source>
@@ -2977,7 +2960,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display all messages</source>
@@ -2985,38 +2968,38 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagesView</name>
     <message>
         <source>Context menu for messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Problem with starting external web browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External web browser could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3039,7 +3022,7 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>connection timed out</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>SSL handshake failed</source>
@@ -3049,7 +3032,7 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>proxy server connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>forbindelse til proxy server afvist</translation>
     </message>
     <message>
         <source>temporary failure</source>
@@ -3059,12 +3042,12 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>authentication failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>proxy authentication required</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>proxy server not found</source>
@@ -3088,45 +3071,42 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>NewspaperPreviewer</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3159,17 +3139,14 @@ Go to application website to obtain it manually.</source>
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Welcome to %1.</source>
@@ -3177,7 +3154,7 @@ version by clicking this popup notification.</source>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3185,11 +3162,11 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3200,24 +3177,21 @@ At least API level %1 is required.</source>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Empty recycle bin</source>
@@ -3229,25 +3203,22 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
     <name>ShortcutCatcher</name>
     <message>
         <source>Reset to original shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Clear current shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3255,12 +3226,12 @@ At least API level %1 is required.</source>
     <message>
         <source>%1 (category)%2%3</source>
         <extracomment>Tooltip for standard feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3271,7 +3242,7 @@ This category does not contain any nested items.</source>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>does not use auto-update</source>
@@ -3286,10 +3257,7 @@ This category does not contain any nested items.</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3298,22 +3266,22 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Fetch metadata</source>
@@ -3321,7 +3289,7 @@ Auto-update status: %5</source>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import was completely successfull.</source>
@@ -3339,11 +3307,11 @@ Auto-update status: %5</source>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
@@ -3351,7 +3319,7 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -3359,30 +3327,30 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3393,11 +3361,11 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"></translation>
+        <translation>anonym</translation>
     </message>
 </context>
 <context>
@@ -3428,11 +3396,11 @@ Ulæste nyheder: %2</translation>
     </message>
     <message>
         <source>Browse your feeds and messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays main menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Main menu</source>
@@ -3440,35 +3408,29 @@ Ulæste nyheder: %2</translation>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ToolBarEditor</name>
     <message>
         <source>Activated actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Available actions</source>
@@ -3476,7 +3438,7 @@ Ulæste nyheder: %2</translation>
     </message>
     <message>
         <source>Insert separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Insert spacer</source>
@@ -3484,38 +3446,38 @@ Ulæste nyheder: %2</translation>
     </message>
     <message>
         <source>Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrayIconMenu</name>
     <message>
         <source>Close opened modal dialogs first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3533,17 +3495,14 @@ Ulæste nyheder: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3556,11 +3515,11 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
@@ -3568,7 +3527,7 @@ Last login on: %5</source>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts
index 5431f1390..d85adbb06 100644
--- a/localization/rssguard-de_DE.ts
+++ b/localization/rssguard-de_DE.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="de_DE">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.1">
 <context>
     <name>Application</name>
     <message>
@@ -9,23 +7,23 @@
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -33,58 +31,58 @@
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseCleaner</name>
     <message>
         <source>Shrinking database file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file shrinked...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Recycle bin purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Removing old messages...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseFactory</name>
     <message>
         <source>MySQL server works as expected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No MySQL server is running in the target destination.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Access denied. Invalid username or password used.</source>
         <extracomment>Access to MySQL server was denied.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unknown error.</source>
@@ -93,30 +91,30 @@
     </message>
     <message>
         <source>MySQL/MariaDB (dedicated database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>SQLite (embedded database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DownloadItem</name>
     <message>
         <source>Ico</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Filename</source>
@@ -124,109 +122,103 @@
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select destination for downloaded file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished">Fehler: %1. {1?}</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open &amp;directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File &apos;%1&apos; is downloaded.
+        <source>File '%1' is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message>
         <source>Clean up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>bytes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>kB</source>
@@ -242,10 +234,7 @@ Click here to open parent directory.</source>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -260,26 +249,26 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FeedsImportExportModel</name>
     <message>
         <source> (category)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (feed)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -304,14 +293,11 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -319,7 +305,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update started</source>
@@ -333,15 +319,15 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -363,64 +349,64 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Not supported</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -472,46 +458,46 @@ or this functionality is not implemented yet.</source>
     <message>
         <source>About %1</source>
         <extracomment>About RSS Guard dialog title.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>PARTIALLY portable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Resources</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormAddAccount</name>
     <message>
         <source>Add new account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Name</source>
@@ -531,14 +517,14 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormBackupDatabaseSettings</name>
     <message>
         <source>Backup database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup properties</source>
@@ -558,125 +544,122 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Common name for backup files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup was created successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup name cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormDatabaseCleanup</name>
     <message>
         <source>Cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>I am ready.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown</source>
@@ -684,7 +667,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -695,7 +678,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -707,11 +690,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL</source>
@@ -719,95 +702,95 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
@@ -827,38 +810,38 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormEditFeed</name>
     <message>
         <source>Edit feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Parent category</source>
@@ -878,7 +861,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -926,23 +909,23 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed added</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -954,15 +937,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -973,7 +956,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -981,7 +964,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -993,99 +976,99 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1156,275 +1139,275 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;About application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays extra info about this application.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hides or displays the main menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open selected source articles in &amp;external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open selected messages in &amp;internal browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;next message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;previous message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Check for &amp;updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show/hide</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Feed list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Main menu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch visibility of main toolbars.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restart</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update &amp;all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category</source>
@@ -1432,70 +1415,70 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1702,7 +1685,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Parameters to executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>some keyboard shortcuts are not unique</source>
@@ -1752,7 +1735,7 @@ Disadvantages:
 &lt;li&gt;application startup and shutdown can take little longer (max. 2 seconds).&lt;/li&gt;
 &lt;/ul&gt;
 Authors of this application are NOT responsible for lost data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>in-memory database switched</source>
@@ -1900,53 +1883,53 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>You did not executed any connection test yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Launch %1 on operating system startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Message count format in feed list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enter format for count of messages displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) messages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>custom external browser is not set correctly</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar for feeds list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar for messages list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select toolbar to edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to restart now?</source>
@@ -1954,168 +1937,168 @@ You have to restart manually.</source>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executables (*)</source>
         <extracomment>File filter for external browser selection dialog.
 ----------
 File filter for external e-mail selection dialog.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Web browser &amp; e-mail &amp; proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Save all downloaded files to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select e-mail executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2278,7 +2261,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title</source>
@@ -2322,11 +2305,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed name is ok.</source>
@@ -2431,19 +2414,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Icon fetched successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No icon fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed title</source>
@@ -2463,7 +2446,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set url for your feed.</source>
@@ -2495,7 +2478,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Fetch icon from feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No metadata fetched so far.</source>
@@ -2515,38 +2498,38 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No file is selected.</source>
@@ -2554,83 +2537,83 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OPML 2.0 files (*.opml)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File is selected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were loaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Critical error occurred.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Parsing data...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
@@ -2638,19 +2621,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2712,118 +2695,118 @@ die aktuell installierte.</translation>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download new installation files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Checking for updates failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download installation file for your OS.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Installation file is not available directly.
 Go to application website to obtain it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No new update available.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot update application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot navigate to installation file. Check new installation downloads manually on project website.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloading update...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloaded successfully</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Package was downloaded successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Install update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occured</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Go to application website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2910,86 +2893,86 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Permanently deleted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>List of attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagesToolBar</name>
     <message>
         <source>Search messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Message search box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Highlight unread messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display all messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3012,15 +2995,15 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished">Zeitungsansicht</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3038,22 +3021,22 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>connection timed out</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>SSL handshake failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>proxy server connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>temporary failure</source>
@@ -3063,17 +3046,17 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>authentication failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>proxy authentication required</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>proxy server not found</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>content not found</source>
@@ -3088,49 +3071,46 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>no errors</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>NewspaperPreviewer</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3163,25 +3143,22 @@ Go to application website to obtain it manually.</source>
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3189,43 +3166,40 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RecycleBin</name>
     <message>
         <source>Recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Empty recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3233,25 +3207,22 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
     <name>ShortcutCatcher</name>
     <message>
         <source>Reset to original shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Clear current shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3259,41 +3230,38 @@ At least API level %1 is required.</source>
     <message>
         <source>%1 (category)%2%3</source>
         <extracomment>Tooltip for standard feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StandardFeed</name>
     <message>
         <source>Metadata not fetched</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>does not use auto-update</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>uses global settings</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3302,22 +3270,22 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Fetch metadata</source>
@@ -3325,37 +3293,37 @@ Auto-update status: %5</source>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import was completely successfull.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -3363,45 +3331,45 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished">Toolbar Platzhalter</translation>
+        <translation>Toolbar Platzhalter</translation>
     </message>
 </context>
 <context>
     <name>SystemFactory</name>
     <message>
         <source>New version available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3409,7 +3377,7 @@ Account ID: %1</source>
     <message>
         <source>%1
 Unread news: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3435,59 +3403,53 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Displays main menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Main menu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ToolBarEditor</name>
     <message>
         <source>Activated actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Available actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Insert separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Insert spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3495,23 +3457,23 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3526,27 +3488,24 @@ Unread news: %2</source>
     <message>
         <source>does not use auto-update</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>uses global settings</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3559,19 +3518,19 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts
index 37e6bbfa3..296d86542 100644
--- a/localization/rssguard-en_US.ts
+++ b/localization/rssguard-en_US.ts
@@ -1,285 +1,274 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="en_US">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="en_US" version="2.1">
 <context>
     <name>Application</name>
     <message>
         <source>Application is already running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseCleaner</name>
     <message>
         <source>Shrinking database file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file shrinked...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Recycle bin purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Removing old messages...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseFactory</name>
     <message>
         <source>MySQL server works as expected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No MySQL server is running in the target destination.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Access denied. Invalid username or password used.</source>
         <extracomment>Access to MySQL server was denied.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unknown error.</source>
         <extracomment>Unknown MySQL error arised.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MySQL/MariaDB (dedicated database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>SQLite (embedded database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DownloadItem</name>
     <message>
         <source>Ico</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Filename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select destination for downloaded file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open &amp;directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File &apos;%1&apos; is downloaded.
+        <source>File '%1' is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message>
         <source>Clean up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>bytes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>kB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
     <name>FeedMessageViewer</name>
     <message>
         <source>Toolbar for messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar for feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FeedsImportExportModel</name>
     <message>
         <source> (category)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (feed)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -287,1215 +276,1209 @@ Click here to open parent directory.</source>
     <message>
         <source>Title</source>
         <extracomment>Title text in the feed list header.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Titles of feeds/categories.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Counts of unread/all meesages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Root</source>
         <extracomment>Name of root item of feed list which can be seen in feed add/edit dialog.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot update all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update started</source>
         <extracomment>Text display in status bar when feed update is started.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Updated feed &apos;%1&apos;</source>
         <extracomment>Text display in status bar when particular feed is updated.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FeedsToolBar</name>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FeedsView</name>
     <message>
         <source>Cannot edit item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot delete item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Not supported</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormAbout</name>
     <message>
         <source>Information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Licenses</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>GNU GPL License (applies to RSS Guard source code)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>GNU GPL License</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>BSD License (applies to QtSingleApplication source code)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Licenses page is available only in English language.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changelog</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changelog page is available only in English language.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>License not found.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changelog not found.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&lt;b&gt;%8&lt;/b&gt;&lt;br&gt;&lt;b&gt;Version:&lt;/b&gt; %1 (build on %2 with CMake %3)&lt;br&gt;&lt;b&gt;Revision:&lt;/b&gt; %4&lt;br&gt;&lt;b&gt;Build date:&lt;/b&gt; %5&lt;br&gt;&lt;b&gt;Qt:&lt;/b&gt; %6 (compiled against %7)&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>About %1</source>
         <extracomment>About RSS Guard dialog title.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>PARTIALLY portable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Resources</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormAddAccount</name>
     <message>
         <source>Add new account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Author</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormBackupDatabaseSettings</name>
     <message>
         <source>Backup database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup properties</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Items to backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Common name for backup files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup was created successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup name cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormDatabaseCleanup</name>
     <message>
         <source>Cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>I am ready.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormEditAccount</name>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormEditFeed</name>
     <message>
         <source>Edit feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Requires authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update every</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed added</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed was not added due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormEditOwnCloudAccount</name>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormMain</name>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;View</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Tools</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Quit the application.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display settings of the application.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch fullscreen mode.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No actions available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No actions are available right now.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hides main window if it is visible and shows it if it is hidden.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hides or shows the list of feeds/categories.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Check if new update for the application is available for download.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;About application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays extra info about this application.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hides or displays the main menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open selected source articles in &amp;external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open selected messages in &amp;internal browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;next message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;previous message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Check for &amp;updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show/hide</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Feed list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Main menu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch visibility of main toolbars.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restart</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update &amp;all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1503,240 +1486,240 @@ or this functionality is not implemented yet.</source>
     <message>
         <source>General</source>
         <extracomment>General settings section.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>User interface</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon theme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Keyboard shortcuts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Language</source>
         <extracomment>Language settings section.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icons &amp;&amp; skins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tray icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Start application hidden</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Type</source>
         <extracomment>Proxy server type.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Host</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hostname or IP of your proxy server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Port</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Your username for proxy server authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Your password for proxy server authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Code</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Version</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Author</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Socks5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Http</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not supported on this platform)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tray area &amp;&amp; notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tabs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Close tabs with</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Middle mouse button single-click</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>no icon theme</source>
         <extracomment>Label for disabling icon theme.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot save settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icons</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Skins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Active skin:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected skin:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hide tab bar if just one tab is visible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Critical settings were changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp; messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some critical settings are not set. You must fix these settings in order confirm new settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Web browser executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executable parameters</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select web browser executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executables (*.*)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Opera 12 or older</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executable file of web browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Parameters to executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>some keyboard shortcuts are not unique</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>List of errors:
 %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>List of changes:
 %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>language changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>icon theme changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>skin changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use sample arguments for</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use in-memory database as the working database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Usage of in-memory working database has several advantages and pitfalls. Make sure that you are familiar with these before you turn this feature on. Advantages:
@@ -1750,1272 +1733,1272 @@ Disadvantages:
 &lt;li&gt;application startup and shutdown can take little longer (max. 2 seconds).&lt;/li&gt;
 &lt;/ul&gt;
 Authors of this application are NOT responsible for lost data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>in-memory database switched</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External web browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>WARNING: Note that switching to another data storage type will NOT copy existing your data from currently active data storage to newly selected one.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database driver</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hostname</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Right mouse button double-click</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update all feeds every</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed connection timeout</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> ms</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update all feed on application startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Data storage</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hostname of your MySQL server</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username to login with</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>data storage backend changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hostname is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hostname looks ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username looks ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password looks ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar button style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hide main window when it is minimized</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No connection test triggered so far.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that these settings are applied only on newly established connections.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>System proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Text only</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Text beside icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Text under icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Follow OS style</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Keep message selection in the middle of the message list viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You did not executed any connection test yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Launch %1 on operating system startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Message count format in feed list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enter format for count of messages displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) messages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>custom external browser is not set correctly</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar for feeds list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar for messages list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select toolbar to edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to restart now?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executables (*)</source>
         <extracomment>File filter for external browser selection dialog.
 ----------
 File filter for external e-mail selection dialog.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Web browser &amp; e-mail &amp; proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Save all downloaded files to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select e-mail executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormStandardCategoryDetails</name>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your category.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select icon for your category.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category was not added due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot edit category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category was not edited due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category name is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category name is too short.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Description is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select icon file for the category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Images (*.bmp *.jpg *.jpeg *.png *.svg *.tga)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Look in:</source>
         <extracomment>Label to describe the folder for icon file selection dialog.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category title</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set title for your category.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category description</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set description for your category.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Load icon from file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do not use icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use default icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormStandardFeedDetails</name>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select type of the standard feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select encoding of the standard feed. If you are unsure about the encoding, then select &quot;UTF-8&quot; encoding.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Description</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Fetch it now</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select icon for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Fetch metadata</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed name is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed name is too short.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Description is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select icon file for the feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Images (*.bmp *.jpg *.jpeg *.png *.svg *.tga)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Look in:</source>
         <extracomment>Label for field with icon file name textbox for selection dialog.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon name:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon type:</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed was not added due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot edit feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed was not edited due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>All metadata fetched successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed and icon metadata fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Result: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed or icon metatada not fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No metadata fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon fetched successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No icon fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed title</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set title for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed description</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set description for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set url for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set username to access the feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set password to access the feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon selection</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Load icon from file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do not use icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use default icon</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Fetch icon from feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No metadata fetched so far.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update every</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No file is selected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OPML 2.0 files (*.opml)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File is selected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were loaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Critical error occurred.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Parsing data...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormUpdate</name>
     <message>
         <source>Current release</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Available release</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Changes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown</source>
         <extracomment>Unknown release.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>List with updates was not
 downloaded successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>New release available.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This is new version which can be
 downloaded and installed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No new release available.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This release is not newer than
 currently installed one.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Check for updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download new installation files.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Checking for updates failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download installation file for your OS.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Installation file is not available directly.
 Go to application website to obtain it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No new update available.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot update application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot navigate to installation file. Check new installation downloads manually on project website.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloading update...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloaded successfully</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Package was downloaded successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Install update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occured</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Go to application website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagesModel</name>
     <message>
         <source>Id</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deleted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Important</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Url</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Author</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Created on</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Contents</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Id of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Is message read?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Is message deleted?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Is message important?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Id of feed which this message belongs to.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Url of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Author of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Creation date of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Contents of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Permanently deleted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>List of attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagesToolBar</name>
     <message>
         <source>Search messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Message search box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Highlight unread messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display all messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagesView</name>
     <message>
         <source>Context menu for messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Problem with starting external web browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External web browser could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3023,109 +3006,106 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>protocol error</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>host not found</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>connection timed out</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>SSL handshake failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>proxy server connection refused</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>temporary failure</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>authentication failed</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>proxy authentication required</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>proxy server not found</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>content not found</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown error</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>no errors</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>NewspaperPreviewer</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3158,25 +3138,22 @@ Go to application website to obtain it manually.</source>
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3184,43 +3161,40 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RecycleBin</name>
     <message>
         <source>Recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Empty recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3228,25 +3202,22 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
     <name>ShortcutCatcher</name>
     <message>
         <source>Reset to original shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Clear current shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3254,41 +3225,38 @@ At least API level %1 is required.</source>
     <message>
         <source>%1 (category)%2%3</source>
         <extracomment>Tooltip for standard feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StandardFeed</name>
     <message>
         <source>Metadata not fetched</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>does not use auto-update</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>uses global settings</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3297,106 +3265,106 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Fetch metadata</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import was completely successfull.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SystemFactory</name>
     <message>
         <source>New version available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3404,116 +3372,110 @@ Account ID: %1</source>
     <message>
         <source>%1
 Unread news: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabBar</name>
     <message>
         <source>Close this tab.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Close tab</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TabWidget</name>
     <message>
         <source>Feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Browse your feeds and messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays main menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Main menu</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ToolBarEditor</name>
     <message>
         <source>Activated actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Available actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Insert separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Insert spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrayIconMenu</name>
     <message>
         <source>Close opened modal dialogs first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3521,27 +3483,24 @@ Unread news: %2</source>
     <message>
         <source>does not use auto-update</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>uses global settings</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3554,19 +3513,19 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts
index 0ea5c22b6..e3b46c514 100644
--- a/localization/rssguard-fr_FR.ts
+++ b/localization/rssguard-fr_FR.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="fr_FR">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.1">
 <context>
     <name>Application</name>
     <message>
@@ -9,23 +7,23 @@
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -33,42 +31,42 @@
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseCleaner</name>
     <message>
         <source>Shrinking database file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file shrinked...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Recycle bin purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Removing old messages...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -93,159 +91,150 @@
     </message>
     <message>
         <source>MySQL/MariaDB (dedicated database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>SQLite (embedded database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DownloadItem</name>
     <message>
         <source>Ico</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Filename</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select destination for downloaded file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished">Erreur : %1. {1?}</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open &amp;directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File &apos;%1&apos; is downloaded.
+        <source>File '%1' is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DownloadManager</name>
     <message>
         <source>Clean up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>bytes</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>kB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>GB</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -260,11 +249,11 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -279,7 +268,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Category </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -304,14 +293,11 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -319,7 +305,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update started</source>
@@ -333,22 +319,22 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FeedsToolBar</name>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -363,64 +349,64 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Not supported</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -476,42 +462,42 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Settings type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>PARTIALLY portable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Resources</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormAddAccount</name>
     <message>
         <source>Add new account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Name</source>
@@ -531,26 +517,26 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormBackupDatabaseSettings</name>
     <message>
         <source>Backup database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup properties</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Items to backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings</source>
@@ -558,125 +544,122 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Common name for backup files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup was created successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup name cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormDatabaseCleanup</name>
     <message>
         <source>Cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>I am ready.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown</source>
@@ -684,7 +667,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -695,7 +678,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -707,11 +690,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL</source>
@@ -719,95 +702,95 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
@@ -827,38 +810,38 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormEditFeed</name>
     <message>
         <source>Edit feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Parent category</source>
@@ -930,7 +913,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed</source>
@@ -938,11 +921,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Feed added</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -954,15 +937,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -973,7 +956,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
@@ -981,7 +964,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -993,99 +976,99 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1216,35 +1199,35 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch visibility of main toolbars.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
@@ -1252,7 +1235,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restart</source>
@@ -1260,139 +1243,139 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update &amp;all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -1400,31 +1383,31 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category</source>
@@ -1436,66 +1419,66 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1938,25 +1921,25 @@ Les auteurs de cette application NE sont PAS responsable de la perte de données
     </message>
     <message>
         <source>Toolbars</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar for feeds list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar for messages list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select toolbar to edit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to restart now?</source>
@@ -1964,168 +1947,168 @@ You have to restart manually.</source>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executables (*)</source>
         <extracomment>File filter for external browser selection dialog.
 ----------
 File filter for external e-mail selection dialog.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Web browser &amp; e-mail &amp; proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Save all downloaded files to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select e-mail executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2160,7 +2143,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Edit existing category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -2192,7 +2175,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select icon file for the category</source>
@@ -2336,7 +2319,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Edit existing feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed name is ok.</source>
@@ -2352,7 +2335,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
@@ -2441,19 +2424,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Icon fetched successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No icon fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed title</source>
@@ -2505,7 +2488,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Fetch icon from feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No metadata fetched so far.</source>
@@ -2525,58 +2508,58 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No file is selected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source file</source>
@@ -2584,7 +2567,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import feeds</source>
@@ -2596,7 +2579,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File is selected.</source>
@@ -2604,27 +2587,27 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were loaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Critical error occurred.</source>
@@ -2632,15 +2615,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Parsing data...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
@@ -2648,19 +2631,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2756,23 +2739,23 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Download update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloading update...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloaded successfully</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Package was downloaded successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Install update</source>
@@ -2784,11 +2767,11 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Go to application website</source>
@@ -2799,42 +2782,42 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2921,78 +2904,78 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Permanently deleted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>List of attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagesToolBar</name>
     <message>
         <source>Search messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Message search box</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Highlight unread messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display all messages</source>
@@ -3000,11 +2983,11 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3023,15 +3006,15 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished">Vue journal</translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3103,45 +3086,42 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>NewspaperPreviewer</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3174,25 +3154,22 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3200,43 +3177,40 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RecycleBin</name>
     <message>
         <source>Recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Empty recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3244,25 +3218,22 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
     <name>ShortcutCatcher</name>
     <message>
         <source>Reset to original shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Clear current shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3275,18 +3246,18 @@ At least API level %1 is required.</source>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StandardFeed</name>
     <message>
         <source>Metadata not fetched</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>does not use auto-update</source>
@@ -3301,10 +3272,7 @@ This category does not contain any nested items.</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3313,22 +3281,22 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Fetch metadata</source>
@@ -3336,15 +3304,15 @@ Auto-update status: %5</source>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import was completely successfull.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import feeds</source>
@@ -3354,19 +3322,19 @@ Auto-update status: %5</source>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -3374,45 +3342,45 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>SystemFactory</name>
     <message>
         <source>New version available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3420,7 +3388,7 @@ Account ID: %1</source>
     <message>
         <source>%1
 Unread news: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3446,7 +3414,7 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Displays main menu.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Main menu</source>
@@ -3454,35 +3422,29 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>ToolBarEditor</name>
     <message>
         <source>Activated actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Available actions</source>
@@ -3490,39 +3452,39 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Insert separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Insert spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Separator</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3547,17 +3509,14 @@ Unread news: %2</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3570,19 +3529,19 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts
index 6bcbc154c..c5d8f54af 100644
--- a/localization/rssguard-it_IT.ts
+++ b/localization/rssguard-it_IT.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="it_IT">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.1">
 <context>
     <name>Application</name>
     <message>
@@ -9,23 +7,23 @@
     </message>
     <message>
         <source>Output directory is not writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file not copied to output directory successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings restoration was not initiated. Make sure that output directory is writable.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -33,58 +31,58 @@
     </message>
     <message>
         <source>Feed cannot be added because standard RSS/ATOM account is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseCleaner</name>
     <message>
         <source>Shrinking database file...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file shrinked...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Removing read messages...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Read messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Recycle bin purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Removing old messages...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Purging recycle bin...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Old messages purged...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>DatabaseFactory</name>
     <message>
         <source>MySQL server works as expected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No MySQL server is running in the target destination.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Access denied. Invalid username or password used.</source>
         <extracomment>Access to MySQL server was denied.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unknown error.</source>
@@ -93,23 +91,23 @@
     </message>
     <message>
         <source>MySQL/MariaDB (dedicated database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>SQLite (embedded database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected database does not exist (yet). It will be created. It&apos;s okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -124,72 +122,72 @@
     </message>
     <message>
         <source>Error opening output file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Try again</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Stop</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select destination for downloaded file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error: %1</source>
-        <translation type="unfinished">Errore: %1. {1?}</translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download directory couldn&apos;t be created</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when saving file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 (%3 per second) - %4</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>%1 of %2 - download completed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open &amp;directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open output file. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open output directory. Open it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download finished</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <source>File &apos;%1&apos; is downloaded.
+        <source>File '%1' is downloaded.
 Click here to open parent directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL: %1</source>
@@ -197,11 +195,11 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Local file: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selection of local file cancelled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -212,17 +210,11 @@ Click here to open parent directory.</source>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <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>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>bytes</source>
@@ -242,10 +234,7 @@ Click here to open parent directory.</source>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -260,26 +249,26 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Cannot cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot cleanup database, because another critical action is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FeedsImportExportModel</name>
     <message>
         <source> (category)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (feed)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -304,14 +293,11 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Starting auto-update of some feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -319,7 +305,7 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>You cannot update all items because another another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update started</source>
@@ -333,15 +319,15 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>New messages downloaded</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You can&apos;t transfer dragged item into different account, this is not supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot perform drag &amp; drop operation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -363,64 +349,64 @@ Click here to open parent directory.</source>
     </message>
     <message>
         <source>Context menu for empty space</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be deleted because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected item cannot be edited, this is not (yet?) supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deleting &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You are about to completely delete item &quot;%1&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Are you sure?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot delete &quot;%1&quot;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted because something critically failed. Submit bug report.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This item cannot be deleted, because it does not support it
 or this functionality is not implemented yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Context menu for other items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Not supported</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected account does not support adding of new feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected account does not support adding of new categories.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -467,7 +453,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&lt;b&gt;%8&lt;/b&gt;&lt;br&gt;&lt;b&gt;Version:&lt;/b&gt; %1 (build on %2 with CMake %3)&lt;br&gt;&lt;b&gt;Revision:&lt;/b&gt; %4&lt;br&gt;&lt;b&gt;Build date:&lt;/b&gt; %5&lt;br&gt;&lt;b&gt;Qt:&lt;/b&gt; %6 (compiled against %7)&lt;br&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>About %1</source>
@@ -476,23 +462,23 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Settings type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Settings file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database root path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>FULLY portable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>PARTIALLY portable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Resources</source>
@@ -500,18 +486,18 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&lt;body&gt;%5 is a (very) tiny feed reader.&lt;br&gt;&lt;br&gt;This software is distributed under the terms of GNU General Public License, version 3.&lt;br&gt;&lt;br&gt;Contacts:&lt;ul&gt;&lt;li&gt;&lt;a href=&quot;mailto://%1&quot;&gt;%1&lt;/a&gt; ~e-mail&lt;/li&gt;&lt;li&gt;&lt;a href=&quot;%2&quot;&gt;%2&lt;/a&gt; ~website&lt;/li&gt;&lt;/ul&gt;You can obtain source code for %5 from its website.&lt;br&gt;&lt;br&gt;&lt;br&gt;Copyright (C) 2011-%3 %4&lt;/body&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormAddAccount</name>
     <message>
         <source>Add new account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Details</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Name</source>
@@ -531,22 +517,22 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>This account can be added only once.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormBackupDatabaseSettings</name>
     <message>
         <source>Backup database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup properties</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Items to backup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database</source>
@@ -558,93 +544,90 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Backup name</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Common name for backup files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup was created successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup name cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup name looks okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Output directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Backup was created successfully and stored in target directory.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select destination directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good destination directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormDatabaseCleanup</name>
     <message>
         <source>Cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all messages older than</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Shrink database file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database information</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database file size</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database type</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Progress</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>I am ready.</source>
@@ -652,31 +635,31 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Database cleanup is running.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup is completed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database cleanup failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cleanup settings (all checked items are completely erased from database)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all read messages (not those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all messages from recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all starred messages (including those from recycle bin)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown</source>
@@ -684,18 +667,18 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>file: %1, data: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormEditAccount</name>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -707,11 +690,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL</source>
@@ -719,99 +702,99 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication username</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>HTTP authentication password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>FULL URL of your TT-RSS instance WITH trailing &quot;/api/&quot; string</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new Tiny Tiny RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing Tiny Tiny RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>API access on selected server is not enabled.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Entered credentials are incorrect.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Other error occurred, contact developers.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API (%1). At least API level %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected Tiny Tiny RSS server is running unsupported version of API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay, running with API level %1, while at least API level %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tiny Tiny RSS server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct Tiny Tiny RSS API endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is empty.</source>
@@ -819,7 +802,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is empty.</source>
@@ -827,46 +810,46 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that at least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL should end with &quot;/api/&quot;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormEditFeed</name>
     <message>
         <source>Edit feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL</source>
@@ -878,11 +861,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Requires authentication</source>
@@ -898,7 +881,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is empty.</source>
@@ -906,7 +889,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is empty.</source>
@@ -914,7 +897,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update every</source>
@@ -922,11 +905,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing feed</source>
@@ -938,11 +921,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Feed added</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed was added, triggering sync in now.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed</source>
@@ -954,15 +937,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -973,15 +956,15 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Force execution of server-side update when updating feeds from RSS Guard</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -993,99 +976,99 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Leaving this option on causes that updates of feeds will be probably much slower and may time-out often.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that at least version %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username for your TT-RSS account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL of your ownCloud server, without any API path</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No test done yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Here, results of connection test are shown.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Edit existing ownCloud News account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version (%1). At least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Selected ownCloud News server is running unsupported version.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay, running with version %1, while at least version %2 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OwnCloud News server is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Network error, have you entered correct ownCloud endpoint and password?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Unspecified error, did you enter correct URL?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL cannot be empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>URL is okay.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1120,7 +1103,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Switch &amp;importance of selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Quit the application.</source>
@@ -1156,7 +1139,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;About application</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays extra info about this application.</source>
@@ -1172,31 +1155,31 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark &amp;selected messages as &amp;unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open selected source articles in &amp;external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open selected messages in &amp;internal browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;next message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;previous message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Check for &amp;updates</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show/hide</source>
@@ -1204,11 +1187,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Fullscreen</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Feed list</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Main menu</source>
@@ -1216,7 +1199,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Switch visibility of main &amp;window</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open external browser</source>
@@ -1224,7 +1207,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Cannot open external browser. Navigate to application website manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Toolbars</source>
@@ -1236,163 +1219,163 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Feed/message list headers</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a &amp;bug (GitHub)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Report a bug (BitBucket)...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Donate via PayPal</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display &amp;wiki</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restart</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Backup database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message list layout orientation</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Send selected message via e-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Cleanup database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add &amp;new item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update &amp;all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Update &amp;selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as read.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark selected items as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark all messages (without message filters) from selected items as unread.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean selected items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from selected items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Mark all items as &amp;read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Marks all messages in all items read. This does not take message filters into account.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>View selected items in &amp;newspaper mode</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Displays all messages from selected item in a new &quot;newspaper mode&quot; tab. Note that messages are not set as read automatically.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Clean all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Deletes all messages from all items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;next item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select &amp;previous item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Show only unread items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Expand/collapse selected item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore selected messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No possible actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Recycle bin(s)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Restore all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Empty all recycle bins</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select next &amp;unread message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -1400,31 +1383,31 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>&amp;Accounts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Add new account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Status bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Edit selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Delete selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new feed into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category into selected account</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add new category</source>
@@ -1436,66 +1419,66 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Stop running update</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No actions possible</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormRestoreDatabaseSettings</name>
     <message>
         <source>Restore database/settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restart</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restoration was initiated. Restart to proceed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You need to restart application for restoration process to finish.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Select directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database and/or settings were not copied to restoration directory successully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select source directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Good source directory is specified.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1605,7 +1588,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Tray area &amp;&amp; notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Tabs</source>
@@ -1617,11 +1600,11 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Middle mouse button single-click</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open new tabs with left mouse button double-click on tab bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>no icon theme</source>
@@ -1666,7 +1649,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Some critical settings are not set. You must fix these settings in order confirm new settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Messages</source>
@@ -1682,7 +1665,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Note that &quot;%1&quot; (without quotation marks) is placeholder for URL of selected message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select web browser executable</source>
@@ -1738,7 +1721,7 @@ or this functionality is not implemented yet.</source>
     </message>
     <message>
         <source>Use in-memory database as the working database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Usage of in-memory working database has several advantages and pitfalls. Make sure that you are familiar with these before you turn this feature on. Advantages:
@@ -1752,11 +1735,11 @@ Disadvantages:
 &lt;li&gt;application startup and shutdown can take little longer (max. 2 seconds).&lt;/li&gt;
 &lt;/ul&gt;
 Authors of this application are NOT responsible for lost data.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>in-memory database switched</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External web browser</source>
@@ -1764,7 +1747,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>WARNING: Note that switching to another data storage type will NOT copy existing your data from currently active data storage to newly selected one.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Database driver</source>
@@ -1776,11 +1759,11 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Test setup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Right mouse button double-click</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update all feeds every</source>
@@ -1792,7 +1775,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Connection timeout is time interval which is reserved for downloading new messages for the feed. If this time interval elapses, then download process is aborted.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> ms</source>
@@ -1820,7 +1803,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>data storage backend changed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Hostname is empty.</source>
@@ -1856,7 +1839,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>No connection test triggered so far.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that these settings are applied only on newly established connections.</source>
@@ -1896,11 +1879,11 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Keep message selection in the middle of the message list viewport</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>You did not executed any connection test yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Launch %1 on operating system startup</source>
@@ -1908,7 +1891,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;If unchecked, then default system-wide web browser is used.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds &amp;&amp; categories</source>
@@ -1920,7 +1903,7 @@ Authors of this application are NOT responsible for lost data.</source>
     </message>
     <message>
         <source>Enter format for count of messages displayed next to each feed/category in feed list. Use &quot;%all&quot; and &quot;%unread&quot; strings which are placeholders for the actual count of all (or unread) messages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>custom external browser is not set correctly</source>
@@ -1946,7 +1929,7 @@ Authors of this application are NOT responsible for lost data.</source>
         <source>Some critical settings were changed and will be applied after the application gets restarted. 
 
 You have to restart manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to restart now?</source>
@@ -1954,179 +1937,179 @@ You have to restart manually.</source>
     </message>
     <message>
         <source>Check for updates on application startup</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom date/time format (overrides format loaded from active localization)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executables (*)</source>
         <extracomment>File filter for external browser selection dialog.
 ----------
 File filter for external e-mail selection dialog.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove all read messages from all feeds on application exit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory for downloaded files</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Ask for each individual downloaded file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target directory where all downloaded files are saved</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Browse</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select downloads target directory</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Show password</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Web browser &amp; e-mail &amp; proxy</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remove junk Trolltech registry key (HKCU\Software\Trolltech) when application quits (Use at your own risk!)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom external web browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Use custom external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail client executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Executable file of e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Placeholders:
  • %1 - title of selected message,
  • %2 - body of selected message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Save all downloaded files to</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select e-mail executable</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mozilla Thunderbird</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database which you have full access to.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Working database is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>(Tray icon is not available.)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Internal message browser fonts</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Note that speed of used MySQL server and latency of used connection medium HEAVILY influences the final performance of this application. Using slow database connections leads to bad performance when browsing feeds or messages.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>E-mail</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormStandardCategoryDetails</name>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your category.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title</source>
@@ -2158,7 +2141,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category was not added due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot edit category</source>
@@ -2166,7 +2149,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Category was not edited due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Category name is ok.</source>
@@ -2182,7 +2165,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select icon file for the category</source>
@@ -2203,7 +2186,7 @@ File filter for external e-mail selection dialog.</extracomment>
     <message>
         <source>Look in:</source>
         <extracomment>Label to describe the folder for icon file selection dialog.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon name:</source>
@@ -2250,11 +2233,11 @@ File filter for external e-mail selection dialog.</extracomment>
     <name>FormStandardFeedDetails</name>
     <message>
         <source>Parent category</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Type</source>
@@ -2266,11 +2249,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Encoding</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select encoding of the standard feed. If you are unsure about the encoding, then select &quot;UTF-8&quot; encoding.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update</source>
@@ -2278,7 +2261,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Select the auto-update strategy for this feed. Default auto-update strategy means that the feed will be update in time intervals set in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Title</source>
@@ -2306,7 +2289,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Some feeds require authentication, including GMail feeds. BASIC, NTLM-2 and DIGEST-MD5 authentication schemes are supported.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username</source>
@@ -2342,11 +2325,11 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>The description is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Username is empty.</source>
@@ -2354,7 +2337,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Password is ok or it is not needed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Password is empty.</source>
@@ -2379,7 +2362,7 @@ File filter for external e-mail selection dialog.</extracomment>
     <message>
         <source>Look in:</source>
         <extracomment>Label for field with icon file name textbox for selection dialog.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon name:</source>
@@ -2431,19 +2414,19 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Icon fetched successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon metadata fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Icon metatada not fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No icon fetched.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed title</source>
@@ -2463,7 +2446,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Full feed url including scheme</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Set url for your feed.</source>
@@ -2495,15 +2478,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Fetch icon from feed</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No metadata fetched so far.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update using global interval</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Auto-update every</source>
@@ -2511,146 +2494,146 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Do not auto-update at all</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Requires HTTP authentication</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is ok.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL does not meet standard pattern. Does your URL start with &quot;http://&quot; or &quot;https://&quot; prefix.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The URL is empty.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>FormStandardImportExport</name>
     <message>
         <source>&amp;Select file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Check all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Uncheck all items</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Operation results</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No file is selected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No operation executed yet.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Destination file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Source file</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Target feeds &amp;&amp; categories</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>OPML 2.0 files (*.opml)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select file for feeds export</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File is selected.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select file for feeds import</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open source file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were loaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error, file is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occurred. File is not well-formed. Select another file.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feeds were exported successfully.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Critical error occurred.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Parsing data...</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot write into destination file: &apos;%1&apos;.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Root node</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select parent item for your feed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>TXT files [one URL per line] (*.txt)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Get online metadata</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Metadata for your feeds can be fetched online. Note that the action could take several minutes, depending on number of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to fetch feed metadata online?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2729,7 +2712,7 @@ correntemente installato.</translation>
     <message>
         <source>Installation file is not available directly.
 Go to application website to obtain it manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No new update available.</source>
@@ -2741,7 +2724,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Cannot navigate to installation file. Check new installation downloads manually on project website.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download update</source>
@@ -2749,7 +2732,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Downloaded %1% (update size is %2 kB).</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Downloading update...</source>
@@ -2769,61 +2752,61 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Error occured</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error occured during downloading of the package.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot launch external updater. Update application manually.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Go to application website</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>IOFactory</name>
     <message>
         <source>Cannot open file &apos;%1&apos; for reading.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot open file &apos;%1&apos; for writting.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2910,51 +2893,51 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Permanently deleted</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Is message permanently deleted from recycle bin?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Attachments</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>List of attachments.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Loading of messages failed, maybe messages could not be downloaded.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Loading of messages from item &apos;%1&apos; failed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Account ID of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom ID of the message</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Custom hash of the message.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2969,19 +2952,19 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Menu for highlighting messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>No extra highlighting</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Highlight unread messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Highlight important messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Display all messages</source>
@@ -2989,7 +2972,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Message highlighter</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3012,15 +2995,15 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Problem with starting external e-mail client</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>External e-mail client could not be started.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished">Modalità giornale</translation>
+        <translation>Modalità giornale</translation>
     </message>
 </context>
 <context>
@@ -3088,49 +3071,46 @@ Go to application website to obtain it manually.</source>
     <message>
         <source>no errors</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>access to content was denied</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>connection timed out or was cancelled</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>NewspaperPreviewer</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>OwnCloudServiceRoot</name>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3163,25 +3143,22 @@ Go to application website to obtain it manually.</source>
         <source>
 
 + %n other feeds.</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Welcome to %1.
 
 Please, check NEW stuff included in this
 version by clicking this popup notification.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Welcome to %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Load initial set of feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This service offers integration with Tiny Tiny RSS.
@@ -3189,43 +3166,40 @@ version by clicking this popup notification.</source>
 Tiny Tiny RSS is an open source web-based news feed (RSS/Atom) reader and aggregator, designed to allow you to read news from any location, while feeling as close to a real desktop application as possible.
 
 At least API level %1 is required.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>The News app is an RSS/Atom feed aggregator. It is part of ownCloud suite. This plugin implements %1 API.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>RecycleBin</name>
     <message>
         <source>Recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Recycle bin contains all deleted messages from all feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Recycle bin
 
 %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Restore recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Empty recycle bin</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3233,10 +3207,7 @@ At least API level %1 is required.</source>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
 </context>
 <context>
@@ -3251,7 +3222,7 @@ At least API level %1 is required.</source>
     </message>
     <message>
         <source>Click and hit new shortcut.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3259,23 +3230,23 @@ At least API level %1 is required.</source>
     <message>
         <source>%1 (category)%2%3</source>
         <extracomment>Tooltip for standard feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>
 This category does not contain any nested items.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StandardFeed</name>
     <message>
         <source>Metadata not fetched</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Metadata was not fetched because: %1.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>does not use auto-update</source>
@@ -3290,10 +3261,7 @@ This category does not contain any nested items.</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3302,22 +3270,22 @@ Network status: %6
 Encoding: %4
 Auto-update status: %5</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StandardServiceRoot</name>
     <message>
         <source>This is obligatory service account for standard RSS/RDF/ATOM feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Do you want to load initial set of feeds?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Error when loading initial feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Fetch metadata</source>
@@ -3325,37 +3293,37 @@ Auto-update status: %5</source>
     </message>
     <message>
         <source>Import successfull, but some feeds/categories were not imported due to error.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import was completely successfull.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Export feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Import feeds</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This is service account for standard RSS/RDF/ATOM feeds.
 
 Account ID: %1</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>This new account does not include any feeds. You can now add default set of feeds.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add category</source>
@@ -3363,26 +3331,26 @@ Account ID: %1</source>
     </message>
     <message>
         <source>Cannot add category because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>StatusBar</name>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3393,15 +3361,15 @@ Account ID: %1</source>
     <name>SystemFactory</name>
     <message>
         <source>New version available</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Click the bubble for more information.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>anonymous</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3409,7 +3377,7 @@ Account ID: %1</source>
     <message>
         <source>%1
 Unread news: %2</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3443,28 +3411,22 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Downloads</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3495,30 +3457,30 @@ Unread news: %2</source>
     </message>
     <message>
         <source>Move action up</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Move action down</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Add selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete selected action</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Delete all actions</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>TrayIconMenu</name>
     <message>
         <source>Close opened modal dialogs first.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3536,17 +3498,14 @@ Unread news: %2</source>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>%1%2
 
 Auto-update status: %3</source>
         <extracomment>Tooltip for feed.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3559,19 +3518,19 @@ Username: %1
 Server: %2
 Last error: %4
 Last login on: %5</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Sync in</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add item</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot add feed because another critical operation is ongoing.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts
index a902272b4..babe82fb7 100644
--- a/localization/rssguard-nl_NL.ts
+++ b/localization/rssguard-nl_NL.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="nl_NL">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.1">
 <context>
     <name>Application</name>
     <message>
@@ -106,11 +104,11 @@ Gelezen berichten gewist...</translation>
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"></translation>
+        <translation>MySQL database is niet beschikbaar</translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kan geen gebruik maken van MySQL opslag, het is niet beschikbaar. %1 switch nu over naar de SQLite database. Start je MySQL server en maak aanpassingen in de programma-instellingen.</translation>
     </message>
 </context>
 <context>
@@ -188,7 +186,7 @@ Gelezen berichten gewist...</translation>
         <translation>Download klaar</translation>
     </message>
     <message>
-        <source>File &apos;%1&apos; is downloaded.
+        <source>File '%1' is downloaded.
 Click here to open parent directory.</source>
         <translation>Bestand &apos;%1&apos; is klaar
 Klik hier om map te openen.</translation>
@@ -214,17 +212,11 @@ Klik hier om map te openen.</translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n resterende minuut</numerusform>
-            <numerusform>%n resterende minuten</numerusform>
-        </translation>
+        <translation><numerusform>%n resterende minuut</numerusform><numerusform>%n resterende minuten</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n resterende seconde</numerusform>
-            <numerusform>%n resterende seconden</numerusform>
-        </translation>
+        <translation><numerusform>%n resterende seconde</numerusform><numerusform>%n resterende seconden</numerusform></translation>
     </message>
     <message>
         <source>bytes</source>
@@ -244,10 +236,7 @@ Klik hier om map te openen.</translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation>
-            <numerusform>Dowloading %n bestand...</numerusform>
-            <numerusform>Downloading %n bestanden...</numerusform>
-        </translation>
+        <translation><numerusform>Dowloading %n bestand...</numerusform><numerusform>Downloading %n bestanden...</numerusform></translation>
     </message>
 </context>
 <context>
@@ -310,10 +299,7 @@ Klik hier om map te openen.</translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation>
-            <numerusform>Auto-update van %n feed.</numerusform>
-            <numerusform>Auto-update van %n feeds.</numerusform>
-        </translation>
+        <translation><numerusform>Auto-update van %n feed.</numerusform><numerusform>Auto-update van %n feeds.</numerusform></translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -624,10 +610,7 @@ of deze functie bestaat nog niet.</translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation>
-            <numerusform> dag</numerusform>
-            <numerusform> dagen</numerusform>
-        </translation>
+        <translation><numerusform> dag</numerusform><numerusform> dagen</numerusform></translation>
     </message>
     <message>
         <source>Shrink database file</source>
@@ -2109,31 +2092,31 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Onthoud de geopende browser tabbladen</translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Statusbalk</translation>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2818,31 +2801,31 @@ Ga naar RRSguard website en download het handmatig.</translation>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3039,7 +3022,7 @@ Ga naar RRSguard website en download het handmatig.</translation>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished">Krantweergave</translation>
+        <translation>Krantweergave</translation>
     </message>
 </context>
 <context>
@@ -3120,29 +3103,26 @@ Ga naar RRSguard website en download het handmatig.</translation>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>onbekende inhoud</translation>
     </message>
 </context>
 <context>
     <name>NewspaperPreviewer</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3182,14 +3162,11 @@ Ga naar RRSguard website en download het handmatig.</translation>
         <source>
 
 + %n other feeds.</source>
-        <translation>
-            <numerusform>
+        <translation><numerusform>
 
-+ %n andere feed.</numerusform>
-            <numerusform>
++ %n andere feed.</numerusform><numerusform>
 
-+ %n andere feeds.</numerusform>
-        </translation>
++ %n andere feeds.</numerusform></translation>
     </message>
     <message>
         <source>Welcome to %1.
@@ -3238,10 +3215,7 @@ Een API niveau van tenminste %1 is vereist.</translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation>
-            <numerusform>%n verwijderde bericht(en).</numerusform>
-            <numerusform>%n verwijderde bericht(en).</numerusform>
-        </translation>
+        <translation><numerusform>%n verwijderde bericht(en).</numerusform><numerusform>%n verwijderde bericht(en).</numerusform></translation>
     </message>
     <message>
         <source>Recycle bin
@@ -3265,10 +3239,7 @@ Een API niveau van tenminste %1 is vereist.</translation>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation>
-            <numerusform>%n ongelezen bericht.</numerusform>
-            <numerusform>%n ongelezen berichten.</numerusform>
-        </translation>
+        <translation><numerusform>%n ongelezen bericht.</numerusform><numerusform>%n ongelezen berichten.</numerusform></translation>
     </message>
 </context>
 <context>
@@ -3323,10 +3294,7 @@ Deze categorie bevat geen nested items.</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation>
-            <numerusform>gebruik specifieke instellingen (%n minuut voor volgende automatische update)</numerusform>
-            <numerusform>gebruik specifieke instellingen (%n minuten voor volgende automatische update)</numerusform>
-        </translation>
+        <translation><numerusform>gebruik specifieke instellingen (%n minuut voor volgende automatische update)</numerusform><numerusform>gebruik specifieke instellingen (%n minuten voor volgende automatische update)</numerusform></translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3409,19 +3377,19 @@ Account ID: %1</translation>
     <name>StatusBar</name>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Feed update progresbalk</translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"></translation>
+        <translation>Feed update label</translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestandsdownload progresbar</translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"></translation>
+        <translation>Bestandsdownload label</translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3491,21 +3459,15 @@ Ongelezen nieuws: %2</translation>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3577,10 +3539,7 @@ Ongelezen nieuws: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation>
-            <numerusform>gebruik specifieke instellingen (%n minuut voor de volgende auto-update)</numerusform>
-            <numerusform>gebruik specifieke instellingen (%n minuten voor de volgende auto-update)</numerusform>
-        </translation>
+        <translation><numerusform>gebruik specifieke instellingen (%n minuut voor de volgende auto-update)</numerusform><numerusform>gebruik specifieke instellingen (%n minuten voor de volgende auto-update)</numerusform></translation>
     </message>
     <message>
         <source>%1%2
@@ -3623,4 +3582,4 @@ Laatste login: %5</translation>
         <translation>Kan geen feed toevoegen omdat een andere kritieke operatie aan de gang is.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/localization/rssguard-pt_BR.ts b/localization/rssguard-pt_BR.ts
index db35d7796..8722da266 100644
--- a/localization/rssguard-pt_BR.ts
+++ b/localization/rssguard-pt_BR.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="pt_BR">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1">
 <context>
     <name>Application</name>
     <message>
@@ -105,11 +103,11 @@
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"></translation>
+        <translation>Banco da dados MySQL não disponível</translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>O %1 não pode usar o armazenamento MySQL, ele não está disponível. O %1 irá alterar para o banco de dados SQLite. Inicie seu servidor MySQL e faça os ajustes nas configurações do aplicativo.</translation>
     </message>
 </context>
 <context>
@@ -187,7 +185,7 @@
         <translation>Download concluído</translation>
     </message>
     <message>
-        <source>File &apos;%1&apos; is downloaded.
+        <source>File '%1' is downloaded.
 Click here to open parent directory.</source>
         <translation>Arquivo &apos;%1&apos; foi baixado.
 Clique para abrir a pasta de destino.</translation>
@@ -213,17 +211,11 @@ Clique para abrir a pasta de destino.</translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minuto restante</numerusform>
-            <numerusform>%n minutos restantes</numerusform>
-        </translation>
+        <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>
+        <translation><numerusform>%n segundo restante</numerusform><numerusform>%n segundos restantes</numerusform></translation>
     </message>
     <message>
         <source>bytes</source>
@@ -243,10 +235,7 @@ Clique para abrir a pasta de destino.</translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation>
-            <numerusform>Baixando %n arquivo...</numerusform>
-            <numerusform>Baixando %n arquivos...</numerusform>
-        </translation>
+        <translation><numerusform>Baixando %n arquivo...</numerusform><numerusform>Baixando %n arquivos...</numerusform></translation>
     </message>
 </context>
 <context>
@@ -309,10 +298,7 @@ Clique para abrir a pasta de destino.</translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation>
-            <numerusform>%n feed será atualizado automaticamente.</numerusform>
-            <numerusform>%n feeds serão atualizados automaticamente.</numerusform>
-        </translation>
+        <translation><numerusform>%n feed será atualizado automaticamente.</numerusform><numerusform>%n feeds serão atualizados automaticamente.</numerusform></translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -623,10 +609,7 @@ ou esta função ainda não foi implementada.</translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation>
-            <numerusform>%n dia</numerusform>
-            <numerusform>%n dias</numerusform>
-        </translation>
+        <translation><numerusform>%n dia</numerusform><numerusform>%n dias</numerusform></translation>
     </message>
     <message>
         <source>Shrink database file</source>
@@ -2107,31 +2090,31 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Lembrar abas abertas do navegador</translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de status</translation>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2816,31 +2799,31 @@ Vá até o site do aplicativo para obter manualmente.</translation>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3037,7 +3020,7 @@ Vá até o site do aplicativo para obter manualmente.</translation>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished">Visualização da publicação</translation>
+        <translation>Visualização da publicação</translation>
     </message>
 </context>
 <context>
@@ -3118,29 +3101,26 @@ Vá até o site do aplicativo para obter manualmente.</translation>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>conteúdo desconhecido</translation>
     </message>
 </context>
 <context>
     <name>NewspaperPreviewer</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3180,14 +3160,11 @@ Vá até o site do aplicativo para obter manualmente.</translation>
         <source>
 
 + %n other feeds.</source>
-        <translation>
-            <numerusform>
+        <translation><numerusform>
 
-+ %n outro feed.</numerusform>
-            <numerusform>
++ %n outro feed.</numerusform><numerusform>
 
-+ %n outros feeds.</numerusform>
-        </translation>
++ %n outros feeds.</numerusform></translation>
     </message>
     <message>
         <source>Welcome to %1.
@@ -3236,10 +3213,7 @@ Pelo menos o API nível %1 é necessário.</translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation>
-            <numerusform>%n mensagem excluída.</numerusform>
-            <numerusform>%n mensagens excluídas.</numerusform>
-        </translation>
+        <translation><numerusform>%n mensagem excluída.</numerusform><numerusform>%n mensagens excluídas.</numerusform></translation>
     </message>
     <message>
         <source>Recycle bin
@@ -3263,10 +3237,7 @@ Pelo menos o API nível %1 é necessário.</translation>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation>
-            <numerusform>%n mensagem não lida.</numerusform>
-            <numerusform>%n mensagem(ns) não lidas.</numerusform>
-        </translation>
+        <translation><numerusform>%n mensagem não lida.</numerusform><numerusform>%n mensagem(ns) não lidas.</numerusform></translation>
     </message>
 </context>
 <context>
@@ -3321,10 +3292,7 @@ Esta categoria nenhum possui itens aninhados.</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation>
-            <numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform>
-            <numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform>
-        </translation>
+        <translation><numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform><numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform></translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3407,19 +3375,19 @@ ID da Conta: %1</translation>
     <name>StatusBar</name>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de progresso de atualização de feeds</translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"></translation>
+        <translation>Rótulo da atualização de feeds</translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Barra de progresso do download de arquivos</translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"></translation>
+        <translation>Rótulo do download de arquivos</translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3488,21 +3456,15 @@ Notícias não lidas: %2</translation>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3574,10 +3536,7 @@ Notícias não lidas: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation>
-            <numerusform>usa configurações específicas (%n minuto para a próxima atualização automática)</numerusform>
-            <numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform>
-        </translation>
+        <translation><numerusform>usa configurações específicas (%n minuto para a próxima atualização automática)</numerusform><numerusform>usa configurações específicas (%n minuto(s) para a próxima atualização automática)</numerusform></translation>
     </message>
     <message>
         <source>%1%2
@@ -3620,4 +3579,4 @@ Servidor: %2
         <translation>Não é possível adicionar feeds porque outra operação crítica está em curso.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file
diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts
index 49b8a8b43..7424e362a 100644
--- a/localization/rssguard-sv_SE.ts
+++ b/localization/rssguard-sv_SE.ts
@@ -1,6 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE TS>
-<TS version="2.1" language="sv_SE">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv_SE" version="2.1">
 <context>
     <name>Application</name>
     <message>
@@ -105,11 +103,11 @@
     </message>
     <message>
         <source>MySQL database not available</source>
-        <translation type="unfinished"></translation>
+        <translation>MySQL databas inte tillgänglig</translation>
     </message>
     <message>
         <source>%1 cannot use MySQL storage, it is not available. %1 is now switching to SQLite database. Start your MySQL server and make adjustments in application settings.</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 kan inte använda MySQL-lagringen, den är inte tillgänglig. %1 växlar nu till SQLite databas. Starta din MySQL-server och justera programinställningarna.</translation>
     </message>
 </context>
 <context>
@@ -187,7 +185,7 @@
         <translation>Nedladdning slutförd</translation>
     </message>
     <message>
-        <source>File &apos;%1&apos; is downloaded.
+        <source>File '%1' is downloaded.
 Click here to open parent directory.</source>
         <translation>Filen &apos;%1&apos; är nedlladdad.
 Klicka här för att öppna målmappen.</translation>
@@ -213,17 +211,11 @@ Klicka här för att öppna målmappen.</translation>
     </message>
     <message numerus="yes">
         <source>%n minutes remaining</source>
-        <translation>
-            <numerusform>%n minut kvar</numerusform>
-            <numerusform>%n minuter kvar</numerusform>
-        </translation>
+        <translation><numerusform>%n minut kvar</numerusform><numerusform>%n minuter kvar</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n seconds remaining</source>
-        <translation>
-            <numerusform>%n sekund kvar</numerusform>
-            <numerusform>%n sekunder kvar</numerusform>
-        </translation>
+        <translation><numerusform>%n sekund kvar</numerusform><numerusform>%n sekunder kvar</numerusform></translation>
     </message>
     <message>
         <source>bytes</source>
@@ -243,10 +235,7 @@ Klicka här för att öppna målmappen.</translation>
     </message>
     <message numerus="yes">
         <source>Downloading %n file(s)...</source>
-        <translation>
-            <numerusform>Laddar ner %n fil...</numerusform>
-            <numerusform>Laddar ner %n filer...</numerusform>
-        </translation>
+        <translation><numerusform>Laddar ner %n fil...</numerusform><numerusform>Laddar ner %n filer...</numerusform></translation>
     </message>
 </context>
 <context>
@@ -309,10 +298,7 @@ Klicka här för att öppna målmappen.</translation>
     </message>
     <message numerus="yes">
         <source>I will auto-update %n feed(s).</source>
-        <translation>
-            <numerusform>Jag uppdaterar %n flöde automatiskt</numerusform>
-            <numerusform>Jag uppdaterar %n flöden automatiskt</numerusform>
-        </translation>
+        <translation><numerusform>Jag uppdaterar %n flöde automatiskt</numerusform><numerusform>Jag uppdaterar %n flöden automatiskt</numerusform></translation>
     </message>
     <message>
         <source>Cannot update all items</source>
@@ -623,10 +609,7 @@ att funktionen inte är implementerad än.</translation>
     </message>
     <message numerus="yes">
         <source> day(s)</source>
-        <translation>
-            <numerusform>dag</numerusform>
-            <numerusform>dagar</numerusform>
-        </translation>
+        <translation><numerusform>dag</numerusform><numerusform>dagar</numerusform></translation>
     </message>
     <message>
         <source>Shrink database file</source>
@@ -2108,31 +2091,31 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
+        <translation>Kom ihåg öppnade webbläsarflikar</translation>
     </message>
     <message>
         <source>Statusbar</source>
-        <translation type="unfinished"></translation>
+        <translation>Statusfält</translation>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -2816,31 +2799,31 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3037,7 +3020,7 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished">Tidningsvy</translation>
+        <translation>Tidningsvy</translation>
     </message>
 </context>
 <context>
@@ -3118,29 +3101,26 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
     <message>
         <source>unknown content</source>
         <extracomment>Network status.</extracomment>
-        <translation type="unfinished"></translation>
+        <translation>okänt innehåll</translation>
     </message>
 </context>
 <context>
     <name>NewspaperPreviewer</name>
     <message>
         <source>Form</source>
-        <translation type="unfinished"></translation>
+        <translation>Format</translation>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3180,12 +3160,9 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
         <source>
 
 + %n other feeds.</source>
-        <translation>
-            <numerusform>+ %n annat flöde.</numerusform>
-            <numerusform>
+        <translation><numerusform>+ %n annat flöde.</numerusform><numerusform>
 
-+ %n andra flöden.</numerusform>
-        </translation>
++ %n andra flöden.</numerusform></translation>
     </message>
     <message>
         <source>Welcome to %1.
@@ -3234,10 +3211,7 @@ Minst API-nivå %1 krävs.</translation>
     </message>
     <message numerus="yes">
         <source>%n deleted message(s).</source>
-        <translation>
-            <numerusform>%n borttaget meddelande.</numerusform>
-            <numerusform>%n borttagna meddelanden.</numerusform>
-        </translation>
+        <translation><numerusform>%n borttaget meddelande.</numerusform><numerusform>%n borttagna meddelanden.</numerusform></translation>
     </message>
     <message>
         <source>Recycle bin
@@ -3261,10 +3235,7 @@ Minst API-nivå %1 krävs.</translation>
     <message numerus="yes">
         <source>%n unread message(s).</source>
         <extracomment>Tooltip for &quot;unread&quot; column of feed list.</extracomment>
-        <translation>
-            <numerusform>%n oläst meddelande.</numerusform>
-            <numerusform>%n olästa meddelanden.</numerusform>
-        </translation>
+        <translation><numerusform>%n oläst meddelande.</numerusform><numerusform>%n olästa meddelanden.</numerusform></translation>
     </message>
 </context>
 <context>
@@ -3319,10 +3290,7 @@ Denna kategori innehåller inga objekt.</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation>
-            <numerusform>använder specifika inställningar (%n minut till nästa autouppdatering)</numerusform>
-            <numerusform>använder specifika inställningar (%n minuter till nästa autouppdatering)</numerusform>
-        </translation>
+        <translation><numerusform>använder specifika inställningar (%n minut till nästa autouppdatering)</numerusform><numerusform>använder specifika inställningar (%n minuter till nästa autouppdatering)</numerusform></translation>
     </message>
     <message>
         <source>%1 (%2)%3
@@ -3405,19 +3373,19 @@ Konto-ID: %1</translation>
     <name>StatusBar</name>
     <message>
         <source>Feed update progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Förloppsindikator för flödesuppdatering</translation>
     </message>
     <message>
         <source>Feed update label</source>
-        <translation type="unfinished"></translation>
+        <translation>Flödesuppdateringsetikett</translation>
     </message>
     <message>
         <source>File download progress bar</source>
-        <translation type="unfinished"></translation>
+        <translation>Förloppsindikator för nedladdning</translation>
     </message>
     <message>
         <source>File download label</source>
-        <translation type="unfinished"></translation>
+        <translation>Nedladdningsetikett</translation>
     </message>
     <message>
         <source>Toolbar spacer</source>
@@ -3486,21 +3454,15 @@ Olästa nyheter: %2</translation>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished">
-            <numerusform></numerusform>
-            <numerusform></numerusform>
-        </translation>
+        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -3572,10 +3534,7 @@ Olästa nyheter: %2</translation>
     <message numerus="yes">
         <source>uses specific settings (%n minute(s) to next auto-update)</source>
         <extracomment>Describes feed auto-update status.</extracomment>
-        <translation>
-            <numerusform>använder specifika inställningar (%n minut till nästa automatiska uppdatering)</numerusform>
-            <numerusform>använder specifika inställningar (%n minuter till nästa automatiska uppdatering)</numerusform>
-        </translation>
+        <translation><numerusform>använder specifika inställningar (%n minut till nästa automatiska uppdatering)</numerusform><numerusform>använder specifika inställningar (%n minuter till nästa automatiska uppdatering)</numerusform></translation>
     </message>
     <message>
         <source>%1%2
@@ -3618,4 +3577,4 @@ Senast inloggad: %5</translation>
         <translation>Kan inte lägga till flöde, eftersom en annan kritisk åtgärd pågår.</translation>
     </message>
 </context>
-</TS>
+</TS>
\ No newline at end of file

From c0ef307129764d215fda7624bdee0978b9b96648 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 3 Apr 2016 10:06:35 +0200
Subject: [PATCH 30/31] Remove stuff.

---
 src/gui/dialogs/formsettings.ui | 9 +--------
 src/gui/messagepreviewer.cpp    | 3 ---
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/src/gui/dialogs/formsettings.ui b/src/gui/dialogs/formsettings.ui
index b27f8810b..8c2271efc 100755
--- a/src/gui/dialogs/formsettings.ui
+++ b/src/gui/dialogs/formsettings.ui
@@ -88,7 +88,7 @@
    <item row="0" column="1">
     <widget class="QStackedWidget" name="m_stackedSettings">
      <property name="currentIndex">
-      <number>6</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="m_pageGeneral">
       <layout class="QFormLayout" name="formLayout_5">
@@ -125,13 +125,6 @@
          </property>
         </widget>
        </item>
-       <item row="3" column="0">
-        <widget class="QCheckBox" name="m_checkRememberOpenedTabs">
-         <property name="text">
-          <string>Remember opened web browser tabs</string>
-         </property>
-        </widget>
-       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="m_pageDataStorage">
diff --git a/src/gui/messagepreviewer.cpp b/src/gui/messagepreviewer.cpp
index 89e3a5b16..4bb10399d 100644
--- a/src/gui/messagepreviewer.cpp
+++ b/src/gui/messagepreviewer.cpp
@@ -52,9 +52,6 @@ MessagePreviewer::MessagePreviewer(QWidget *parent) : QWidget(parent),
     else if (box.clickedButton() == btn_download) {
       qApp->downloadManager()->download(url);
     }
-    else {
-
-    }
 
     btn_download->deleteLater();
     btn_open->deleteLater();

From c9c06e2ef971ab330a6a07bef2fce9881d60973d Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Sun, 3 Apr 2016 11:11:19 +0200
Subject: [PATCH 31/31] Lang sync.

---
 localization/rssguard-cs_CZ.ts | 16 +++++---------
 localization/rssguard-da_DK.ts |  4 ----
 localization/rssguard-de_DE.ts |  6 +----
 localization/rssguard-en_GB.ts |  4 ----
 localization/rssguard-en_US.ts |  4 ----
 localization/rssguard-fr_FR.ts |  6 +----
 localization/rssguard-it_IT.ts |  4 ----
 localization/rssguard-nl_NL.ts |  4 ----
 localization/rssguard-pt_BR.ts |  4 ----
 localization/rssguard-sv_SE.ts | 40 +++++++++++++++-------------------
 10 files changed, 26 insertions(+), 66 deletions(-)

diff --git a/localization/rssguard-cs_CZ.ts b/localization/rssguard-cs_CZ.ts
index 8ef6dbd17..5535aeaad 100644
--- a/localization/rssguard-cs_CZ.ts
+++ b/localization/rssguard-cs_CZ.ts
@@ -2085,11 +2085,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Open download manager when new download is started</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
+        <translation>Při začátku stahování otevírat správce stahování</translation>
     </message>
     <message>
         <source>Statusbar</source>
@@ -2097,15 +2093,15 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"/>
+        <translation>Povolit D-Bus notifikace</translation>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Změnit písmo</translation>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"/>
+        <translation>Náhled písma</translation>
     </message>
     <message>
         <source>Select new font for message viewer</source>
@@ -2113,7 +2109,7 @@ File filter for external e-mail selection dialog.</extracomment>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"/>
+        <translation>(není k dispozici)</translation>
     </message>
 </context>
 <context>
@@ -3016,7 +3012,7 @@ Přejít na web aplikace a stáhnout jej ručně.</translation>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished"/>
+        <translation>Novinový náhled</translation>
     </message>
 </context>
 <context>
diff --git a/localization/rssguard-da_DK.ts b/localization/rssguard-da_DK.ts
index 199fcf37e..381a36c84 100644
--- a/localization/rssguard-da_DK.ts
+++ b/localization/rssguard-da_DK.ts
@@ -2071,10 +2071,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Open download manager when new download is started</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Statusbar</source>
         <translation type="unfinished"/>
diff --git a/localization/rssguard-de_DE.ts b/localization/rssguard-de_DE.ts
index d85adbb06..6436b56d1 100644
--- a/localization/rssguard-de_DE.ts
+++ b/localization/rssguard-de_DE.ts
@@ -2072,10 +2072,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Open download manager when new download is started</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Statusbar</source>
         <translation type="unfinished"/>
@@ -3003,7 +2999,7 @@ Go to application website to obtain it manually.</source>
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished"/>
+        <translation>Zeitungsansicht</translation>
     </message>
 </context>
 <context>
diff --git a/localization/rssguard-en_GB.ts b/localization/rssguard-en_GB.ts
index 857e8934d..58f5664f9 100644
--- a/localization/rssguard-en_GB.ts
+++ b/localization/rssguard-en_GB.ts
@@ -2087,10 +2087,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Open download manager when new download is started</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"></translation>
-    </message>
     <message>
         <source>Statusbar</source>
         <translation type="unfinished"></translation>
diff --git a/localization/rssguard-en_US.ts b/localization/rssguard-en_US.ts
index 296d86542..4660817e3 100644
--- a/localization/rssguard-en_US.ts
+++ b/localization/rssguard-en_US.ts
@@ -2070,10 +2070,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Open download manager when new download is started</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Statusbar</source>
         <translation type="unfinished"/>
diff --git a/localization/rssguard-fr_FR.ts b/localization/rssguard-fr_FR.ts
index e3b46c514..1f53c5803 100644
--- a/localization/rssguard-fr_FR.ts
+++ b/localization/rssguard-fr_FR.ts
@@ -2082,10 +2082,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Open download manager when new download is started</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Statusbar</source>
         <translation type="unfinished"/>
@@ -3014,7 +3010,7 @@ Aller sur le site de l&apos;application pour les obtenir manuellement.</translat
     </message>
     <message>
         <source>Newspaper view</source>
-        <translation type="unfinished"/>
+        <translation>Vue journal</translation>
     </message>
 </context>
 <context>
diff --git a/localization/rssguard-it_IT.ts b/localization/rssguard-it_IT.ts
index c5d8f54af..93a338770 100644
--- a/localization/rssguard-it_IT.ts
+++ b/localization/rssguard-it_IT.ts
@@ -2072,10 +2072,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Open download manager when new download is started</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation type="unfinished"/>
-    </message>
     <message>
         <source>Statusbar</source>
         <translation type="unfinished"/>
diff --git a/localization/rssguard-nl_NL.ts b/localization/rssguard-nl_NL.ts
index babe82fb7..256ddc987 100644
--- a/localization/rssguard-nl_NL.ts
+++ b/localization/rssguard-nl_NL.ts
@@ -2090,10 +2090,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Open download manager when new download is started</source>
         <translation>Open de download manager wanneer een nieuwe download start</translation>
     </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation>Onthoud de geopende browser tabbladen</translation>
-    </message>
     <message>
         <source>Statusbar</source>
         <translation>Statusbalk</translation>
diff --git a/localization/rssguard-pt_BR.ts b/localization/rssguard-pt_BR.ts
index 8722da266..95c648804 100644
--- a/localization/rssguard-pt_BR.ts
+++ b/localization/rssguard-pt_BR.ts
@@ -2088,10 +2088,6 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Open download manager when new download is started</source>
         <translation>Abrir gerenciador de download ao iniciar um novo download</translation>
     </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation>Lembrar abas abertas do navegador</translation>
-    </message>
     <message>
         <source>Statusbar</source>
         <translation>Barra de status</translation>
diff --git a/localization/rssguard-sv_SE.ts b/localization/rssguard-sv_SE.ts
index 7424e362a..6bb9ca4f9 100644
--- a/localization/rssguard-sv_SE.ts
+++ b/localization/rssguard-sv_SE.ts
@@ -2089,33 +2089,29 @@ File filter for external e-mail selection dialog.</extracomment>
         <source>Open download manager when new download is started</source>
         <translation>Öppna nedladdningshanteraren när ny nedladdning startas</translation>
     </message>
-    <message>
-        <source>Remember opened web browser tabs</source>
-        <translation>Kom ihåg öppnade webbläsarflikar</translation>
-    </message>
     <message>
         <source>Statusbar</source>
         <translation>Statusfält</translation>
     </message>
     <message>
         <source>Enable D-Bus notifications</source>
-        <translation type="unfinished"/>
+        <translation>Aktivera D-bus-aviseringar</translation>
     </message>
     <message>
         <source>&amp;Change font</source>
-        <translation type="unfinished"/>
+        <translation>&amp;Ändra teckensnitt</translation>
     </message>
     <message>
         <source>Font preview</source>
-        <translation type="unfinished"/>
+        <translation>Teckengranskning</translation>
     </message>
     <message>
         <source>Select new font for message viewer</source>
-        <translation type="unfinished"/>
+        <translation>Välj nytt teckensnitt för meddelandevyn</translation>
     </message>
     <message>
         <source> (not available)</source>
-        <translation type="unfinished"/>
+        <translation>(ej tillgänglig)</translation>
     </message>
 </context>
 <context>
@@ -2799,31 +2795,31 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
     <name>MessagePreviewer</name>
     <message>
         <source>You clicked link &quot;%1&quot;. You can download the link contents or open it in external web browser.</source>
-        <translation type="unfinished"/>
+        <translation>Du klickade på länken &quot;%1&quot;. Du kan ladda ner länkinnehållet eller öppna den i extern webbläsare.</translation>
     </message>
     <message>
         <source>What action do you want to take?</source>
-        <translation type="unfinished"/>
+        <translation>Vad vill du göra?</translation>
     </message>
     <message>
         <source>Open in external browser</source>
-        <translation type="unfinished"/>
+        <translation>Öppna i extern webbläsare</translation>
     </message>
     <message>
         <source>Download</source>
-        <translation type="unfinished"/>
+        <translation>Ladda ner</translation>
     </message>
     <message>
         <source>Mark message as read</source>
-        <translation type="unfinished"/>
+        <translation>Markera meddelandet som läst</translation>
     </message>
     <message>
         <source>Mark message as unread</source>
-        <translation type="unfinished"/>
+        <translation>Markera meddelandet som oläst</translation>
     </message>
     <message>
         <source>Switch message importance</source>
-        <translation type="unfinished"/>
+        <translation>Växla meddelandeprioritet</translation>
     </message>
 </context>
 <context>
@@ -3112,15 +3108,15 @@ Gå till programmets hemsida för att hämta den manuellt.</translation>
     </message>
     <message numerus="yes">
         <source>Show more messages (%n remaining)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>Visa fler meddelande (% återstår)</numerusform><numerusform>Visa fler meddelanden (% återstår)</numerusform></translation>
     </message>
     <message>
         <source>Cannot show more messages</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte visa fler meddelanden</translation>
     </message>
     <message>
         <source>Cannot show more messages because parent feed was removed.</source>
-        <translation type="unfinished"/>
+        <translation>Kan inte visa fler meddelanden eftersom överordnat flöde tagits bort.</translation>
     </message>
 </context>
 <context>
@@ -3454,15 +3450,15 @@ Olästa nyheter: %2</translation>
     <name>TimeSpinBox</name>
     <message numerus="yes">
         <source>%n hour(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n timma</numerusform><numerusform>%n timmar</numerusform></translation>
     </message>
     <message numerus="yes">
         <source>%n minute(s)</source>
-        <translation type="unfinished"><numerusform></numerusform><numerusform></numerusform></translation>
+        <translation><numerusform>%n minut</numerusform><numerusform>%n minuter</numerusform></translation>
     </message>
     <message>
         <source> and </source>
-        <translation type="unfinished"/>
+        <translation>och</translation>
     </message>
 </context>
 <context>